Merge remote branch 'wireless-next/master' into ath6kl-next

Conflicts:
	drivers/net/wireless/ath/ath6kl/init.c

447 files changed, 48004 insertions, 45289 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index c34cc1e7c6f6..b0c577256487 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -550,7 +550,7 @@ down:
 /*
  * Get link speed and duplex from the slave's base driver
  * using ethtool. If for some reason the call fails or the
- * values are invalid, fake speed and duplex to 100/Full
+ * values are invalid, set speed and duplex to -1,
  * and return error.
  */
 static int bond_update_speed_duplex(struct slave *slave)
@@ -560,9 +560,8 @@ static int bond_update_speed_duplex(struct slave *slave)
         u32 slave_speed;
         int res;
 
-        /* Fake speed and duplex */
-        slave->speed = SPEED_100;
-        slave->duplex = DUPLEX_FULL;
+        slave->speed = SPEED_UNKNOWN;
+        slave->duplex = DUPLEX_UNKNOWN;
 
         res = __ethtool_get_settings(slave_dev, &ecmd);
         if (res < 0)
@@ -1751,16 +1750,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                 new_slave->link  = BOND_LINK_DOWN;
         }
 
-        if (bond_update_speed_duplex(new_slave) &&
-            (new_slave->link != BOND_LINK_DOWN)) {
-                pr_warning("%s: Warning: failed to get speed and duplex from %s, assumed to be 100Mb/sec and Full.\n",
-                           bond_dev->name, new_slave->dev->name);
-
-                if (bond->params.mode == BOND_MODE_8023AD) {
-                        pr_warning("%s: Warning: Operation of 802.3ad mode requires ETHTOOL support in base driver for proper aggregator selection.\n",
-                                   bond_dev->name);
-                }
-        }
+        bond_update_speed_duplex(new_slave);
 
         if (USES_PRIMARY(bond->params.mode) && bond->params.primary[0]) {
                 /* if there is a primary slave, remember it */
@@ -3220,6 +3210,7 @@ static int bond_slave_netdev_event(unsigned long event,
 {
         struct net_device *bond_dev = slave_dev->master;
         struct bonding *bond = netdev_priv(bond_dev);
+        struct slave *slave = NULL;
 
         switch (event) {
         case NETDEV_UNREGISTER:
@@ -3230,20 +3221,16 @@ static int bond_slave_netdev_event(unsigned long event,
                                 bond_release(bond_dev, slave_dev);
                 }
                 break;
+        case NETDEV_UP:
         case NETDEV_CHANGE:
-                if (bond->params.mode == BOND_MODE_8023AD || bond_is_lb(bond)) {
-                        struct slave *slave;
+                slave = bond_get_slave_by_dev(bond, slave_dev);
+                if (slave) {
+                        u32 old_speed = slave->speed;
+                        u8  old_duplex = slave->duplex;
 
-                        slave = bond_get_slave_by_dev(bond, slave_dev);
-                        if (slave) {
-                                u32 old_speed = slave->speed;
-                                u8  old_duplex = slave->duplex;
-
-                                bond_update_speed_duplex(slave);
-
-                                if (bond_is_lb(bond))
-                                        break;
+                        bond_update_speed_duplex(slave);
 
+                        if (bond->params.mode == BOND_MODE_8023AD) {
                                 if (old_speed != slave->speed)
                                         bond_3ad_adapter_speed_changed(slave);
                                 if (old_duplex != slave->duplex)
diff --git a/drivers/net/bonding/bond_procfs.c b/drivers/net/bonding/bond_procfs.c
index 95de93b90386..ad284baafe87 100644
--- a/drivers/net/bonding/bond_procfs.c
+++ b/drivers/net/bonding/bond_procfs.c
@@ -1,4 +1,5 @@
 #include <linux/proc_fs.h>
+#include <linux/export.h>
 #include <net/net_namespace.h>
 #include <net/netns/generic.h>
 #include "bonding.h"
@@ -157,8 +158,16 @@ static void bond_info_show_slave(struct seq_file *seq,
         seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);
         seq_printf(seq, "MII Status: %s\n",
                    (slave->link == BOND_LINK_UP) ?  "up" : "down");
-        seq_printf(seq, "Speed: %d Mbps\n", slave->speed);
-        seq_printf(seq, "Duplex: %s\n", slave->duplex ? "full" : "half");
+        if (slave->speed == SPEED_UNKNOWN)
+                seq_printf(seq, "Speed: %s\n", "Unknown");
+        else
+                seq_printf(seq, "Speed: %d Mbps\n", slave->speed);
+
+        if (slave->duplex == DUPLEX_UNKNOWN)
+                seq_printf(seq, "Duplex: %s\n", "Unknown");
+        else
+                seq_printf(seq, "Duplex: %s\n", slave->duplex ? "full" : "half");
+
         seq_printf(seq, "Link Failure Count: %u\n",
                    slave->link_failure_count);
 
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 6dff5a0e733f..597f4d45c632 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -159,6 +159,7 @@ config S6GMAC
           will be called s6gmac.
 
 source "drivers/net/ethernet/seeq/Kconfig"
+source "drivers/net/ethernet/silan/Kconfig"
 source "drivers/net/ethernet/sis/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"
 source "drivers/net/ethernet/sgi/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index c53ad3afc991..be5dde040261 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -58,6 +58,7 @@ obj-$(CONFIG_SH_ETH) += renesas/
 obj-$(CONFIG_NET_VENDOR_RDC) += rdc/
 obj-$(CONFIG_S6GMAC) += s6gmac.o
 obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/
+obj-$(CONFIG_NET_VENDOR_SILAN) += silan/
 obj-$(CONFIG_NET_VENDOR_SIS) += sis/
 obj-$(CONFIG_SFC) += sfc/
 obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c
index 82386677bb8c..4865ff14bebf 100644
--- a/drivers/net/ethernet/amd/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c
@@ -541,19 +541,17 @@ static void au1000_reset_mac(struct net_device *dev)
  * these are not descriptors sitting in memory.
  */
 static void
-au1000_setup_hw_rings(struct au1000_private *aup, u32 rx_base, u32 tx_base)
+au1000_setup_hw_rings(struct au1000_private *aup, void __iomem *tx_base)
 {
         int i;
 
         for (i = 0; i < NUM_RX_DMA; i++) {
-                aup->rx_dma_ring[i] =
-                        (struct rx_dma *)
-                                        (rx_base + sizeof(struct rx_dma)*i);
+                aup->rx_dma_ring[i] = (struct rx_dma *)
+                        (tx_base + 0x100 + sizeof(struct rx_dma) * i);
         }
         for (i = 0; i < NUM_TX_DMA; i++) {
-                aup->tx_dma_ring[i] =
-                        (struct tx_dma *)
-                                        (tx_base + sizeof(struct tx_dma)*i);
+                aup->tx_dma_ring[i] = (struct tx_dma *)
+                        (tx_base + sizeof(struct tx_dma) * i);
         }
 }
 
@@ -1026,7 +1024,7 @@ static int __devinit au1000_probe(struct platform_device *pdev)
         struct net_device *dev = NULL;
         struct db_dest *pDB, *pDBfree;
         int irq, i, err = 0;
-        struct resource *base, *macen;
+        struct resource *base, *macen, *macdma;
 
         base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!base) {
@@ -1049,6 +1047,13 @@ static int __devinit au1000_probe(struct platform_device *pdev)
                 goto out;
         }
 
+        macdma = platform_get_resource(pdev, IORESOURCE_MEM, 2);
+        if (!macdma) {
+                dev_err(&pdev->dev, "failed to retrieve MACDMA registers\n");
+                err = -ENODEV;
+                goto out;
+        }
+
         if (!request_mem_region(base->start, resource_size(base),
                                                         pdev->name)) {
                 dev_err(&pdev->dev, "failed to request memory region for base registers\n");
@@ -1063,6 +1068,13 @@ static int __devinit au1000_probe(struct platform_device *pdev)
                 goto err_request;
         }
 
+        if (!request_mem_region(macdma->start, resource_size(macdma),
+                                                        pdev->name)) {
+                dev_err(&pdev->dev, "failed to request MACDMA memory region\n");
+                err = -ENXIO;
+                goto err_macdma;
+        }
+
         dev = alloc_etherdev(sizeof(struct au1000_private));
         if (!dev) {
                 dev_err(&pdev->dev, "alloc_etherdev failed\n");
@@ -1109,10 +1121,14 @@ static int __devinit au1000_probe(struct platform_device *pdev)
         }
         aup->mac_id = pdev->id;
 
-        if (pdev->id == 0)
-                au1000_setup_hw_rings(aup, MAC0_RX_DMA_ADDR, MAC0_TX_DMA_ADDR);
-        else if (pdev->id == 1)
-                au1000_setup_hw_rings(aup, MAC1_RX_DMA_ADDR, MAC1_TX_DMA_ADDR);
+        aup->macdma = ioremap_nocache(macdma->start, resource_size(macdma));
+        if (!aup->macdma) {
+                dev_err(&pdev->dev, "failed to ioremap MACDMA registers\n");
+                err = -ENXIO;
+                goto err_remap3;
+        }
+
+        au1000_setup_hw_rings(aup, aup->macdma);
 
         /* set a random MAC now in case platform_data doesn't provide one */
         random_ether_addr(dev->dev_addr);
@@ -1252,6 +1268,8 @@ err_out:
 err_mdiobus_reg:
         mdiobus_free(aup->mii_bus);
 err_mdiobus_alloc:
+        iounmap(aup->macdma);
+err_remap3:
         iounmap(aup->enable);
 err_remap2:
         iounmap(aup->mac);
@@ -1261,6 +1279,8 @@ err_remap1:
 err_vaddr:
         free_netdev(dev);
 err_alloc:
+        release_mem_region(macdma->start, resource_size(macdma));
+err_macdma:
         release_mem_region(macen->start, resource_size(macen));
 err_request:
         release_mem_region(base->start, resource_size(base));
@@ -1293,9 +1313,13 @@ static int __devexit au1000_remove(struct platform_device *pdev)
                         (NUM_TX_BUFFS + NUM_RX_BUFFS),
                         (void *)aup->vaddr, aup->dma_addr);
 
+        iounmap(aup->macdma);
         iounmap(aup->mac);
         iounmap(aup->enable);
 
+        base = platform_get_resource(pdev, IORESOURCE_MEM, 2);
+        release_mem_region(base->start, resource_size(base));
+
         base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         release_mem_region(base->start, resource_size(base));
 
diff --git a/drivers/net/ethernet/amd/au1000_eth.h b/drivers/net/ethernet/amd/au1000_eth.h
index 6229c774552c..4b7f7ad62bb8 100644
--- a/drivers/net/ethernet/amd/au1000_eth.h
+++ b/drivers/net/ethernet/amd/au1000_eth.h
@@ -124,7 +124,7 @@ struct au1000_private {
          */
         struct mac_reg *mac;  /* mac registers                      */
         u32 *enable;     /* address of MAC Enable Register     */
-
+        void __iomem *macdma;   /* base of MAC DMA port */
         u32 vaddr;                /* virtual address of rx/tx buffers   */
         dma_addr_t dma_addr;      /* dma address of rx/tx buffers       */
 
diff --git a/drivers/net/ethernet/apple/Kconfig b/drivers/net/ethernet/apple/Kconfig
index a759d5483ab9..1375e2dc9468 100644
--- a/drivers/net/ethernet/apple/Kconfig
+++ b/drivers/net/ethernet/apple/Kconfig
@@ -52,18 +52,6 @@ config BMAC
           To compile this driver as a module, choose M here: the module
           will be called bmac.
 
-config MAC89x0
-        tristate "Macintosh CS89x0 based ethernet cards"
-        depends on MAC
-        ---help---
-          Support for CS89x0 chipset based Ethernet cards.  If you have a
-          Nubus or LC-PDS network (Ethernet) card of this type, say Y and
-          read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          To compile this driver as a module, choose M here. This module will
-          be called mac89x0.
-
 config MACMACE
         bool "Macintosh (AV) onboard MACE ethernet"
         depends on MAC
diff --git a/drivers/net/ethernet/apple/Makefile b/drivers/net/ethernet/apple/Makefile
index 0d3a5919c95b..86eaa17af0f4 100644
--- a/drivers/net/ethernet/apple/Makefile
+++ b/drivers/net/ethernet/apple/Makefile
@@ -4,5 +4,4 @@
 
 obj-$(CONFIG_MACE) += mace.o
 obj-$(CONFIG_BMAC) += bmac.o
-obj-$(CONFIG_MAC89x0) += mac89x0.o
 obj-$(CONFIG_MACMACE) += macmace.o
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 161cbbb4814a..bf4074167d6a 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -89,10 +89,10 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits)
 
 #define DRV_MODULE_NAME         "tg3"
 #define TG3_MAJ_NUM                     3
-#define TG3_MIN_NUM                     120
+#define TG3_MIN_NUM                     121
 #define DRV_MODULE_VERSION      \
         __stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM)
-#define DRV_MODULE_RELDATE      "August 18, 2011"
+#define DRV_MODULE_RELDATE      "November 2, 2011"
 
 #define RESET_KIND_SHUTDOWN     0
 #define RESET_KIND_INIT         1
@@ -628,19 +628,23 @@ static void tg3_ape_lock_init(struct tg3 *tp)
                 regbase = TG3_APE_PER_LOCK_GRANT;
 
         /* Make sure the driver hasn't any stale locks. */
-        for (i = 0; i < 8; i++) {
-                if (i == TG3_APE_LOCK_GPIO)
-                        continue;
-                tg3_ape_write32(tp, regbase + 4 * i, APE_LOCK_GRANT_DRIVER);
+        for (i = TG3_APE_LOCK_PHY0; i <= TG3_APE_LOCK_GPIO; i++) {
+                switch (i) {
+                case TG3_APE_LOCK_PHY0:
+                case TG3_APE_LOCK_PHY1:
+                case TG3_APE_LOCK_PHY2:
+                case TG3_APE_LOCK_PHY3:
+                        bit = APE_LOCK_GRANT_DRIVER;
+                        break;
+                default:
+                        if (!tp->pci_fn)
+                                bit = APE_LOCK_GRANT_DRIVER;
+                        else
+                                bit = 1 << tp->pci_fn;
+                }
+                tg3_ape_write32(tp, regbase + 4 * i, bit);
         }
 
-        /* Clear the correct bit of the GPIO lock too. */
-        if (!tp->pci_fn)
-                bit = APE_LOCK_GRANT_DRIVER;
-        else
-                bit = 1 << tp->pci_fn;
-
-        tg3_ape_write32(tp, regbase + 4 * TG3_APE_LOCK_GPIO, bit);
 }
 
 static int tg3_ape_lock(struct tg3 *tp, int locknum)
@@ -658,6 +662,10 @@ static int tg3_ape_lock(struct tg3 *tp, int locknum)
                         return 0;
         case TG3_APE_LOCK_GRC:
         case TG3_APE_LOCK_MEM:
+                if (!tp->pci_fn)
+                        bit = APE_LOCK_REQ_DRIVER;
+                else
+                        bit = 1 << tp->pci_fn;
                 break;
         default:
                 return -EINVAL;
@@ -673,11 +681,6 @@ static int tg3_ape_lock(struct tg3 *tp, int locknum)
 
         off = 4 * locknum;
 
-        if (locknum != TG3_APE_LOCK_GPIO || !tp->pci_fn)
-                bit = APE_LOCK_REQ_DRIVER;
-        else
-                bit = 1 << tp->pci_fn;
-
         tg3_ape_write32(tp, req + off, bit);
 
         /* Wait for up to 1 millisecond to acquire lock. */
@@ -710,6 +713,10 @@ static void tg3_ape_unlock(struct tg3 *tp, int locknum)
                         return;
         case TG3_APE_LOCK_GRC:
         case TG3_APE_LOCK_MEM:
+                if (!tp->pci_fn)
+                        bit = APE_LOCK_GRANT_DRIVER;
+                else
+                        bit = 1 << tp->pci_fn;
                 break;
         default:
                 return;
@@ -720,11 +727,6 @@ static void tg3_ape_unlock(struct tg3 *tp, int locknum)
         else
                 gnt = TG3_APE_PER_LOCK_GRANT;
 
-        if (locknum != TG3_APE_LOCK_GPIO || !tp->pci_fn)
-                bit = APE_LOCK_GRANT_DRIVER;
-        else
-                bit = 1 << tp->pci_fn;
-
         tg3_ape_write32(tp, gnt + 4 * locknum, bit);
 }
 
@@ -5927,6 +5929,18 @@ static int tg3_poll_work(struct tg3_napi *tnapi, int work_done, int budget)
         return work_done;
 }
 
+static inline void tg3_reset_task_schedule(struct tg3 *tp)
+{
+        if (!test_and_set_bit(TG3_FLAG_RESET_TASK_PENDING, tp->tg3_flags))
+                schedule_work(&tp->reset_task);
+}
+
+static inline void tg3_reset_task_cancel(struct tg3 *tp)
+{
+        cancel_work_sync(&tp->reset_task);
+        tg3_flag_clear(tp, RESET_TASK_PENDING);
+}
+
 static int tg3_poll_msix(struct napi_struct *napi, int budget)
 {
         struct tg3_napi *tnapi = container_of(napi, struct tg3_napi, napi);
@@ -5967,7 +5981,7 @@ static int tg3_poll_msix(struct napi_struct *napi, int budget)
 tx_recovery:
         /* work_done is guaranteed to be less than budget. */
         napi_complete(napi);
-        schedule_work(&tp->reset_task);
+        tg3_reset_task_schedule(tp);
         return work_done;
 }
 
@@ -6002,7 +6016,7 @@ static void tg3_process_error(struct tg3 *tp)
         tg3_dump_state(tp);
 
         tg3_flag_set(tp, ERROR_PROCESSED);
-        schedule_work(&tp->reset_task);
+        tg3_reset_task_schedule(tp);
 }
 
 static int tg3_poll(struct napi_struct *napi, int budget)
@@ -6049,7 +6063,7 @@ static int tg3_poll(struct napi_struct *napi, int budget)
 tx_recovery:
         /* work_done is guaranteed to be less than budget. */
         napi_complete(napi);
-        schedule_work(&tp->reset_task);
+        tg3_reset_task_schedule(tp);
         return work_done;
 }
 
@@ -6338,11 +6352,11 @@ static void tg3_reset_task(struct work_struct *work)
 {
         struct tg3 *tp = container_of(work, struct tg3, reset_task);
         int err;
-        unsigned int restart_timer;
 
         tg3_full_lock(tp, 0);
 
         if (!netif_running(tp->dev)) {
+                tg3_flag_clear(tp, RESET_TASK_PENDING);
                 tg3_full_unlock(tp);
                 return;
         }
@@ -6355,9 +6369,6 @@ static void tg3_reset_task(struct work_struct *work)
 
         tg3_full_lock(tp, 1);
 
-        restart_timer = tg3_flag(tp, RESTART_TIMER);
-        tg3_flag_clear(tp, RESTART_TIMER);
-
         if (tg3_flag(tp, TX_RECOVERY_PENDING)) {
                 tp->write32_tx_mbox = tg3_write32_tx_mbox;
                 tp->write32_rx_mbox = tg3_write_flush_reg32;
@@ -6372,14 +6383,13 @@ static void tg3_reset_task(struct work_struct *work)
 
         tg3_netif_start(tp);
 
-        if (restart_timer)
-                mod_timer(&tp->timer, jiffies + 1);
-
 out:
         tg3_full_unlock(tp);
 
         if (!err)
                 tg3_phy_start(tp);
+
+        tg3_flag_clear(tp, RESET_TASK_PENDING);
 }
 
 static void tg3_tx_timeout(struct net_device *dev)
@@ -6391,7 +6401,7 @@ static void tg3_tx_timeout(struct net_device *dev)
                 tg3_dump_state(tp);
         }
 
-        schedule_work(&tp->reset_task);
+        tg3_reset_task_schedule(tp);
 }
 
 /* Test for DMA buffers crossing any 4GB boundaries: 4G, 8G, etc */
@@ -6442,31 +6452,26 @@ static bool tg3_tx_frag_set(struct tg3_napi *tnapi, u32 *entry, u32 *budget,
                 hwbug = 1;
 
         if (tg3_flag(tp, 4K_FIFO_LIMIT)) {
+                u32 prvidx = *entry;
                 u32 tmp_flag = flags & ~TXD_FLAG_END;
-                while (len > TG3_TX_BD_DMA_MAX) {
+                while (len > TG3_TX_BD_DMA_MAX && *budget) {
                         u32 frag_len = TG3_TX_BD_DMA_MAX;
                         len -= TG3_TX_BD_DMA_MAX;
 
-                        if (len) {
-                                tnapi->tx_buffers[*entry].fragmented = true;
-                                /* Avoid the 8byte DMA problem */
-                                if (len <= 8) {
-                                        len += TG3_TX_BD_DMA_MAX / 2;
-                                        frag_len = TG3_TX_BD_DMA_MAX / 2;
-                                }
-                        } else
-                                tmp_flag = flags;
-
-                        if (*budget) {
-                                tg3_tx_set_bd(&tnapi->tx_ring[*entry], map,
-                                              frag_len, tmp_flag, mss, vlan);
-                                (*budget)--;
-                                *entry = NEXT_TX(*entry);
-                        } else {
-                                hwbug = 1;
-                                break;
+                        /* Avoid the 8byte DMA problem */
+                        if (len <= 8) {
+                                len += TG3_TX_BD_DMA_MAX / 2;
+                                frag_len = TG3_TX_BD_DMA_MAX / 2;
                         }
 
+                        tnapi->tx_buffers[*entry].fragmented = true;
+
+                        tg3_tx_set_bd(&tnapi->tx_ring[*entry], map,
+                                      frag_len, tmp_flag, mss, vlan);
+                        *budget -= 1;
+                        prvidx = *entry;
+                        *entry = NEXT_TX(*entry);
+
                         map += frag_len;
                 }
 
@@ -6474,10 +6479,11 @@ static bool tg3_tx_frag_set(struct tg3_napi *tnapi, u32 *entry, u32 *budget,
                         if (*budget) {
                                 tg3_tx_set_bd(&tnapi->tx_ring[*entry], map,
                                               len, flags, mss, vlan);
-                                (*budget)--;
+                                *budget -= 1;
                                 *entry = NEXT_TX(*entry);
                         } else {
                                 hwbug = 1;
+                                tnapi->tx_buffers[prvidx].fragmented = false;
                         }
                 }
         } else {
@@ -6509,7 +6515,7 @@ static void tg3_tx_skb_unmap(struct tg3_napi *tnapi, u32 entry, int last)
                 txb = &tnapi->tx_buffers[entry];
         }
 
-        for (i = 0; i < last; i++) {
+        for (i = 0; i <= last; i++) {
                 const skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
                 entry = NEXT_TX(entry);
@@ -6559,6 +6565,8 @@ static int tigon3_dma_hwbug_workaround(struct tg3_napi *tnapi,
                         dev_kfree_skb(new_skb);
                         ret = -1;
                 } else {
+                        u32 save_entry = *entry;
+
                         base_flags |= TXD_FLAG_END;
 
                         tnapi->tx_buffers[*entry].skb = new_skb;
@@ -6568,7 +6576,7 @@ static int tigon3_dma_hwbug_workaround(struct tg3_napi *tnapi,
                         if (tg3_tx_frag_set(tnapi, entry, budget, new_addr,
                                             new_skb->len, base_flags,
                                             mss, vlan)) {
-                                tg3_tx_skb_unmap(tnapi, *entry, 0);
+                                tg3_tx_skb_unmap(tnapi, save_entry, -1);
                                 dev_kfree_skb(new_skb);
                                 ret = -1;
                         }
@@ -6758,11 +6766,10 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         if (tg3_tx_frag_set(tnapi, &entry, &budget, mapping, len, base_flags |
                           ((skb_shinfo(skb)->nr_frags == 0) ? TXD_FLAG_END : 0),
-                            mss, vlan))
+                            mss, vlan)) {
                 would_hit_hwbug = 1;
-
         /* Now loop through additional data fragments, and queue them. */
-        if (skb_shinfo(skb)->nr_frags > 0) {
+        } else if (skb_shinfo(skb)->nr_frags > 0) {
                 u32 tmp_mss = mss;
 
                 if (!tg3_flag(tp, HW_TSO_1) &&
@@ -6784,11 +6791,14 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         if (dma_mapping_error(&tp->pdev->dev, mapping))
                                 goto dma_error;
 
-                        if (tg3_tx_frag_set(tnapi, &entry, &budget, mapping,
+                        if (!budget ||
+                            tg3_tx_frag_set(tnapi, &entry, &budget, mapping,
                                             len, base_flags |
                                             ((i == last) ? TXD_FLAG_END : 0),
-                                            tmp_mss, vlan))
+                                            tmp_mss, vlan)) {
                                 would_hit_hwbug = 1;
+                                break;
+                        }
                 }
         }
 
@@ -6828,7 +6838,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
         return NETDEV_TX_OK;
 
 dma_error:
-        tg3_tx_skb_unmap(tnapi, tnapi->tx_prod, i);
+        tg3_tx_skb_unmap(tnapi, tnapi->tx_prod, --i);
         tnapi->tx_buffers[tnapi->tx_prod].skb = NULL;
 drop:
         dev_kfree_skb(skb);
@@ -7281,7 +7291,8 @@ static void tg3_free_rings(struct tg3 *tp)
                         if (!skb)
                                 continue;
 
-                        tg3_tx_skb_unmap(tnapi, i, skb_shinfo(skb)->nr_frags);
+                        tg3_tx_skb_unmap(tnapi, i,
+                                         skb_shinfo(skb)->nr_frags - 1);
 
                         dev_kfree_skb_any(skb);
                 }
@@ -9200,7 +9211,7 @@ static void tg3_timer(unsigned long __opaque)
 {
         struct tg3 *tp = (struct tg3 *) __opaque;
 
-        if (tp->irq_sync)
+        if (tp->irq_sync || tg3_flag(tp, RESET_TASK_PENDING))
                 goto restart_timer;
 
         spin_lock(&tp->lock);
@@ -9223,10 +9234,9 @@ static void tg3_timer(unsigned long __opaque)
                 }
 
                 if (!(tr32(WDMAC_MODE) & WDMAC_MODE_ENABLE)) {
-                        tg3_flag_set(tp, RESTART_TIMER);
                         spin_unlock(&tp->lock);
-                        schedule_work(&tp->reset_task);
-                        return;
+                        tg3_reset_task_schedule(tp);
+                        goto restart_timer;
                 }
         }
 
@@ -9674,15 +9684,14 @@ static int tg3_open(struct net_device *dev)
                 struct tg3_napi *tnapi = &tp->napi[i];
                 err = tg3_request_irq(tp, i);
                 if (err) {
-                        for (i--; i >= 0; i--)
+                        for (i--; i >= 0; i--) {
+                                tnapi = &tp->napi[i];
                                 free_irq(tnapi->irq_vec, tnapi);
-                        break;
+                        }
+                        goto err_out2;
                 }
         }
 
-        if (err)
-                goto err_out2;
-
         tg3_full_lock(tp, 0);
 
         err = tg3_init_hw(tp, 1);
@@ -9783,7 +9792,7 @@ static int tg3_close(struct net_device *dev)
         struct tg3 *tp = netdev_priv(dev);
 
         tg3_napi_disable(tp);
-        cancel_work_sync(&tp->reset_task);
+        tg3_reset_task_cancel(tp);
 
         netif_tx_stop_all_queues(dev);
 
@@ -11520,7 +11529,7 @@ static int tg3_run_loopback(struct tg3 *tp, u32 pktsz, bool tso_loopback)
                         break;
         }
 
-        tg3_tx_skb_unmap(tnapi, tnapi->tx_prod - 1, 0);
+        tg3_tx_skb_unmap(tnapi, tnapi->tx_prod - 1, -1);
         dev_kfree_skb(skb);
 
         if (tx_idx != tnapi->tx_prod)
@@ -14228,12 +14237,30 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         val = tr32(MEMARB_MODE);
         tw32(MEMARB_MODE, val | MEMARB_MODE_ENABLE);
 
-        if (tg3_flag(tp, PCIX_MODE)) {
-                pci_read_config_dword(tp->pdev,
-                                      tp->pcix_cap + PCI_X_STATUS, &val);
-                tp->pci_fn = val & 0x7;
-        } else {
-                tp->pci_fn = PCI_FUNC(tp->pdev->devfn) & 3;
+        tp->pci_fn = PCI_FUNC(tp->pdev->devfn) & 3;
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 ||
+            tg3_flag(tp, 5780_CLASS)) {
+                if (tg3_flag(tp, PCIX_MODE)) {
+                        pci_read_config_dword(tp->pdev,
+                                              tp->pcix_cap + PCI_X_STATUS,
+                                              &val);
+                        tp->pci_fn = val & 0x7;
+                }
+        } else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
+                tg3_read_mem(tp, NIC_SRAM_CPMU_STATUS, &val);
+                if ((val & NIC_SRAM_CPMUSTAT_SIG_MSK) ==
+                    NIC_SRAM_CPMUSTAT_SIG) {
+                        tp->pci_fn = val & TG3_CPMU_STATUS_FMSK_5717;
+                        tp->pci_fn = tp->pci_fn ? 1 : 0;
+                }
+        } else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
+                   GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5720) {
+                tg3_read_mem(tp, NIC_SRAM_CPMU_STATUS, &val);
+                if ((val & NIC_SRAM_CPMUSTAT_SIG_MSK) ==
+                    NIC_SRAM_CPMUSTAT_SIG) {
+                        tp->pci_fn = (val & TG3_CPMU_STATUS_FMSK_5719) >>
+                                     TG3_CPMU_STATUS_FSHFT_5719;
+                }
         }
 
         /* Get eeprom hw config before calling tg3_set_power_state().
@@ -15665,7 +15692,7 @@ static void __devexit tg3_remove_one(struct pci_dev *pdev)
                 if (tp->fw)
                         release_firmware(tp->fw);
 
-                cancel_work_sync(&tp->reset_task);
+                tg3_reset_task_cancel(tp);
 
                 if (tg3_flag(tp, USE_PHYLIB)) {
                         tg3_phy_fini(tp);
@@ -15699,7 +15726,7 @@ static int tg3_suspend(struct device *device)
         if (!netif_running(dev))
                 return 0;
 
-        flush_work_sync(&tp->reset_task);
+        tg3_reset_task_cancel(tp);
         tg3_phy_stop(tp);
         tg3_netif_stop(tp);
 
@@ -15812,12 +15839,10 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev,
         tg3_netif_stop(tp);
 
         del_timer_sync(&tp->timer);
-        tg3_flag_clear(tp, RESTART_TIMER);
 
         /* Want to make sure that the reset task doesn't run */
-        cancel_work_sync(&tp->reset_task);
+        tg3_reset_task_cancel(tp);
         tg3_flag_clear(tp, TX_RECOVERY_PENDING);
-        tg3_flag_clear(tp, RESTART_TIMER);
 
         netif_device_detach(netdev);
 
diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
index f32f288134c7..94b4bd049a33 100644
--- a/drivers/net/ethernet/broadcom/tg3.h
+++ b/drivers/net/ethernet/broadcom/tg3.h
@@ -1095,6 +1095,11 @@
 #define TG3_CPMU_CLCK_ORIDE             0x00003624
 #define  CPMU_CLCK_ORIDE_MAC_ORIDE_EN    0x80000000
 
+#define TG3_CPMU_STATUS                 0x0000362c
+#define  TG3_CPMU_STATUS_FMSK_5717       0x20000000
+#define  TG3_CPMU_STATUS_FMSK_5719       0xc0000000
+#define  TG3_CPMU_STATUS_FSHFT_5719      30
+
 #define TG3_CPMU_CLCK_STAT              0x00003630
 #define  CPMU_CLCK_STAT_MAC_CLCK_MASK    0x001f0000
 #define  CPMU_CLCK_STAT_MAC_CLCK_62_5    0x00000000
@@ -2128,6 +2133,10 @@
 #define  NIC_SRAM_RGMII_EXT_IBND_RX_EN   0x00000008
 #define  NIC_SRAM_RGMII_EXT_IBND_TX_EN   0x00000010
 
+#define NIC_SRAM_CPMU_STATUS            0x00000e00
+#define  NIC_SRAM_CPMUSTAT_SIG          0x0000362c
+#define  NIC_SRAM_CPMUSTAT_SIG_MSK      0x0000ffff
+
 #define NIC_SRAM_RX_MINI_BUFFER_DESC    0x00001000
 
 #define NIC_SRAM_DMA_DESC_POOL_BASE     0x00002000
@@ -2344,9 +2353,13 @@
 #define  APE_PER_LOCK_GRANT_DRIVER       0x00001000
 
 /* APE convenience enumerations. */
-#define TG3_APE_LOCK_GRC                1
-#define TG3_APE_LOCK_MEM                4
-#define TG3_APE_LOCK_GPIO               7
+#define TG3_APE_LOCK_PHY0               0
+#define TG3_APE_LOCK_GRC                1
+#define TG3_APE_LOCK_PHY1               2
+#define TG3_APE_LOCK_PHY2               3
+#define TG3_APE_LOCK_MEM                4
+#define TG3_APE_LOCK_PHY3               5
+#define TG3_APE_LOCK_GPIO               7
 
 #define TG3_EEPROM_SB_F1R2_MBA_OFF      0x10
 
@@ -2866,7 +2879,6 @@ enum TG3_FLAGS {
         TG3_FLAG_JUMBO_CAPABLE,
         TG3_FLAG_CHIP_RESETTING,
         TG3_FLAG_INIT_COMPLETE,
-        TG3_FLAG_RESTART_TIMER,
         TG3_FLAG_TSO_BUG,
         TG3_FLAG_IS_5788,
         TG3_FLAG_MAX_RXPEND_64,
@@ -2909,6 +2921,7 @@ enum TG3_FLAGS {
         TG3_FLAG_APE_HAS_NCSI,
         TG3_FLAG_5717_PLUS,
         TG3_FLAG_4K_FIFO_LIMIT,
+        TG3_FLAG_RESET_TASK_PENDING,
 
         /* Add new flags before this comment and TG3_FLAG_NUMBER_OF_FLAGS */
         TG3_FLAG_NUMBER_OF_FLAGS,       /* Last entry in enum TG3_FLAGS */
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index 5d7872ecff52..7f3091e7eb42 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -25,6 +25,7 @@
 #include <linux/if_ether.h>
 #include <linux/ip.h>
 #include <linux/prefetch.h>
+#include <linux/module.h>
 
 #include "bnad.h"
 #include "bna.h"
diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c
index 1b0ba8c819f7..56624d303487 100644
--- a/drivers/net/ethernet/cadence/at91_ether.c
+++ b/drivers/net/ethernet/cadence/at91_ether.c
@@ -35,7 +35,7 @@
 #include <asm/mach-types.h>
 
 #include <mach/at91rm9200_emac.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 #include <mach/board.h>
 
 #include "at91_ether.h"
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
index da5a5d9b8aff..90ff1318cc05 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
@@ -40,6 +40,7 @@
 #include <net/netevent.h>
 #include <linux/highmem.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 
 #include "common.h"
 #include "regs.h"
diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.c b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
index 41540978a173..70fec8b1140f 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
@@ -35,6 +35,7 @@
 #include <linux/if_vlan.h>
 #include <linux/jhash.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <net/neighbour.h>
 #include "common.h"
 #include "t3cdev.h"
diff --git a/drivers/net/ethernet/chelsio/cxgb4/l2t.c b/drivers/net/ethernet/chelsio/cxgb4/l2t.c
index a2d323c473f8..6ac77a62f361 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/l2t.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/l2t.c
@@ -37,6 +37,9 @@
 #include <linux/if.h>
 #include <linux/if_vlan.h>
 #include <linux/jhash.h>
+#include <linux/module.h>
+#include <linux/debugfs.h>
+#include <linux/seq_file.h>
 #include <net/neighbour.h>
 #include "cxgb4.h"
 #include "l2t.h"
@@ -503,10 +506,6 @@ struct l2t_data *t4_init_l2t(void)
         return d;
 }
 
-#include <linux/module.h>
-#include <linux/debugfs.h>
-#include <linux/seq_file.h>
-
 static inline void *l2t_get_idx(struct seq_file *seq, loff_t pos)
 {
         struct l2t_entry *l2tab = seq->private;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
index ddc16985d0f6..140254c7cba9 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@ -40,6 +40,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/jiffies.h>
 #include <linux/prefetch.h>
+#include <linux/export.h>
 #include <net/ipv6.h>
 #include <net/tcp.h>
 #include "cxgb4.h"
diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig
index 6cbb81ccc02e..1f8648f099c7 100644
--- a/drivers/net/ethernet/cirrus/Kconfig
+++ b/drivers/net/ethernet/cirrus/Kconfig
@@ -6,7 +6,7 @@ config NET_VENDOR_CIRRUS
         bool "Cirrus devices"
         default y
         depends on ISA || EISA || MACH_IXDP2351 || ARCH_IXDP2X01 \
-                || MACH_MX31ADS || MACH_QQ2440 || (ARM && ARCH_EP93XX)
+                || MACH_MX31ADS || MACH_QQ2440 || (ARM && ARCH_EP93XX) || MAC
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
           and read the Ethernet-HOWTO, available from
@@ -47,4 +47,16 @@ config EP93XX_ETH
           This is a driver for the ethernet hardware included in EP93xx CPUs.
           Say Y if you are building a kernel for EP93xx based devices.
 
+config MAC89x0
+        tristate "Macintosh CS89x0 based ethernet cards"
+        depends on MAC
+        ---help---
+          Support for CS89x0 chipset based Ethernet cards.  If you have a
+          Nubus or LC-PDS network (Ethernet) card of this type, say Y and
+          read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+
+          To compile this driver as a module, choose M here. This module will
+          be called mac89x0.
+
 endif # NET_VENDOR_CIRRUS
diff --git a/drivers/net/ethernet/cirrus/Makefile b/drivers/net/ethernet/cirrus/Makefile
index 14bd77e0cb57..ca245e2b5d98 100644
--- a/drivers/net/ethernet/cirrus/Makefile
+++ b/drivers/net/ethernet/cirrus/Makefile
@@ -4,3 +4,4 @@
 
 obj-$(CONFIG_CS89x0) += cs89x0.o
 obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o
+obj-$(CONFIG_MAC89x0) += mac89x0.o
diff --git a/drivers/net/ethernet/apple/mac89x0.c b/drivers/net/ethernet/cirrus/mac89x0.c
index 83781f316d1f..83781f316d1f 100644
--- a/drivers/net/ethernet/apple/mac89x0.c
+++ b/drivers/net/ethernet/cirrus/mac89x0.c
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 824b8e6021f6..2c7b36673dfc 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -318,8 +318,7 @@ static int be_mbox_db_ready_wait(struct be_adapter *adapter, void __iomem *db)
 
                 if (msecs > 4000) {
                         dev_err(&adapter->pdev->dev, "mbox poll timed out\n");
-                        if (!lancer_chip(adapter))
-                                be_detect_dump_ue(adapter);
+                        be_detect_dump_ue(adapter);
                         return -1;
                 }
 
@@ -1540,7 +1539,14 @@ int be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value)
 
                 req->if_flags_mask = req->if_flags =
                                 cpu_to_le32(BE_IF_FLAGS_MULTICAST);
-                req->mcast_num = cpu_to_le16(netdev_mc_count(adapter->netdev));
+
+                /* Reset mcast promisc mode if already set by setting mask
+                 * and not setting flags field
+                 */
+                req->if_flags_mask |=
+                                cpu_to_le32(BE_IF_FLAGS_MCAST_PROMISCUOUS);
+
+                req->mcast_num = cpu_to_le32(netdev_mc_count(adapter->netdev));
                 netdev_for_each_mc_addr(ha, adapter->netdev)
                         memcpy(req->mcast_mac[i++].byte, ha->addr, ETH_ALEN);
         }
diff --git a/drivers/net/ethernet/emulex/benet/be_hw.h b/drivers/net/ethernet/emulex/benet/be_hw.h
index fbc8a915519e..f2c89e3ccabd 100644
--- a/drivers/net/ethernet/emulex/benet/be_hw.h
+++ b/drivers/net/ethernet/emulex/benet/be_hw.h
@@ -48,6 +48,8 @@
 /* Lancer SLIPORT_CONTROL SLIPORT_STATUS registers */
 #define SLIPORT_STATUS_OFFSET           0x404
 #define SLIPORT_CONTROL_OFFSET          0x408
+#define SLIPORT_ERROR1_OFFSET           0x40C
+#define SLIPORT_ERROR2_OFFSET           0x410
 
 #define SLIPORT_STATUS_ERR_MASK         0x80000000
 #define SLIPORT_STATUS_RN_MASK          0x01000000
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 21804972fa2f..bf266a00c774 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -16,6 +16,7 @@
  */
 
 #include <linux/prefetch.h>
+#include <linux/module.h>
 #include "be.h"
 #include "be_cmds.h"
 #include <asm/div64.h>
@@ -1905,6 +1906,8 @@ loop_continue:
                 be_rx_stats_update(rxo, rxcp);
         }
 
+        be_cq_notify(adapter, rx_cq->id, false, work_done);
+
         /* Refill the queue */
         if (work_done && atomic_read(&rxo->q.used) < RX_FRAGS_REFILL_WM)
                 be_post_rx_frags(rxo, GFP_ATOMIC);
@@ -1912,10 +1915,8 @@ loop_continue:
         /* All consumed */
         if (work_done < budget) {
                 napi_complete(napi);
-                be_cq_notify(adapter, rx_cq->id, true, work_done);
-        } else {
-                /* More to be consumed; continue with interrupts disabled */
-                be_cq_notify(adapter, rx_cq->id, false, work_done);
+                /* Arm CQ */
+                be_cq_notify(adapter, rx_cq->id, true, 0);
         }
         return work_done;
 }
@@ -1977,42 +1978,62 @@ static int be_poll_tx_mcc(struct napi_struct *napi, int budget)
 
 void be_detect_dump_ue(struct be_adapter *adapter)
 {
-        u32 ue_status_lo, ue_status_hi, ue_status_lo_mask, ue_status_hi_mask;
+        u32 ue_lo = 0, ue_hi = 0, ue_lo_mask = 0, ue_hi_mask = 0;
+        u32 sliport_status = 0, sliport_err1 = 0, sliport_err2 = 0;
         u32 i;
 
-        pci_read_config_dword(adapter->pdev,
-                                PCICFG_UE_STATUS_LOW, &ue_status_lo);
-        pci_read_config_dword(adapter->pdev,
-                                PCICFG_UE_STATUS_HIGH, &ue_status_hi);
-        pci_read_config_dword(adapter->pdev,
-                                PCICFG_UE_STATUS_LOW_MASK, &ue_status_lo_mask);
-        pci_read_config_dword(adapter->pdev,
-                                PCICFG_UE_STATUS_HI_MASK, &ue_status_hi_mask);
+        if (lancer_chip(adapter)) {
+                sliport_status = ioread32(adapter->db + SLIPORT_STATUS_OFFSET);
+                if (sliport_status & SLIPORT_STATUS_ERR_MASK) {
+                        sliport_err1 = ioread32(adapter->db +
+                                        SLIPORT_ERROR1_OFFSET);
+                        sliport_err2 = ioread32(adapter->db +
+                                        SLIPORT_ERROR2_OFFSET);
+                }
+        } else {
+                pci_read_config_dword(adapter->pdev,
+                                PCICFG_UE_STATUS_LOW, &ue_lo);
+                pci_read_config_dword(adapter->pdev,
+                                PCICFG_UE_STATUS_HIGH, &ue_hi);
+                pci_read_config_dword(adapter->pdev,
+                                PCICFG_UE_STATUS_LOW_MASK, &ue_lo_mask);
+                pci_read_config_dword(adapter->pdev,
+                                PCICFG_UE_STATUS_HI_MASK, &ue_hi_mask);
 
-        ue_status_lo = (ue_status_lo & (~ue_status_lo_mask));
-        ue_status_hi = (ue_status_hi & (~ue_status_hi_mask));
+                ue_lo = (ue_lo & (~ue_lo_mask));
+                ue_hi = (ue_hi & (~ue_hi_mask));
+        }
 
-        if (ue_status_lo || ue_status_hi) {
+        if (ue_lo || ue_hi ||
+                sliport_status & SLIPORT_STATUS_ERR_MASK) {
                 adapter->ue_detected = true;
                 adapter->eeh_err = true;
                 dev_err(&adapter->pdev->dev, "UE Detected!!\n");
         }
 
-        if (ue_status_lo) {
-                for (i = 0; ue_status_lo; ue_status_lo >>= 1, i++) {
-                        if (ue_status_lo & 1)
+        if (ue_lo) {
+                for (i = 0; ue_lo; ue_lo >>= 1, i++) {
+                        if (ue_lo & 1)
                                 dev_err(&adapter->pdev->dev,
                                 "UE: %s bit set\n", ue_status_low_desc[i]);
                 }
         }
-        if (ue_status_hi) {
-                for (i = 0; ue_status_hi; ue_status_hi >>= 1, i++) {
-                        if (ue_status_hi & 1)
+        if (ue_hi) {
+                for (i = 0; ue_hi; ue_hi >>= 1, i++) {
+                        if (ue_hi & 1)
                                 dev_err(&adapter->pdev->dev,
                                 "UE: %s bit set\n", ue_status_hi_desc[i]);
                 }
         }
 
+        if (sliport_status & SLIPORT_STATUS_ERR_MASK) {
+                dev_err(&adapter->pdev->dev,
+                        "sliport status 0x%x\n", sliport_status);
+                dev_err(&adapter->pdev->dev,
+                        "sliport error1 0x%x\n", sliport_err1);
+                dev_err(&adapter->pdev->dev,
+                        "sliport error2 0x%x\n", sliport_err2);
+        }
 }
 
 static void be_worker(struct work_struct *work)
@@ -2022,7 +2043,7 @@ static void be_worker(struct work_struct *work)
         struct be_rx_obj *rxo;
         int i;
 
-        if (!adapter->ue_detected && !lancer_chip(adapter))
+        if (!adapter->ue_detected)
                 be_detect_dump_ue(adapter);
 
         /* when interrupts are not yet enabled, just reap any pending
diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c
index bdb348a5ccf6..251b635fe75a 100644
--- a/drivers/net/ethernet/ethoc.c
+++ b/drivers/net/ethernet/ethoc.c
@@ -22,6 +22,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/of.h>
+#include <linux/module.h>
 #include <net/ethoc.h>
 
 static int buffer_size = 0x8000; /* 32 KBytes */
diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig
index 1cf671643d1f..c520cfd3b298 100644
--- a/drivers/net/ethernet/freescale/Kconfig
+++ b/drivers/net/ethernet/freescale/Kconfig
@@ -7,8 +7,7 @@ config NET_VENDOR_FREESCALE
         default y
         depends on FSL_SOC || QUICC_ENGINE || CPM1 || CPM2 || PPC_MPC512x || \
                    M523x || M527x || M5272 || M528x || M520x || M532x || \
-                   ARCH_MXC || ARCH_MXS || \
-                   (PPC_MPC52xx && PPC_BESTCOMM)
+                   ARCH_MXC || ARCH_MXS || (PPC_MPC52xx && PPC_BESTCOMM)
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
           and read the Ethernet-HOWTO, available from
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 46d690a92c0b..b5dc0273a1d1 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/stddef.h>
+#include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
diff --git a/drivers/net/ethernet/i825xx/3c505.c b/drivers/net/ethernet/i825xx/3c505.c
index 40e1a175fceb..ba82a266051d 100644
--- a/drivers/net/ethernet/i825xx/3c505.c
+++ b/drivers/net/ethernet/i825xx/3c505.c
@@ -126,15 +126,13 @@
  *
  *********************************************************/
 
-#define filename __FILE__
-
 #define timeout_msg "*** timeout at %s:%s (line %d) ***\n"
 #define TIMEOUT_MSG(lineno) \
-        pr_notice(timeout_msg, filename, __func__, (lineno))
+        pr_notice(timeout_msg, __FILE__, __func__, (lineno))
 
 #define invalid_pcb_msg "*** invalid pcb length %d at %s:%s (line %d) ***\n"
 #define INVALID_PCB_MSG(len) \
-        pr_notice(invalid_pcb_msg, (len), filename, __func__, __LINE__)
+        pr_notice(invalid_pcb_msg, (len), __FILE__, __func__, __LINE__)
 
 #define search_msg "%s: Looking for 3c505 adapter at address %#x..."
 
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index 61029dc7fa6f..76213162fbe3 100644
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -5,7 +5,11 @@
 config NET_VENDOR_INTEL
         bool "Intel devices"
         default y
-        depends on PCI || PCI_MSI
+        depends on PCI || PCI_MSI || ISA || ISA_DMA_API || ARM || \
+                   ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \
+                   GSC || BVME6000 || MVME16x || ARCH_ENP2611 || \
+                   (ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR) || \
+                   EXPERIMENTAL
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
           and read the Ethernet-HOWTO, available from
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index ae17cd1a907f..5a2fdf7a00c8 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2810,6 +2810,10 @@ static int __devinit e100_probe(struct pci_dev *pdev,
 
         e100_get_defaults(nic);
 
+        /* D100 MAC doesn't allow rx of vlan packets with normal MTU */
+        if (nic->mac < mac_82558_D101_A4)
+                netdev->features |= NETIF_F_VLAN_CHALLENGED;
+
         /* locks must be initialized before calling hw_reset */
         spin_lock_init(&nic->cb_lock);
         spin_lock_init(&nic->cmd_lock);
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 6a17c62cb86f..e2a80a283fd3 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -866,8 +866,7 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
 
         if (test_and_set_bit(__E1000_ACCESS_SHARED_RESOURCE,
                              &hw->adapter->state)) {
-                WARN(1, "e1000e: %s: contention for Phy access\n",
-                     hw->adapter->netdev->name);
+                e_dbg("contention for Phy access\n");
                 return -E1000_ERR_PHY;
         }
 
diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
index 4dd9b63273f6..20e93b08e7f3 100644
--- a/drivers/net/ethernet/intel/e1000e/param.c
+++ b/drivers/net/ethernet/intel/e1000e/param.c
@@ -27,6 +27,7 @@
 *******************************************************************************/
 
 #include <linux/netdevice.h>
+#include <linux/module.h>
 #include <linux/pci.h>
 
 #include "e1000.h"
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
index 7edf31efe756..b17d7c20f817 100644
--- a/drivers/net/ethernet/intel/igb/e1000_phy.c
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.c
@@ -1687,7 +1687,7 @@ s32 igb_get_cable_length_m88_gen2(struct e1000_hw *hw)
                 if (ret_val)
                         goto out;
 
-                is_cm = !(phy_data & I347AT4_PCDC_CABLE_LENGTH_UNIT);
+                is_cm = !(phy_data2 & I347AT4_PCDC_CABLE_LENGTH_UNIT);
 
                 /* Populate the phy structure with cable length in meters */
                 phy->min_cable_length = phy_data / (is_cm ? 100 : 1);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index 834f044be4c3..f1365fef4ed2 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -3344,7 +3344,7 @@ static u8 ixgbe_calculate_checksum(u8 *buffer, u32 length)
 static s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer,
                                         u32 length)
 {
-        u32 hicr, i;
+        u32 hicr, i, bi;
         u32 hdr_size = sizeof(struct ixgbe_hic_hdr);
         u8 buf_len, dword_len;
 
@@ -3398,9 +3398,9 @@ static s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer,
         dword_len = hdr_size >> 2;
 
         /* first pull in the header so we know the buffer length */
-        for (i = 0; i < dword_len; i++) {
-                buffer[i] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, i);
-                le32_to_cpus(&buffer[i]);
+        for (bi = 0; bi < dword_len; bi++) {
+                buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi);
+                le32_to_cpus(&buffer[bi]);
         }
 
         /* If there is any thing in data position pull it in */
@@ -3414,12 +3414,14 @@ static s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer,
                 goto out;
         }
 
-        /* Calculate length in DWORDs, add one for odd lengths */
-        dword_len = (buf_len + 1) >> 2;
+        /* Calculate length in DWORDs, add 3 for odd lengths */
+        dword_len = (buf_len + 3) >> 2;
 
-        /* Pull in the rest of the buffer (i is where we left off)*/
-        for (; i < buf_len; i++)
-                buffer[i] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, i);
+        /* Pull in the rest of the buffer (bi is where we left off)*/
+        for (; bi <= dword_len; bi++) {
+                buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi);
+                le32_to_cpus(&buffer[bi]);
+        }
 
 out:
         return ret_val;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
index 3631d639d86a..33b93ffb87cb 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
@@ -561,11 +561,12 @@ static int ixgbe_dcbnl_ieee_getets(struct net_device *dev,
         struct ixgbe_adapter *adapter = netdev_priv(dev);
         struct ieee_ets *my_ets = adapter->ixgbe_ieee_ets;
 
+        ets->ets_cap = adapter->dcb_cfg.num_tcs.pg_tcs;
+
         /* No IEEE PFC settings available */
         if (!my_ets)
-                return -EINVAL;
+                return 0;
 
-        ets->ets_cap = adapter->dcb_cfg.num_tcs.pg_tcs;
         ets->cbs = my_ets->cbs;
         memcpy(ets->tc_tx_bw, my_ets->tc_tx_bw, sizeof(ets->tc_tx_bw));
         memcpy(ets->tc_rx_bw, my_ets->tc_rx_bw, sizeof(ets->tc_rx_bw));
@@ -621,11 +622,12 @@ static int ixgbe_dcbnl_ieee_getpfc(struct net_device *dev,
         struct ieee_pfc *my_pfc = adapter->ixgbe_ieee_pfc;
         int i;
 
+        pfc->pfc_cap = adapter->dcb_cfg.num_tcs.pfc_tcs;
+
         /* No IEEE PFC settings available */
         if (!my_pfc)
-                return -EINVAL;
+                return 0;
 
-        pfc->pfc_cap = adapter->dcb_cfg.num_tcs.pfc_tcs;
         pfc->pfc_en = my_pfc->pfc_en;
         pfc->mbc = my_pfc->mbc;
         pfc->delay = my_pfc->delay;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 09b8e88b2999..8ef92d1a6aa1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -3345,34 +3345,25 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter)
 
         hw->mac.ops.set_vfta(&adapter->hw, 0, 0, true);
 
-        /* reconfigure the hardware */
-        if (adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE) {
 #ifdef IXGBE_FCOE
-                if (adapter->netdev->features & NETIF_F_FCOE_MTU)
-                        max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE);
+        if (adapter->netdev->features & NETIF_F_FCOE_MTU)
+                max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE);
 #endif
+
+        /* reconfigure the hardware */
+        if (adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE) {
                 ixgbe_dcb_calculate_tc_credits(hw, &adapter->dcb_cfg, max_frame,
                                                 DCB_TX_CONFIG);
                 ixgbe_dcb_calculate_tc_credits(hw, &adapter->dcb_cfg, max_frame,
                                                 DCB_RX_CONFIG);
                 ixgbe_dcb_hw_config(hw, &adapter->dcb_cfg);
-        } else {
-                struct net_device *dev = adapter->netdev;
-
-                if (adapter->ixgbe_ieee_ets) {
-                        struct ieee_ets *ets = adapter->ixgbe_ieee_ets;
-                        int max_frame = dev->mtu + ETH_HLEN + ETH_FCS_LEN;
-
-                        ixgbe_dcb_hw_ets(&adapter->hw, ets, max_frame);
-                }
-
-                if (adapter->ixgbe_ieee_pfc) {
-                        struct ieee_pfc *pfc = adapter->ixgbe_ieee_pfc;
-                        u8 *prio_tc = adapter->ixgbe_ieee_ets->prio_tc;
-
-                        ixgbe_dcb_hw_pfc_config(&adapter->hw, pfc->pfc_en,
-                                                prio_tc);
-                }
+        } else if (adapter->ixgbe_ieee_ets && adapter->ixgbe_ieee_pfc) {
+                ixgbe_dcb_hw_ets(&adapter->hw,
+                                 adapter->ixgbe_ieee_ets,
+                                 max_frame);
+                ixgbe_dcb_hw_pfc_config(&adapter->hw,
+                                        adapter->ixgbe_ieee_pfc->pfc_en,
+                                        adapter->ixgbe_ieee_ets->prio_tc);
         }
 
         /* Enable RSS Hash per TC */
@@ -6125,7 +6116,6 @@ static void ixgbe_sfp_link_config_subtask(struct ixgbe_adapter *adapter)
         autoneg = hw->phy.autoneg_advertised;
         if ((!autoneg) && (hw->mac.ops.get_link_capabilities))
                 hw->mac.ops.get_link_capabilities(hw, &autoneg, &negotiation);
-        hw->mac.autotry_restart = false;
         if (hw->mac.ops.setup_link)
                 hw->mac.ops.setup_link(hw, autoneg, negotiation, true);
 
@@ -7589,13 +7579,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                 goto err_eeprom;
         }
 
-        /* power down the optics for multispeed fiber and 82599 SFP+ fiber */
-        if (hw->mac.ops.disable_tx_laser &&
-            ((hw->phy.multispeed_fiber) ||
-             ((hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) &&
-              (hw->mac.type == ixgbe_mac_82599EB))))
-                hw->mac.ops.disable_tx_laser(hw);
-
         setup_timer(&adapter->service_timer, &ixgbe_service_timer,
                     (unsigned long) adapter);
 
@@ -7693,6 +7676,13 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         if (err)
                 goto err_register;
 
+        /* power down the optics for multispeed fiber and 82599 SFP+ fiber */
+        if (hw->mac.ops.disable_tx_laser &&
+            ((hw->phy.multispeed_fiber) ||
+             ((hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) &&
+              (hw->mac.type == ixgbe_mac_82599EB))))
+                hw->mac.ops.disable_tx_laser(hw);
+
         /* carrier off reporting is important to ethtool even BEFORE open */
         netif_carrier_off(netdev);
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index db95731863d7..00fcd39ad666 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -442,12 +442,14 @@ static int ixgbe_set_vf_macvlan(struct ixgbe_adapter *adapter,
 
 int ixgbe_check_vf_assignment(struct ixgbe_adapter *adapter)
 {
+#ifdef CONFIG_PCI_IOV
         int i;
         for (i = 0; i < adapter->num_vfs; i++) {
                 if (adapter->vfinfo[i].vfdev->dev_flags &
                                 PCI_DEV_FLAGS_ASSIGNED)
                         return true;
         }
+#endif
         return false;
 }
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
index 5a7e1eb33599..df04f1a3857c 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
@@ -43,9 +43,11 @@ int ixgbe_ndo_get_vf_config(struct net_device *netdev,
                             int vf, struct ifla_vf_info *ivi);
 void ixgbe_check_vf_rate_limit(struct ixgbe_adapter *adapter);
 void ixgbe_disable_sriov(struct ixgbe_adapter *adapter);
+int ixgbe_check_vf_assignment(struct ixgbe_adapter *adapter);
+#ifdef CONFIG_PCI_IOV
 void ixgbe_enable_sriov(struct ixgbe_adapter *adapter,
                         const struct ixgbe_info *ii);
-int ixgbe_check_vf_assignment(struct ixgbe_adapter *adapter);
+#endif
 
 
 #endif /* _IXGBE_SRIOV_H_ */
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 5e92cc2079bd..4c8e19951d57 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -54,7 +54,7 @@ char ixgbevf_driver_name[] = "ixgbevf";
 static const char ixgbevf_driver_string[] =
         "Intel(R) 10 Gigabit PCI Express Virtual Function Network Driver";
 
-#define DRV_VERSION "2.1.0-k"
+#define DRV_VERSION "2.2.0-k"
 const char ixgbevf_driver_version[] = DRV_VERSION;
 static char ixgbevf_copyright[] =
         "Copyright (c) 2009 - 2010 Intel Corporation.";
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index cbd026f3bc57..fdc6c394c683 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -366,17 +366,6 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
                                 gm_phy_write(hw, port, PHY_MARV_FE_SPEC_2, spec);
                         }
                 } else {
-                        if (hw->chip_id >= CHIP_ID_YUKON_OPT) {
-                                u16 ctrl2 = gm_phy_read(hw, port, PHY_MARV_EXT_CTRL_2);
-
-                                /* enable PHY Reverse Auto-Negotiation */
-                                ctrl2 |= 1u << 13;
-
-                                /* Write PHY changes (SW-reset must follow) */
-                                gm_phy_write(hw, port, PHY_MARV_EXT_CTRL_2, ctrl2);
-                        }
-
-
                         /* disable energy detect */
                         ctrl &= ~PHY_M_PC_EN_DET_MSK;
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/alloc.c b/drivers/net/ethernet/mellanox/mlx4/alloc.c
index 116cae334dad..8be20e7ea3d1 100644
--- a/drivers/net/ethernet/mellanox/mlx4/alloc.c
+++ b/drivers/net/ethernet/mellanox/mlx4/alloc.c
@@ -34,6 +34,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
+#include <linux/export.h>
 #include <linux/bitmap.h>
 #include <linux/dma-mapping.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/net/ethernet/mellanox/mlx4/catas.c b/drivers/net/ethernet/mellanox/mlx4/catas.c
index 32f947154c33..45aea9c3ae2c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/catas.c
+++ b/drivers/net/ethernet/mellanox/mlx4/catas.c
@@ -32,6 +32,7 @@
  */
 
 #include <linux/workqueue.h>
+#include <linux/module.h>
 
 #include "mlx4.h"
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 23cee7b6af91..78f5a1a0b8c8 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -34,6 +34,7 @@
 
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <linux/pci.h>
 #include <linux/errno.h>
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/cq.c b/drivers/net/ethernet/mellanox/mlx4/cq.c
index bd8ef9f2fa71..499a5168892a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cq.c
@@ -35,6 +35,7 @@
  */
 
 #include <linux/hardirq.h>
+#include <linux/export.h>
 #include <linux/gfp.h>
 
 #include <linux/mlx4/cmd.h>
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 90f2cd24faac..d901b4267537 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -39,6 +39,7 @@
 #include <linux/if_vlan.h>
 #include <linux/vmalloc.h>
 #include <linux/tcp.h>
+#include <linux/moduleparam.h>
 
 #include "mlx4_en.h"
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index 1ad1f6029af8..24ee96775996 100644
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -33,6 +33,7 @@
 
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
 
@@ -484,7 +485,7 @@ static void mlx4_free_eq(struct mlx4_dev *dev,
 
         mlx4_mtt_cleanup(dev, &eq->mtt);
         for (i = 0; i < npages; ++i)
-                pci_free_consistent(dev->pdev, PAGE_SIZE,
+                dma_free_coherent(&dev->pdev->dev, PAGE_SIZE,
                                     eq->page_list[i].buf,
                                     eq->page_list[i].map);
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index ed452ddfe342..435ca6e49734 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -33,6 +33,7 @@
  */
 
 #include <linux/mlx4/cmd.h>
+#include <linux/module.h>
 #include <linux/cache.h>
 
 #include "fw.h"
@@ -205,6 +206,8 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 #define QUERY_DEV_CAP_MAX_MCG_OFFSET            0x63
 #define QUERY_DEV_CAP_RSVD_PD_OFFSET            0x64
 #define QUERY_DEV_CAP_MAX_PD_OFFSET             0x65
+#define QUERY_DEV_CAP_RSVD_XRC_OFFSET           0x66
+#define QUERY_DEV_CAP_MAX_XRC_OFFSET            0x67
 #define QUERY_DEV_CAP_MAX_COUNTERS_OFFSET       0x68
 #define QUERY_DEV_CAP_RDMARC_ENTRY_SZ_OFFSET    0x80
 #define QUERY_DEV_CAP_QPC_ENTRY_SZ_OFFSET       0x82
@@ -319,6 +322,10 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         dev_cap->reserved_pds = field >> 4;
         MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_PD_OFFSET);
         dev_cap->max_pds = 1 << (field & 0x3f);
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_XRC_OFFSET);
+        dev_cap->reserved_xrcds = field >> 4;
+        MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_PD_OFFSET);
+        dev_cap->max_xrcds = 1 << (field & 0x1f);
 
         MLX4_GET(size, outbox, QUERY_DEV_CAP_RDMARC_ENTRY_SZ_OFFSET);
         dev_cap->rdmarc_entry_sz = size;
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.h b/drivers/net/ethernet/mellanox/mlx4/fw.h
index 1e8ecc3708e2..bf5ec2286528 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.h
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.h
@@ -93,6 +93,8 @@ struct mlx4_dev_cap {
         int max_mcgs;
         int reserved_pds;
         int max_pds;
+        int reserved_xrcds;
+        int max_xrcds;
         int qpc_entry_sz;
         int rdmarc_entry_sz;
         int altc_entry_sz;
diff --git a/drivers/net/ethernet/mellanox/mlx4/intf.c b/drivers/net/ethernet/mellanox/mlx4/intf.c
index 73c94fcdfddf..ca6feb55bd94 100644
--- a/drivers/net/ethernet/mellanox/mlx4/intf.c
+++ b/drivers/net/ethernet/mellanox/mlx4/intf.c
@@ -32,6 +32,7 @@
  */
 
 #include <linux/slab.h>
+#include <linux/export.h>
 
 #include "mlx4.h"
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index f0ee35df4dd7..94bbc85a532d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -96,6 +96,8 @@ MODULE_PARM_DESC(log_num_mac, "Log2 max number of MACs per ETH port (1-7)");
 static int log_num_vlan;
 module_param_named(log_num_vlan, log_num_vlan, int, 0444);
 MODULE_PARM_DESC(log_num_vlan, "Log2 max number of VLANs per ETH port (0-7)");
+/* Log2 max number of VLANs per ETH port (0-7) */
+#define MLX4_LOG_NUM_VLANS 7
 
 static int use_prio;
 module_param_named(use_prio, use_prio, bool, 0444);
@@ -220,6 +222,10 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         dev->caps.reserved_mrws      = dev_cap->reserved_mrws;
         dev->caps.reserved_uars      = dev_cap->reserved_uars;
         dev->caps.reserved_pds       = dev_cap->reserved_pds;
+        dev->caps.reserved_xrcds     = (dev->caps.flags & MLX4_DEV_CAP_FLAG_XRC) ?
+                                        dev_cap->reserved_xrcds : 0;
+        dev->caps.max_xrcds          = (dev->caps.flags & MLX4_DEV_CAP_FLAG_XRC) ?
+                                        dev_cap->max_xrcds : 0;
         dev->caps.mtt_entry_sz       = dev->caps.mtts_per_seg * dev_cap->mtt_entry_sz;
         dev->caps.max_msg_sz         = dev_cap->max_msg_sz;
         dev->caps.page_size_cap      = ~(u32) (dev_cap->min_page_sz - 1);
@@ -230,7 +236,7 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         dev->caps.max_gso_sz         = dev_cap->max_gso_sz;
 
         dev->caps.log_num_macs  = log_num_mac;
-        dev->caps.log_num_vlans = log_num_vlan;
+        dev->caps.log_num_vlans = MLX4_LOG_NUM_VLANS;
         dev->caps.log_num_prios = use_prio ? 3 : 0;
 
         for (i = 1; i <= dev->caps.num_ports; ++i) {
@@ -912,11 +918,18 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
                 goto err_kar_unmap;
         }
 
+        err = mlx4_init_xrcd_table(dev);
+        if (err) {
+                mlx4_err(dev, "Failed to initialize "
+                         "reliable connection domain table, aborting.\n");
+                goto err_pd_table_free;
+        }
+
         err = mlx4_init_mr_table(dev);
         if (err) {
                 mlx4_err(dev, "Failed to initialize "
                          "memory region table, aborting.\n");
-                goto err_pd_table_free;
+                goto err_xrcd_table_free;
         }
 
         err = mlx4_init_eq_table(dev);
@@ -998,6 +1011,13 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
                                   "ib capabilities (%d). Continuing with "
                                   "caps = 0\n", port, err);
                 dev->caps.ib_port_def_cap[port] = ib_port_default_caps;
+
+                err = mlx4_check_ext_port_caps(dev, port);
+                if (err)
+                        mlx4_warn(dev, "failed to get port %d extended "
+                                  "port capabilities support info (%d)."
+                                  " Assuming not supported\n", port, err);
+
                 err = mlx4_SET_PORT(dev, port);
                 if (err) {
                         mlx4_err(dev, "Failed to set port %d, aborting\n",
@@ -1033,6 +1053,9 @@ err_eq_table_free:
 err_mr_table_free:
         mlx4_cleanup_mr_table(dev);
 
+err_xrcd_table_free:
+        mlx4_cleanup_xrcd_table(dev);
+
 err_pd_table_free:
         mlx4_cleanup_pd_table(dev);
 
@@ -1355,6 +1378,7 @@ err_port:
         mlx4_cmd_use_polling(dev);
         mlx4_cleanup_eq_table(dev);
         mlx4_cleanup_mr_table(dev);
+        mlx4_cleanup_xrcd_table(dev);
         mlx4_cleanup_pd_table(dev);
         mlx4_cleanup_uar_table(dev);
 
@@ -1416,6 +1440,7 @@ static void mlx4_remove_one(struct pci_dev *pdev)
                 mlx4_cmd_use_polling(dev);
                 mlx4_cleanup_eq_table(dev);
                 mlx4_cleanup_mr_table(dev);
+                mlx4_cleanup_xrcd_table(dev);
                 mlx4_cleanup_pd_table(dev);
 
                 iounmap(priv->kar);
@@ -1489,10 +1514,9 @@ static int __init mlx4_verify_params(void)
                 return -1;
         }
 
-        if ((log_num_vlan < 0) || (log_num_vlan > 7)) {
-                pr_warning("mlx4_core: bad num_vlan: %d\n", log_num_vlan);
-                return -1;
-        }
+        if (log_num_vlan != 0)
+                pr_warning("mlx4_core: log_num_vlan - obsolete module param, using %d\n",
+                           MLX4_LOG_NUM_VLANS);
 
         if ((log_mtts_per_seg < 1) || (log_mtts_per_seg > 7)) {
                 pr_warning("mlx4_core: bad log_mtts_per_seg: %d\n", log_mtts_per_seg);
diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
index cd1784593a3c..978688c31046 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@ -35,6 +35,7 @@
 #include <linux/etherdevice.h>
 
 #include <linux/mlx4/cmd.h>
+#include <linux/export.h>
 
 #include "mlx4.h"
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index a2fcd8402d37..5dfa68ffc11c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -335,6 +335,7 @@ struct mlx4_priv {
         struct mlx4_cmd         cmd;
 
         struct mlx4_bitmap      pd_bitmap;
+        struct mlx4_bitmap      xrcd_bitmap;
         struct mlx4_uar_table   uar_table;
         struct mlx4_mr_table    mr_table;
         struct mlx4_cq_table    cq_table;
@@ -384,6 +385,7 @@ int mlx4_alloc_eq_table(struct mlx4_dev *dev);
 void mlx4_free_eq_table(struct mlx4_dev *dev);
 
 int mlx4_init_pd_table(struct mlx4_dev *dev);
+int mlx4_init_xrcd_table(struct mlx4_dev *dev);
 int mlx4_init_uar_table(struct mlx4_dev *dev);
 int mlx4_init_mr_table(struct mlx4_dev *dev);
 int mlx4_init_eq_table(struct mlx4_dev *dev);
@@ -393,6 +395,7 @@ int mlx4_init_srq_table(struct mlx4_dev *dev);
 int mlx4_init_mcg_table(struct mlx4_dev *dev);
 
 void mlx4_cleanup_pd_table(struct mlx4_dev *dev);
+void mlx4_cleanup_xrcd_table(struct mlx4_dev *dev);
 void mlx4_cleanup_uar_table(struct mlx4_dev *dev);
 void mlx4_cleanup_mr_table(struct mlx4_dev *dev);
 void mlx4_cleanup_eq_table(struct mlx4_dev *dev);
@@ -450,6 +453,7 @@ void mlx4_init_vlan_table(struct mlx4_dev *dev, struct mlx4_vlan_table *table);
 
 int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port);
 int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps);
+int mlx4_check_ext_port_caps(struct mlx4_dev *dev, u8 port);
 
 int mlx4_qp_detach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
                           enum mlx4_protocol prot, enum mlx4_steer_type steer);
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index fca66165110e..8fda331c65df 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -581,8 +581,9 @@ extern const struct ethtool_ops mlx4_en_ethtool_ops;
  * printk / logging functions
  */
 
+__printf(3, 4)
 int en_print(const char *level, const struct mlx4_en_priv *priv,
-             const char *format, ...) __attribute__ ((format (printf, 3, 4)));
+             const char *format, ...);
 
 #define en_dbg(mlevel, priv, format, arg...)                    \
 do {                                                            \
diff --git a/drivers/net/ethernet/mellanox/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c
index 9c188bdd7f4f..efa3e77355e4 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mr.c
@@ -33,6 +33,7 @@
  */
 
 #include <linux/errno.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 
 #include <linux/mlx4/cmd.h>
@@ -139,7 +140,7 @@ static int mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order)
 
         buddy->bits = kzalloc((buddy->max_order + 1) * sizeof (long *),
                               GFP_KERNEL);
-        buddy->num_free = kzalloc((buddy->max_order + 1) * sizeof (int *),
+        buddy->num_free = kcalloc((buddy->max_order + 1), sizeof *buddy->num_free,
                                   GFP_KERNEL);
         if (!buddy->bits || !buddy->num_free)
                 goto err_out;
diff --git a/drivers/net/ethernet/mellanox/mlx4/pd.c b/drivers/net/ethernet/mellanox/mlx4/pd.c
index 1286b886dcea..260ed259ce9b 100644
--- a/drivers/net/ethernet/mellanox/mlx4/pd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/pd.c
@@ -32,6 +32,7 @@
  */
 
 #include <linux/errno.h>
+#include <linux/export.h>
 #include <linux/io-mapping.h>
 
 #include <asm/page.h>
@@ -61,6 +62,24 @@ void mlx4_pd_free(struct mlx4_dev *dev, u32 pdn)
 }
 EXPORT_SYMBOL_GPL(mlx4_pd_free);
 
+int mlx4_xrcd_alloc(struct mlx4_dev *dev, u32 *xrcdn)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        *xrcdn = mlx4_bitmap_alloc(&priv->xrcd_bitmap);
+        if (*xrcdn == -1)
+                return -ENOMEM;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mlx4_xrcd_alloc);
+
+void mlx4_xrcd_free(struct mlx4_dev *dev, u32 xrcdn)
+{
+        mlx4_bitmap_free(&mlx4_priv(dev)->xrcd_bitmap, xrcdn);
+}
+EXPORT_SYMBOL_GPL(mlx4_xrcd_free);
+
 int mlx4_init_pd_table(struct mlx4_dev *dev)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
@@ -74,6 +93,18 @@ void mlx4_cleanup_pd_table(struct mlx4_dev *dev)
         mlx4_bitmap_cleanup(&mlx4_priv(dev)->pd_bitmap);
 }
 
+int mlx4_init_xrcd_table(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+
+        return mlx4_bitmap_init(&priv->xrcd_bitmap, (1 << 16),
+                                (1 << 16) - 1, dev->caps.reserved_xrcds + 1, 0);
+}
+
+void mlx4_cleanup_xrcd_table(struct mlx4_dev *dev)
+{
+        mlx4_bitmap_cleanup(&mlx4_priv(dev)->xrcd_bitmap);
+}
 
 int mlx4_uar_alloc(struct mlx4_dev *dev, struct mlx4_uar *uar)
 {
diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
index 163a314c148f..d942aea4927b 100644
--- a/drivers/net/ethernet/mellanox/mlx4/port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/port.c
@@ -32,6 +32,7 @@
 
 #include <linux/errno.h>
 #include <linux/if_ether.h>
+#include <linux/export.h>
 
 #include <linux/mlx4/cmd.h>
 
@@ -148,22 +149,26 @@ int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn, u8 wrap)
 
         if (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER) {
                 err = mlx4_uc_steer_add(dev, port, mac, qpn, 1);
-                if (!err) {
-                        entry = kmalloc(sizeof *entry, GFP_KERNEL);
-                        if (!entry) {
-                                mlx4_uc_steer_release(dev, port, mac, *qpn, 1);
-                                return -ENOMEM;
-                        }
-                        entry->mac = mac;
-                        err = radix_tree_insert(&info->mac_tree, *qpn, entry);
-                        if (err) {
-                                mlx4_uc_steer_release(dev, port, mac, *qpn, 1);
-                                return err;
-                        }
-                } else
+                if (err)
                         return err;
+
+                entry = kmalloc(sizeof *entry, GFP_KERNEL);
+                if (!entry) {
+                        mlx4_uc_steer_release(dev, port, mac, *qpn, 1);
+                        return -ENOMEM;
+                }
+
+                entry->mac = mac;
+                err = radix_tree_insert(&info->mac_tree, *qpn, entry);
+                if (err) {
+                        kfree(entry);
+                        mlx4_uc_steer_release(dev, port, mac, *qpn, 1);
+                        return err;
+                }
         }
+
         mlx4_dbg(dev, "Registering MAC: 0x%llx\n", (unsigned long long) mac);
+
         mutex_lock(&table->mutex);
         for (i = 0; i < MLX4_MAX_MAC_NUM - 1; i++) {
                 if (free < 0 && !table->refs[i]) {
@@ -465,6 +470,48 @@ int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps)
         return err;
 }
 
+int mlx4_check_ext_port_caps(struct mlx4_dev *dev, u8 port)
+{
+        struct mlx4_cmd_mailbox *inmailbox, *outmailbox;
+        u8 *inbuf, *outbuf;
+        int err, packet_error;
+
+        inmailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(inmailbox))
+                return PTR_ERR(inmailbox);
+
+        outmailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(outmailbox)) {
+                mlx4_free_cmd_mailbox(dev, inmailbox);
+                return PTR_ERR(outmailbox);
+        }
+
+        inbuf = inmailbox->buf;
+        outbuf = outmailbox->buf;
+        memset(inbuf, 0, 256);
+        memset(outbuf, 0, 256);
+        inbuf[0] = 1;
+        inbuf[1] = 1;
+        inbuf[2] = 1;
+        inbuf[3] = 1;
+
+        *(__be16 *) (&inbuf[16]) = MLX4_ATTR_EXTENDED_PORT_INFO;
+        *(__be32 *) (&inbuf[20]) = cpu_to_be32(port);
+
+        err = mlx4_cmd_box(dev, inmailbox->dma, outmailbox->dma, port, 3,
+                           MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C);
+
+        packet_error = be16_to_cpu(*(__be16 *) (outbuf + 4));
+
+        dev->caps.ext_port_cap[port] = (!err && !packet_error) ?
+                                       MLX_EXT_PORT_CAP_FLAG_EXTENDED_PORT_INFO
+                                       : 0;
+
+        mlx4_free_cmd_mailbox(dev, inmailbox);
+        mlx4_free_cmd_mailbox(dev, outmailbox);
+        return err;
+}
+
 int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port)
 {
         struct mlx4_cmd_mailbox *mailbox;
diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c
index ec9350e5f21a..15f870cb2590 100644
--- a/drivers/net/ethernet/mellanox/mlx4/qp.c
+++ b/drivers/net/ethernet/mellanox/mlx4/qp.c
@@ -34,6 +34,7 @@
  */
 
 #include <linux/gfp.h>
+#include <linux/export.h>
 #include <linux/mlx4/cmd.h>
 #include <linux/mlx4/qp.h>
 
@@ -280,6 +281,9 @@ int mlx4_init_qp_table(struct mlx4_dev *dev)
          * We reserve 2 extra QPs per port for the special QPs.  The
          * block of special QPs must be aligned to a multiple of 8, so
          * round up.
+         *
+         * We also reserve the MSB of the 24-bit QP number to indicate
+         * that a QP is an XRC QP.
          */
         dev->caps.sqp_start =
                 ALIGN(dev->caps.reserved_qps_cnt[MLX4_QP_REGION_FW], 8);
diff --git a/drivers/net/ethernet/mellanox/mlx4/srq.c b/drivers/net/ethernet/mellanox/mlx4/srq.c
index 3b07b80a0456..9cbf3fce0145 100644
--- a/drivers/net/ethernet/mellanox/mlx4/srq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/srq.c
@@ -32,6 +32,7 @@
  */
 
 #include <linux/mlx4/cmd.h>
+#include <linux/export.h>
 #include <linux/gfp.h>
 
 #include "mlx4.h"
@@ -40,20 +41,20 @@
 struct mlx4_srq_context {
         __be32                  state_logsize_srqn;
         u8                      logstride;
-        u8                      reserved1[3];
-        u8                      pg_offset;
-        u8                      reserved2[3];
-        u32                     reserved3;
+        u8                      reserved1;
+        __be16                  xrcd;
+        __be32                  pg_offset_cqn;
+        u32                     reserved2;
         u8                      log_page_size;
-        u8                      reserved4[2];
+        u8                      reserved3[2];
         u8                      mtt_base_addr_h;
         __be32                  mtt_base_addr_l;
         __be32                  pd;
         __be16                  limit_watermark;
         __be16                  wqe_cnt;
-        u16                     reserved5;
+        u16                     reserved4;
         __be16                  wqe_counter;
-        u32                     reserved6;
+        u32                     reserved5;
         __be64                  db_rec_addr;
 };
 
@@ -109,8 +110,8 @@ static int mlx4_QUERY_SRQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox
                             MLX4_CMD_TIME_CLASS_A);
 }
 
-int mlx4_srq_alloc(struct mlx4_dev *dev, u32 pdn, struct mlx4_mtt *mtt,
-                   u64 db_rec, struct mlx4_srq *srq)
+int mlx4_srq_alloc(struct mlx4_dev *dev, u32 pdn, u32 cqn, u16 xrcd,
+                   struct mlx4_mtt *mtt, u64 db_rec, struct mlx4_srq *srq)
 {
         struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table;
         struct mlx4_cmd_mailbox *mailbox;
@@ -148,6 +149,8 @@ int mlx4_srq_alloc(struct mlx4_dev *dev, u32 pdn, struct mlx4_mtt *mtt,
         srq_context->state_logsize_srqn = cpu_to_be32((ilog2(srq->max) << 24) |
                                                       srq->srqn);
         srq_context->logstride          = srq->wqe_shift - 4;
+        srq_context->xrcd               = cpu_to_be16(xrcd);
+        srq_context->pg_offset_cqn      = cpu_to_be32(cqn & 0xffffff);
         srq_context->log_page_size      = mtt->page_shift - MLX4_ICM_PAGE_SHIFT;
 
         mtt_addr = mlx4_mtt_addr(dev, mtt);
diff --git a/drivers/net/ethernet/natsemi/Kconfig b/drivers/net/ethernet/natsemi/Kconfig
index 4a6b9fd073b6..eb836f770f50 100644
--- a/drivers/net/ethernet/natsemi/Kconfig
+++ b/drivers/net/ethernet/natsemi/Kconfig
@@ -5,7 +5,10 @@
 config NET_VENDOR_NATSEMI
         bool "National Semi-conductor devices"
         default y
-        depends on MCA || MAC || MACH_JAZZ || PCI || XTENSA_PLATFORM_XT2000
+        depends on AMIGA_PCMCIA || ARM || EISA || EXPERIMENTAL || H8300 || \
+                   ISA || M32R || MAC || MACH_JAZZ || MACH_TX49XX || MCA || \
+                   MCA_LEGACY || MIPS || PCI || PCMCIA || SUPERH || \
+                   XTENSA_PLATFORM_XT2000 || ZORRO
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
           and read the Ethernet-HOWTO, available from
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index 671e166b5af1..a83197d757c1 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -55,6 +55,7 @@
 #include <linux/firmware.h>
 #include <linux/net_tstamp.h>
 #include <linux/prefetch.h>
+#include <linux/module.h>
 #include "vxge-main.h"
 #include "vxge-reg.h"
 
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index 1e37eb98c4e2..1dca57013cb2 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -1682,6 +1682,7 @@ static void nv_get_hw_stats(struct net_device *dev)
                 np->estats.tx_pause += readl(base + NvRegTxPause);
                 np->estats.rx_pause += readl(base + NvRegRxPause);
                 np->estats.rx_drop_frame += readl(base + NvRegRxDropFrame);
+                np->estats.rx_errors_total += np->estats.rx_drop_frame;
         }
 
         if (np->driver_data & DEV_HAS_STATISTICS_V3) {
@@ -1706,11 +1707,14 @@ static struct net_device_stats *nv_get_stats(struct net_device *dev)
                 nv_get_hw_stats(dev);
 
                 /* copy to net_device stats */
+                dev->stats.tx_packets = np->estats.tx_packets;
+                dev->stats.rx_bytes = np->estats.rx_bytes;
                 dev->stats.tx_bytes = np->estats.tx_bytes;
                 dev->stats.tx_fifo_errors = np->estats.tx_fifo_errors;
                 dev->stats.tx_carrier_errors = np->estats.tx_carrier_errors;
                 dev->stats.rx_crc_errors = np->estats.rx_crc_errors;
                 dev->stats.rx_over_errors = np->estats.rx_over_errors;
+                dev->stats.rx_fifo_errors = np->estats.rx_drop_frame;
                 dev->stats.rx_errors = np->estats.rx_errors_total;
                 dev->stats.tx_errors = np->estats.tx_errors_total;
         }
@@ -2099,10 +2103,10 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         /* add fragments to entries count */
         for (i = 0; i < fragments; i++) {
-                u32 size = skb_frag_size(&skb_shinfo(skb)->frags[i]);
+                u32 frag_size = skb_frag_size(&skb_shinfo(skb)->frags[i]);
 
-                entries += (size >> NV_TX2_TSO_MAX_SHIFT) +
-                           ((size & (NV_TX2_TSO_MAX_SIZE-1)) ? 1 : 0);
+                entries += (frag_size >> NV_TX2_TSO_MAX_SHIFT) +
+                           ((frag_size & (NV_TX2_TSO_MAX_SIZE-1)) ? 1 : 0);
         }
 
         spin_lock_irqsave(&np->lock, flags);
@@ -2141,13 +2145,13 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
         /* setup the fragments */
         for (i = 0; i < fragments; i++) {
                 const skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-                u32 size = skb_frag_size(frag);
+                u32 frag_size = skb_frag_size(frag);
                 offset = 0;
 
                 do {
                         prev_tx = put_tx;
                         prev_tx_ctx = np->put_tx_ctx;
-                        bcnt = (size > NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : size;
+                        bcnt = (frag_size > NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : frag_size;
                         np->put_tx_ctx->dma = skb_frag_dma_map(
                                                         &np->pci_dev->dev,
                                                         frag, offset,
@@ -2159,12 +2163,12 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         put_tx->flaglen = cpu_to_le32((bcnt-1) | tx_flags);
 
                         offset += bcnt;
-                        size -= bcnt;
+                        frag_size -= bcnt;
                         if (unlikely(put_tx++ == np->last_tx.orig))
                                 put_tx = np->first_tx.orig;
                         if (unlikely(np->put_tx_ctx++ == np->last_tx_ctx))
                                 np->put_tx_ctx = np->first_tx_ctx;
-                } while (size);
+                } while (frag_size);
         }
 
         /* set last fragment flag  */
@@ -2213,10 +2217,10 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,
 
         /* add fragments to entries count */
         for (i = 0; i < fragments; i++) {
-                u32 size = skb_frag_size(&skb_shinfo(skb)->frags[i]);
+                u32 frag_size = skb_frag_size(&skb_shinfo(skb)->frags[i]);
 
-                entries += (size >> NV_TX2_TSO_MAX_SHIFT) +
-                           ((size & (NV_TX2_TSO_MAX_SIZE-1)) ? 1 : 0);
+                entries += (frag_size >> NV_TX2_TSO_MAX_SHIFT) +
+                           ((frag_size & (NV_TX2_TSO_MAX_SIZE-1)) ? 1 : 0);
         }
 
         spin_lock_irqsave(&np->lock, flags);
@@ -2257,13 +2261,13 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,
         /* setup the fragments */
         for (i = 0; i < fragments; i++) {
                 skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-                u32 size = skb_frag_size(frag);
+                u32 frag_size = skb_frag_size(frag);
                 offset = 0;
 
                 do {
                         prev_tx = put_tx;
                         prev_tx_ctx = np->put_tx_ctx;
-                        bcnt = (size > NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : size;
+                        bcnt = (frag_size > NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : frag_size;
                         np->put_tx_ctx->dma = skb_frag_dma_map(
                                                         &np->pci_dev->dev,
                                                         frag, offset,
@@ -2276,12 +2280,12 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,
                         put_tx->flaglen = cpu_to_le32((bcnt-1) | tx_flags);
 
                         offset += bcnt;
-                        size -= bcnt;
+                        frag_size -= bcnt;
                         if (unlikely(put_tx++ == np->last_tx.ex))
                                 put_tx = np->first_tx.ex;
                         if (unlikely(np->put_tx_ctx++ == np->last_tx_ctx))
                                 np->put_tx_ctx = np->first_tx_ctx;
-                } while (size);
+                } while (frag_size);
         }
 
         /* set last fragment flag  */
@@ -2374,16 +2378,8 @@ static int nv_tx_done(struct net_device *dev, int limit)
                 if (np->desc_ver == DESC_VER_1) {
                         if (flags & NV_TX_LASTPACKET) {
                                 if (flags & NV_TX_ERROR) {
-                                        if (flags & NV_TX_UNDERFLOW)
-                                                dev->stats.tx_fifo_errors++;
-                                        if (flags & NV_TX_CARRIERLOST)
-                                                dev->stats.tx_carrier_errors++;
                                         if ((flags & NV_TX_RETRYERROR) && !(flags & NV_TX_RETRYCOUNT_MASK))
                                                 nv_legacybackoff_reseed(dev);
-                                        dev->stats.tx_errors++;
-                                } else {
-                                        dev->stats.tx_packets++;
-                                        dev->stats.tx_bytes += np->get_tx_ctx->skb->len;
                                 }
                                 dev_kfree_skb_any(np->get_tx_ctx->skb);
                                 np->get_tx_ctx->skb = NULL;
@@ -2392,16 +2388,8 @@ static int nv_tx_done(struct net_device *dev, int limit)
                 } else {
                         if (flags & NV_TX2_LASTPACKET) {
                                 if (flags & NV_TX2_ERROR) {
-                                        if (flags & NV_TX2_UNDERFLOW)
-                                                dev->stats.tx_fifo_errors++;
-                                        if (flags & NV_TX2_CARRIERLOST)
-                                                dev->stats.tx_carrier_errors++;
                                         if ((flags & NV_TX2_RETRYERROR) && !(flags & NV_TX2_RETRYCOUNT_MASK))
                                                 nv_legacybackoff_reseed(dev);
-                                        dev->stats.tx_errors++;
-                                } else {
-                                        dev->stats.tx_packets++;
-                                        dev->stats.tx_bytes += np->get_tx_ctx->skb->len;
                                 }
                                 dev_kfree_skb_any(np->get_tx_ctx->skb);
                                 np->get_tx_ctx->skb = NULL;
@@ -2434,9 +2422,7 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit)
                 nv_unmap_txskb(np, np->get_tx_ctx);
 
                 if (flags & NV_TX2_LASTPACKET) {
-                        if (!(flags & NV_TX2_ERROR))
-                                dev->stats.tx_packets++;
-                        else {
+                        if (flags & NV_TX2_ERROR) {
                                 if ((flags & NV_TX2_RETRYERROR) && !(flags & NV_TX2_RETRYCOUNT_MASK)) {
                                         if (np->driver_data & DEV_HAS_GEAR_MODE)
                                                 nv_gear_backoff_reseed(dev);
@@ -2636,7 +2622,6 @@ static int nv_rx_process(struct net_device *dev, int limit)
                                         if ((flags & NV_RX_ERROR_MASK) == NV_RX_ERROR4) {
                                                 len = nv_getlen(dev, skb->data, len);
                                                 if (len < 0) {
-                                                        dev->stats.rx_errors++;
                                                         dev_kfree_skb(skb);
                                                         goto next_pkt;
                                                 }
@@ -2650,11 +2635,6 @@ static int nv_rx_process(struct net_device *dev, int limit)
                                         else {
                                                 if (flags & NV_RX_MISSEDFRAME)
                                                         dev->stats.rx_missed_errors++;
-                                                if (flags & NV_RX_CRCERR)
-                                                        dev->stats.rx_crc_errors++;
-                                                if (flags & NV_RX_OVERFLOW)
-                                                        dev->stats.rx_over_errors++;
-                                                dev->stats.rx_errors++;
                                                 dev_kfree_skb(skb);
                                                 goto next_pkt;
                                         }
@@ -2670,7 +2650,6 @@ static int nv_rx_process(struct net_device *dev, int limit)
                                         if ((flags & NV_RX2_ERROR_MASK) == NV_RX2_ERROR4) {
                                                 len = nv_getlen(dev, skb->data, len);
                                                 if (len < 0) {
-                                                        dev->stats.rx_errors++;
                                                         dev_kfree_skb(skb);
                                                         goto next_pkt;
                                                 }
@@ -2682,11 +2661,6 @@ static int nv_rx_process(struct net_device *dev, int limit)
                                         }
                                         /* the rest are hard errors */
                                         else {
-                                                if (flags & NV_RX2_CRCERR)
-                                                        dev->stats.rx_crc_errors++;
-                                                if (flags & NV_RX2_OVERFLOW)
-                                                        dev->stats.rx_over_errors++;
-                                                dev->stats.rx_errors++;
                                                 dev_kfree_skb(skb);
                                                 goto next_pkt;
                                         }
@@ -2704,7 +2678,6 @@ static int nv_rx_process(struct net_device *dev, int limit)
                 skb->protocol = eth_type_trans(skb, dev);
                 napi_gro_receive(&np->napi, skb);
                 dev->stats.rx_packets++;
-                dev->stats.rx_bytes += len;
 next_pkt:
                 if (unlikely(np->get_rx.orig++ == np->last_rx.orig))
                         np->get_rx.orig = np->first_rx.orig;
@@ -2787,9 +2760,7 @@ static int nv_rx_process_optimized(struct net_device *dev, int limit)
                                 __vlan_hwaccel_put_tag(skb, vid);
                         }
                         napi_gro_receive(&np->napi, skb);
-
                         dev->stats.rx_packets++;
-                        dev->stats.rx_bytes += len;
                 } else {
                         dev_kfree_skb(skb);
                 }
@@ -2962,11 +2933,11 @@ static void nv_set_multicast(struct net_device *dev)
                                 struct netdev_hw_addr *ha;
 
                                 netdev_for_each_mc_addr(ha, dev) {
-                                        unsigned char *addr = ha->addr;
+                                        unsigned char *hw_addr = ha->addr;
                                         u32 a, b;
 
-                                        a = le32_to_cpu(*(__le32 *) addr);
-                                        b = le16_to_cpu(*(__le16 *) (&addr[4]));
+                                        a = le32_to_cpu(*(__le32 *) hw_addr);
+                                        b = le16_to_cpu(*(__le16 *) (&hw_addr[4]));
                                         alwaysOn[0] &= a;
                                         alwaysOff[0] &= ~a;
                                         alwaysOn[1] &= b;
@@ -3398,7 +3369,8 @@ static irqreturn_t nv_nic_irq_tx(int foo, void *data)
 
         for (i = 0;; i++) {
                 events = readl(base + NvRegMSIXIrqStatus) & NVREG_IRQ_TX_ALL;
-                writel(NVREG_IRQ_TX_ALL, base + NvRegMSIXIrqStatus);
+                writel(events, base + NvRegMSIXIrqStatus);
+                netdev_dbg(dev, "tx irq events: %08x\n", events);
                 if (!(events & np->irqmask))
                         break;
 
@@ -3509,7 +3481,8 @@ static irqreturn_t nv_nic_irq_rx(int foo, void *data)
 
         for (i = 0;; i++) {
                 events = readl(base + NvRegMSIXIrqStatus) & NVREG_IRQ_RX_ALL;
-                writel(NVREG_IRQ_RX_ALL, base + NvRegMSIXIrqStatus);
+                writel(events, base + NvRegMSIXIrqStatus);
+                netdev_dbg(dev, "rx irq events: %08x\n", events);
                 if (!(events & np->irqmask))
                         break;
 
@@ -3553,7 +3526,8 @@ static irqreturn_t nv_nic_irq_other(int foo, void *data)
 
         for (i = 0;; i++) {
                 events = readl(base + NvRegMSIXIrqStatus) & NVREG_IRQ_OTHER;
-                writel(NVREG_IRQ_OTHER, base + NvRegMSIXIrqStatus);
+                writel(events, base + NvRegMSIXIrqStatus);
+                netdev_dbg(dev, "irq events: %08x\n", events);
                 if (!(events & np->irqmask))
                         break;
 
@@ -3617,10 +3591,10 @@ static irqreturn_t nv_nic_irq_test(int foo, void *data)
 
         if (!(np->msi_flags & NV_MSI_X_ENABLED)) {
                 events = readl(base + NvRegIrqStatus) & NVREG_IRQSTAT_MASK;
-                writel(NVREG_IRQ_TIMER, base + NvRegIrqStatus);
+                writel(events & NVREG_IRQ_TIMER, base + NvRegIrqStatus);
         } else {
                 events = readl(base + NvRegMSIXIrqStatus) & NVREG_IRQSTAT_MASK;
-                writel(NVREG_IRQ_TIMER, base + NvRegMSIXIrqStatus);
+                writel(events & NVREG_IRQ_TIMER, base + NvRegMSIXIrqStatus);
         }
         pci_push(base);
         if (!(events & NVREG_IRQ_TIMER))
@@ -4566,7 +4540,7 @@ static void nv_get_ethtool_stats(struct net_device *dev, struct ethtool_stats *e
         struct fe_priv *np = netdev_priv(dev);
 
         /* update stats */
-        nv_do_stats_poll((unsigned long)dev);
+        nv_get_hw_stats(dev);
 
         memcpy(buffer, &np->estats, nv_get_sset_count(dev, ETH_SS_STATS)*sizeof(u64));
 }
diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c
index bc1d946b7971..212f43b308a3 100644
--- a/drivers/net/ethernet/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/octeon/octeon_mgmt.c
@@ -9,6 +9,7 @@
 #include <linux/capability.h>
 #include <linux/dma-mapping.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index b89f3a684aec..48406ca382f1 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -20,6 +20,7 @@
 
 #include "pch_gbe.h"
 #include "pch_gbe_api.h"
+#include <linux/module.h>
 
 #define DRV_VERSION     "1.00"
 const char pch_driver_version[] = DRV_VERSION;
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
index 5b5d90a47e29..9c075ea2682e 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#include <linux/module.h>       /* for __MODULE_STRING */
 #include "pch_gbe.h"
 
 #define OPTION_UNSET   -1
diff --git a/drivers/net/ethernet/realtek/Kconfig b/drivers/net/ethernet/realtek/Kconfig
index 84083ec6e612..0578859a3c73 100644
--- a/drivers/net/ethernet/realtek/Kconfig
+++ b/drivers/net/ethernet/realtek/Kconfig
@@ -115,16 +115,4 @@ config R8169
           To compile this driver as a module, choose M here: the module
           will be called r8169.  This is recommended.
 
-config SC92031
-        tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
-        depends on PCI && EXPERIMENTAL
-        select CRC32
-        ---help---
-          This is a driver for the Fast Ethernet PCI network cards based on
-          the Silan SC92031 chip (sometimes also called Rsltek 8139D). If you
-          have one of these, say Y here.
-
-          To compile this driver as a module, choose M here: the module
-          will be called sc92031.  This is recommended.
-
 endif # NET_VENDOR_REALTEK
diff --git a/drivers/net/ethernet/realtek/Makefile b/drivers/net/ethernet/realtek/Makefile
index e48cfb6ac42d..71b1da30ecb5 100644
--- a/drivers/net/ethernet/realtek/Makefile
+++ b/drivers/net/ethernet/realtek/Makefile
@@ -6,4 +6,3 @@ obj-$(CONFIG_8139CP) += 8139cp.o
 obj-$(CONFIG_8139TOO) += 8139too.o
 obj-$(CONFIG_ATP) += atp.o
 obj-$(CONFIG_R8169) += r8169.o
-obj-$(CONFIG_SC92031) += sc92031.o
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index de9afebe1830..d5731f1fe6d6 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -2229,13 +2229,15 @@ void efx_schedule_reset(struct efx_nic *efx, enum reset_type type)
 
 /* PCI device ID table */
 static DEFINE_PCI_DEVICE_TABLE(efx_pci_table) = {
-        {PCI_DEVICE(EFX_VENDID_SFC, FALCON_A_P_DEVID),
+        {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE,
+                    PCI_DEVICE_ID_SOLARFLARE_SFC4000A_0),
          .driver_data = (unsigned long) &falcon_a1_nic_type},
-        {PCI_DEVICE(EFX_VENDID_SFC, FALCON_B_P_DEVID),
+        {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE,
+                    PCI_DEVICE_ID_SOLARFLARE_SFC4000B),
          .driver_data = (unsigned long) &falcon_b0_nic_type},
-        {PCI_DEVICE(EFX_VENDID_SFC, BETHPAGE_A_P_DEVID),
+        {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, BETHPAGE_A_P_DEVID),
          .driver_data = (unsigned long) &siena_a0_nic_type},
-        {PCI_DEVICE(EFX_VENDID_SFC, SIENA_A_P_DEVID),
+        {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, SIENA_A_P_DEVID),
          .driver_data = (unsigned long) &siena_a0_nic_type},
         {0}                     /* end of list */
 };
diff --git a/drivers/net/ethernet/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h
index 442f4d0c247d..4764793ed234 100644
--- a/drivers/net/ethernet/sfc/efx.h
+++ b/drivers/net/ethernet/sfc/efx.h
@@ -15,10 +15,6 @@
 #include "filter.h"
 
 /* PCI IDs */
-#define EFX_VENDID_SFC          0x1924
-#define FALCON_A_P_DEVID        0x0703
-#define FALCON_A_S_DEVID        0x6703
-#define FALCON_B_P_DEVID        0x0710
 #define BETHPAGE_A_P_DEVID      0x0803
 #define SIENA_A_P_DEVID         0x0813
 
diff --git a/drivers/net/ethernet/sfc/falcon.c b/drivers/net/ethernet/sfc/falcon.c
index 4dd1748a19c6..97b606b92e88 100644
--- a/drivers/net/ethernet/sfc/falcon.c
+++ b/drivers/net/ethernet/sfc/falcon.c
@@ -1426,7 +1426,8 @@ static int falcon_probe_nic(struct efx_nic *efx)
                 }
 
                 dev = pci_dev_get(efx->pci_dev);
-                while ((dev = pci_get_device(EFX_VENDID_SFC, FALCON_A_S_DEVID,
+                while ((dev = pci_get_device(PCI_VENDOR_ID_SOLARFLARE,
+                                             PCI_DEVICE_ID_SOLARFLARE_SFC4000A_1,
                                              dev))) {
                         if (dev->bus == efx->pci_dev->bus &&
                             dev->devfn == efx->pci_dev->devfn + 1) {
diff --git a/drivers/net/ethernet/sfc/falcon_boards.c b/drivers/net/ethernet/sfc/falcon_boards.c
index b9cc846811d6..6cc16b8cc6f4 100644
--- a/drivers/net/ethernet/sfc/falcon_boards.c
+++ b/drivers/net/ethernet/sfc/falcon_boards.c
@@ -764,7 +764,8 @@ int falcon_probe_board(struct efx_nic *efx, u16 revision_info)
 
         if (board->type) {
                 netif_info(efx, probe, efx->net_dev, "board is %s rev %c%d\n",
-                         (efx->pci_dev->subsystem_vendor == EFX_VENDID_SFC)
+                         (efx->pci_dev->subsystem_vendor ==
+                          PCI_VENDOR_ID_SOLARFLARE)
                          ? board->type->ref_model : board->type->gen_type,
                          'A' + board->major, board->minor);
                 return 0;
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c
index adbda182f159..752d521c09b1 100644
--- a/drivers/net/ethernet/sfc/rx.c
+++ b/drivers/net/ethernet/sfc/rx.c
@@ -15,6 +15,7 @@
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/prefetch.h>
+#include <linux/moduleparam.h>
 #include <net/ip.h>
 #include <net/checksum.h>
 #include "net_driver.h"
diff --git a/drivers/net/ethernet/silan/Kconfig b/drivers/net/ethernet/silan/Kconfig
new file mode 100644
index 000000000000..ae1ce170864d
--- /dev/null
+++ b/drivers/net/ethernet/silan/Kconfig
@@ -0,0 +1,33 @@
+#
+# Silan device configuration
+#
+
+config NET_VENDOR_SILAN
+        bool "Silan devices"
+        default y
+        depends on PCI && EXPERIMENTAL
+        ---help---
+          If you have a network (Ethernet) card belonging to this class, say Y
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+
+          Note that the answer to this question doesn't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about Silan devices. If you say Y, you will be asked for
+          your specific card in the following questions.
+
+if NET_VENDOR_SILAN
+
+config SC92031
+        tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
+        depends on PCI && EXPERIMENTAL
+        select CRC32
+        ---help---
+          This is a driver for the Fast Ethernet PCI network cards based on
+          the Silan SC92031 chip (sometimes also called Rsltek 8139D). If you
+          have one of these, say Y here.
+
+          To compile this driver as a module, choose M here: the module
+          will be called sc92031.  This is recommended.
+
+endif # NET_VENDOR_SILAN
diff --git a/drivers/net/ethernet/silan/Makefile b/drivers/net/ethernet/silan/Makefile
new file mode 100644
index 000000000000..4ad3523dcb92
--- /dev/null
+++ b/drivers/net/ethernet/silan/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Silan network device drivers.
+#
+
+obj-$(CONFIG_SC92031) += sc92031.o
diff --git a/drivers/net/ethernet/realtek/sc92031.c b/drivers/net/ethernet/silan/sc92031.c
index a284d6440538..a284d6440538 100644
--- a/drivers/net/ethernet/realtek/sc92031.c
+++ b/drivers/net/ethernet/silan/sc92031.c
diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c
index 4f15680849ff..edb24b0e337b 100644
--- a/drivers/net/ethernet/smsc/smsc9420.c
+++ b/drivers/net/ethernet/smsc/smsc9420.c
@@ -28,6 +28,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/crc32.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <asm/unaligned.h>
 #include "smsc9420.h"
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index ac6f190743dd..22745d7bf530 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -29,15 +29,6 @@ config STMMAC_DA
           By default, the DMA arbitration scheme is based on Round-robin
           (rx:tx priority is 1:1).
 
-config STMMAC_DUAL_MAC
-        bool "STMMAC: dual mac support (EXPERIMENTAL)"
-        default n
-        depends on EXPERIMENTAL && STMMAC_ETH && !STMMAC_TIMER
-        ---help---
-          Some ST SoCs (for example the stx7141 and stx7200c2) have two
-          Ethernet Controllers. This option turns on the second Ethernet
-          device on this kind of platforms.
-
 config STMMAC_TIMER
         bool "STMMAC Timer optimisation"
         default n
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
index ddb33cfd3543..7bf1e2015784 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
@@ -1674,6 +1674,9 @@ static int __devinit ps3_gelic_driver_probe(struct ps3_system_bus_device *dev)
         int result;
 
         pr_debug("%s: called\n", __func__);
+
+        udbg_shutdown_ps3gelic();
+
         result = ps3_open_hv_device(dev);
 
         if (result) {
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.h b/drivers/net/ethernet/toshiba/ps3_gelic_net.h
index d3fadfbc3bcc..a93df6ac1909 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_net.h
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.h
@@ -359,6 +359,12 @@ static inline void *port_priv(struct gelic_port *port)
         return port->priv;
 }
 
+#ifdef CONFIG_PPC_EARLY_DEBUG_PS3GELIC
+extern void udbg_shutdown_ps3gelic(void);
+#else
+static inline void udbg_shutdown_ps3gelic(void) {}
+#endif
+
 extern int gelic_card_set_irq_mask(struct gelic_card *card, u64 mask);
 /* shared netdev ops */
 extern void gelic_card_up(struct gelic_card *card);
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 4d1658e78dee..caf3659e173c 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -716,8 +716,8 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
                 cur_p = &lp->tx_bd_v[lp->tx_bd_tail];
                 cur_p->phys = dma_map_single(ndev->dev.parent,
                                              skb_frag_address(frag),
-                                             frag_size(frag), DMA_TO_DEVICE);
-                cur_p->len = frag_size(frag);
+                                             skb_frag_size(frag), DMA_TO_DEVICE);
+                cur_p->len = skb_frag_size(frag);
                 cur_p->app0 = 0;
                 frag++;
         }
diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
index ec96d910e9a3..f45c85a84261 100644
--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -35,6 +35,7 @@
 #include <linux/platform_device.h>
 #include <linux/ptp_classify.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <mach/ixp46x_ts.h>
 #include <mach/npe.h>
 #include <mach/qmgr.h>
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index a40fab44b9ae..d423d18b4ad6 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -314,7 +314,7 @@ config TOSHIBA_FIR
 
 config AU1000_FIR
         tristate "Alchemy Au1000 SIR/FIR"
-        depends on SOC_AU1000 && IRDA
+        depends on IRDA && MIPS_ALCHEMY
 
 config SMC_IRCC_FIR
         tristate "SMSC IrCC (EXPERIMENTAL)"
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index a3ce3d4561ed..74134970b709 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -192,6 +192,13 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb)
                          */
                         macvlan_broadcast(skb, port, src->dev,
                                           MACVLAN_MODE_VEPA);
+                else {
+                        /* forward to original port. */
+                        vlan = src;
+                        ret = macvlan_broadcast_one(skb, vlan, eth, 0);
+                        goto out;
+                }
+
                 return RX_HANDLER_PASS;
         }
 
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index a4eae750a414..f414ffb5b728 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -14,6 +14,7 @@
  *
  */
 #include <linux/phy.h>
+#include <linux/module.h>
 
 #define RTL821x_PHYSR           0x11
 #define RTL821x_PHYSR_DUPLEX    0x2000
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index 3bb131137033..7145714a5ec9 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -88,8 +88,8 @@ static struct rio_dev **rionet_active;
 #define dev_rionet_capable(dev) \
         is_rionet_capable(dev->src_ops, dev->dst_ops)
 
-#define RIONET_MAC_MATCH(x)     (*(u32 *)x == 0x00010001)
-#define RIONET_GET_DESTID(x)    (*(u16 *)(x + 4))
+#define RIONET_MAC_MATCH(x)     (!memcmp((x), "\00\01\00\01", 4))
+#define RIONET_GET_DESTID(x)    ((*((u8 *)x + 4) << 8) | *((u8 *)x + 5))
 
 static int rionet_rx_clean(struct net_device *ndev)
 {
diff --git a/drivers/net/usb/lg-vl600.c b/drivers/net/usb/lg-vl600.c
index 1e7221951056..d43db32f9478 100644
--- a/drivers/net/usb/lg-vl600.c
+++ b/drivers/net/usb/lg-vl600.c
@@ -27,6 +27,7 @@
 #include <linux/if_ether.h>
 #include <linux/if_arp.h>
 #include <linux/inetdevice.h>
+#include <linux/module.h>
 
 /*
  * The device has a CDC ACM port for modem control (it claims to be
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 7d6082160bcc..fae0fbd8bc88 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1057,7 +1057,8 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
         unsigned long           flags;
         int retval;
 
-        skb_tx_timestamp(skb);
+        if (skb)
+                skb_tx_timestamp(skb);
 
         // some devices want funky USB-level framing, for
         // win32 driver (usually) and/or hardware quirks
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 5b23767ea817..ef883e97cee0 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -17,6 +17,7 @@
 #include <net/dst.h>
 #include <net/xfrm.h>
 #include <linux/veth.h>
+#include <linux/module.h>
 
 #define DRV_NAME        "veth"
 #define DRV_VERSION     "1.0"
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 91039ab16728..6ee8410443c4 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -925,12 +925,10 @@ static void virtnet_update_status(struct virtnet_info *vi)
 {
         u16 v;
 
-        if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS))
-                return;
-
-        vi->vdev->config->get(vi->vdev,
+        if (virtio_config_val(vi->vdev, VIRTIO_NET_F_STATUS,
                               offsetof(struct virtio_net_config, status),
-                              &v, sizeof(v));
+                              &v) < 0)
+                return;
 
         /* Ignore unknown (future) status bits */
         v &= VIRTIO_NET_S_LINK_UP;
@@ -1006,11 +1004,9 @@ static int virtnet_probe(struct virtio_device *vdev)
         }
 
         /* Configuration may specify what MAC to use.  Otherwise random. */
-        if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) {
-                vdev->config->get(vdev,
+        if (virtio_config_val_len(vdev, VIRTIO_NET_F_MAC,
                                   offsetof(struct virtio_net_config, mac),
-                                  dev->dev_addr, dev->addr_len);
-        } else
+                                  dev->dev_addr, dev->addr_len) < 0)
                 random_ether_addr(dev->dev_addr);
 
         /* Set up our device-specific information */
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index b771ebac0f01..d96bfb1ac20b 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -24,6 +24,7 @@
  *
  */
 
+#include <linux/module.h>
 #include <net/ip6_checksum.h>
 
 #include "vmxnet3_int.h"
diff --git a/drivers/net/wimax/i2400m/control.c b/drivers/net/wimax/i2400m/control.c
index 727d728649b7..2fea02b35b2d 100644
--- a/drivers/net/wimax/i2400m/control.c
+++ b/drivers/net/wimax/i2400m/control.c
@@ -78,6 +78,8 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/wimax/i2400m.h>
+#include <linux/export.h>
+#include <linux/moduleparam.h>
 
 
 #define D_SUBMODULE control
diff --git a/drivers/net/wimax/i2400m/debugfs.c b/drivers/net/wimax/i2400m/debugfs.c
index 9c70b5fa3f51..129ba36bd04d 100644
--- a/drivers/net/wimax/i2400m/debugfs.c
+++ b/drivers/net/wimax/i2400m/debugfs.c
@@ -26,6 +26,7 @@
 #include <linux/etherdevice.h>
 #include <linux/spinlock.h>
 #include <linux/device.h>
+#include <linux/export.h>
 #include "i2400m.h"
 
 
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
index 85dadd5bf4be..7cbd7d231e11 100644
--- a/drivers/net/wimax/i2400m/fw.c
+++ b/drivers/net/wimax/i2400m/fw.c
@@ -158,6 +158,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/usb.h>
+#include <linux/export.h>
 #include "i2400m.h"
 
 
diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c
index 2edd8fe1c1f3..64a110604ad3 100644
--- a/drivers/net/wimax/i2400m/netdev.c
+++ b/drivers/net/wimax/i2400m/netdev.c
@@ -76,6 +76,7 @@
 #include <linux/slab.h>
 #include <linux/netdevice.h>
 #include <linux/ethtool.h>
+#include <linux/export.h>
 #include "i2400m.h"
 
 
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
index 2f94a872101f..37becfcc98f2 100644
--- a/drivers/net/wimax/i2400m/rx.c
+++ b/drivers/net/wimax/i2400m/rx.c
@@ -149,6 +149,8 @@
 #include <linux/if_arp.h>
 #include <linux/netdevice.h>
 #include <linux/workqueue.h>
+#include <linux/export.h>
+#include <linux/moduleparam.h>
 #include "i2400m.h"
 
 
diff --git a/drivers/net/wimax/i2400m/sdio.c b/drivers/net/wimax/i2400m/sdio.c
index be428cae28d8..21a9edd6e75d 100644
--- a/drivers/net/wimax/i2400m/sdio.c
+++ b/drivers/net/wimax/i2400m/sdio.c
@@ -55,6 +55,7 @@
 #include <linux/mmc/sdio_func.h>
 #include "i2400m-sdio.h"
 #include <linux/wimax/i2400m.h>
+#include <linux/module.h>
 
 #define D_SUBMODULE main
 #include "sdio-debug-levels.h"
diff --git a/drivers/net/wimax/i2400m/tx.c b/drivers/net/wimax/i2400m/tx.c
index 4b30ed11d785..4b9ecb20deec 100644
--- a/drivers/net/wimax/i2400m/tx.c
+++ b/drivers/net/wimax/i2400m/tx.c
@@ -245,6 +245,7 @@
  */
 #include <linux/netdevice.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "i2400m.h"
 
 
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index 9a644d052f1e..2c1b8b687646 100644
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -67,6 +67,7 @@
 #include <linux/wimax/i2400m.h>
 #include <linux/debugfs.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 
 
 #define D_SUBMODULE usb
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index c1c0678b1fb6..98db76196b59 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -42,7 +42,7 @@ obj-$(CONFIG_ADM8211)	+= adm8211.o
 obj-$(CONFIG_MWL8K)     += mwl8k.o
 
 obj-$(CONFIG_IWLWIFI)   += iwlwifi/
-obj-$(CONFIG_IWLWIFI_LEGACY)    += iwlegacy/
+obj-$(CONFIG_IWLEGACY)  += iwlegacy/
 obj-$(CONFIG_RT2X00)    += rt2x00/
 
 obj-$(CONFIG_P54_COMMON)        += p54/
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index 3b752d9fb3cd..f5ce5623da99 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/crc32.h>
 #include <linux/eeprom_93cx6.h>
+#include <linux/module.h>
 #include <net/mac80211.h>
 
 #include "adm8211.h"
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 39322d4121b7..4045e5ab0555 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -517,7 +517,7 @@ static char *hex2str(void *buf, size_t len)
                 goto exit;
 
         while (len--) {
-                obuf = pack_hex_byte(obuf, *ibuf++);
+                obuf = hex_byte_pack(obuf, *ibuf++);
                 *obuf++ = '-';
         }
         obuf--;
diff --git a/drivers/net/wireless/ath/Kconfig b/drivers/net/wireless/ath/Kconfig
index 073548836413..09602241901b 100644
--- a/drivers/net/wireless/ath/Kconfig
+++ b/drivers/net/wireless/ath/Kconfig
@@ -1,6 +1,6 @@
 menuconfig ATH_COMMON
         tristate "Atheros Wireless Cards"
-        depends on CFG80211
+        depends on CFG80211 && (!UML || BROKEN)
         ---help---
           This will enable the support for the Atheros wireless drivers.
           ath5k, ath9k, ath9k_htc and ar9170 drivers share some common code, this option
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index fe4bf4da255f..c1d699fd5717 100644
--- a/drivers/net/wireless/ath/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -152,6 +152,7 @@ struct ath_common {
         struct ath_cycle_counters cc_survey;
 
         struct ath_regulatory regulatory;
+        struct ath_regulatory reg_world_copy;
         const struct ath_ops *ops;
         const struct ath_bus_ops *bus_ops;
 
@@ -173,8 +174,7 @@ bool ath_hw_keyreset(struct ath_common *common, u16 entry);
 void ath_hw_cycle_counters_update(struct ath_common *common);
 int32_t ath_hw_get_listen_time(struct ath_common *common);
 
-extern __attribute__((format (printf, 2, 3)))
-void ath_printk(const char *level, const char *fmt, ...);
+extern __printf(2, 3) void ath_printk(const char *level, const char *fmt, ...);
 
 #define _ath_printk(level, common, fmt, ...)                    \
 do {                                                            \
@@ -215,6 +215,10 @@ do {								\
  * @ATH_DBG_HWTIMER: hardware timer handling
  * @ATH_DBG_BTCOEX: bluetooth coexistance
  * @ATH_DBG_BSTUCK: stuck beacons
+ * @ATH_DBG_MCI: Message Coexistence Interface, a private protocol
+ *      used exclusively for WLAN-BT coexistence starting from
+ *      AR9462.
+ * @ATH_DBG_DFS: radar datection
  * @ATH_DBG_ANY: enable all debugging
  *
  * The debug level is used to control the amount and type of debugging output
@@ -241,6 +245,7 @@ enum ATH_DEBUG {
         ATH_DBG_WMI             = 0x00004000,
         ATH_DBG_BSTUCK          = 0x00008000,
         ATH_DBG_MCI             = 0x00010000,
+        ATH_DBG_DFS             = 0x00020000,
         ATH_DBG_ANY             = 0xffffffff
 };
 
@@ -259,7 +264,7 @@ do {									\
 
 #else
 
-static inline  __attribute__((format (printf, 3, 4)))
+static inline  __attribute__ ((format (printf, 3, 4)))
 void ath_dbg(struct ath_common *common, enum ATH_DEBUG dbg_mask,
              const char *fmt, ...)
 {
diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c
index e5be7e701816..ee7ea572b065 100644
--- a/drivers/net/wireless/ath/ath5k/ahb.c
+++ b/drivers/net/wireless/ath/ath5k/ahb.c
@@ -166,7 +166,9 @@ static int ath_ahb_probe(struct platform_device *pdev)
                 if (to_platform_device(ah->dev)->id == 0 &&
                     (bcfg->config->flags & (BD_WLAN0 | BD_WLAN1)) ==
                      (BD_WLAN1 | BD_WLAN0))
-                        __set_bit(ATH_STAT_2G_DISABLED, ah->status);
+                        ah->ah_capabilities.cap_needs_2GHz_ovr = true;
+                else
+                        ah->ah_capabilities.cap_needs_2GHz_ovr = false;
         }
 
         ret = ath5k_init_ah(ah, &ath_ahb_bus_ops);
diff --git a/drivers/net/wireless/ath/ath5k/ani.c b/drivers/net/wireless/ath/ath5k/ani.c
index bea90e6be70e..bf674161a217 100644
--- a/drivers/net/wireless/ath/ath5k/ani.c
+++ b/drivers/net/wireless/ath/ath5k/ani.c
@@ -27,15 +27,21 @@
  * or reducing sensitivity as necessary.
  *
  * The parameters are:
+ *
  *   - "noise immunity"
+ *
  *   - "spur immunity"
+ *
  *   - "firstep level"
+ *
  *   - "OFDM weak signal detection"
+ *
  *   - "CCK weak signal detection"
  *
  * Basically we look at the amount of ODFM and CCK timing errors we get and then
  * raise or lower immunity accordingly by setting one or more of these
  * parameters.
+ *
  * Newer chipsets have PHY error counters in hardware which will generate a MIB
  * interrupt when they overflow. Older hardware has too enable PHY error frames
  * by setting a RX flag and then count every single PHY error. When a specified
@@ -45,11 +51,13 @@
  */
 
 
-/*** ANI parameter control ***/
+/***********************\
+* ANI parameter control *
+\***********************/
 
 /**
  * ath5k_ani_set_noise_immunity_level() - Set noise immunity level
- *
+ * @ah: The &struct ath5k_hw
  * @level: level between 0 and @ATH5K_ANI_MAX_NOISE_IMM_LVL
  */
 void
@@ -91,12 +99,11 @@ ath5k_ani_set_noise_immunity_level(struct ath5k_hw *ah, int level)
         ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_ANI, "new level %d", level);
 }
 
-
 /**
  * ath5k_ani_set_spur_immunity_level() - Set spur immunity level
- *
+ * @ah: The &struct ath5k_hw
  * @level: level between 0 and @max_spur_level (the maximum level is dependent
- *      on the chip revision).
+ * on the chip revision).
  */
 void
 ath5k_ani_set_spur_immunity_level(struct ath5k_hw *ah, int level)
@@ -117,10 +124,9 @@ ath5k_ani_set_spur_immunity_level(struct ath5k_hw *ah, int level)
         ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_ANI, "new level %d", level);
 }
 
-
 /**
  * ath5k_ani_set_firstep_level() - Set "firstep" level
- *
+ * @ah: The &struct ath5k_hw
  * @level: level between 0 and @ATH5K_ANI_MAX_FIRSTEP_LVL
  */
 void
@@ -140,11 +146,9 @@ ath5k_ani_set_firstep_level(struct ath5k_hw *ah, int level)
         ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_ANI, "new level %d", level);
 }
 
-
 /**
- * ath5k_ani_set_ofdm_weak_signal_detection() - Control OFDM weak signal
- *                                              detection
- *
+ * ath5k_ani_set_ofdm_weak_signal_detection() - Set OFDM weak signal detection
+ * @ah: The &struct ath5k_hw
  * @on: turn on or off
  */
 void
@@ -182,10 +186,9 @@ ath5k_ani_set_ofdm_weak_signal_detection(struct ath5k_hw *ah, bool on)
                           on ? "on" : "off");
 }
 
-
 /**
- * ath5k_ani_set_cck_weak_signal_detection() - control CCK weak signal detection
- *
+ * ath5k_ani_set_cck_weak_signal_detection() - Set CCK weak signal detection
+ * @ah: The &struct ath5k_hw
  * @on: turn on or off
  */
 void
@@ -200,13 +203,16 @@ ath5k_ani_set_cck_weak_signal_detection(struct ath5k_hw *ah, bool on)
 }
 
 
-/*** ANI algorithm ***/
+/***************\
+* ANI algorithm *
+\***************/
 
 /**
  * ath5k_ani_raise_immunity() - Increase noise immunity
- *
+ * @ah: The &struct ath5k_hw
+ * @as: The &struct ath5k_ani_state
  * @ofdm_trigger: If this is true we are called because of too many OFDM errors,
- *      the algorithm will tune more parameters then.
+ * the algorithm will tune more parameters then.
  *
  * Try to raise noise immunity (=decrease sensitivity) in several steps
  * depending on the average RSSI of the beacons we received.
@@ -290,9 +296,10 @@ ath5k_ani_raise_immunity(struct ath5k_hw *ah, struct ath5k_ani_state *as,
         */
 }
 
-
 /**
  * ath5k_ani_lower_immunity() - Decrease noise immunity
+ * @ah: The &struct ath5k_hw
+ * @as: The &struct ath5k_ani_state
  *
  * Try to lower noise immunity (=increase sensitivity) in several steps
  * depending on the average RSSI of the beacons we received.
@@ -352,9 +359,10 @@ ath5k_ani_lower_immunity(struct ath5k_hw *ah, struct ath5k_ani_state *as)
         }
 }
 
-
 /**
  * ath5k_hw_ani_get_listen_time() - Update counters and return listening time
+ * @ah: The &struct ath5k_hw
+ * @as: The &struct ath5k_ani_state
  *
  * Return an approximation of the time spent "listening" in milliseconds (ms)
  * since the last call of this function.
@@ -379,9 +387,10 @@ ath5k_hw_ani_get_listen_time(struct ath5k_hw *ah, struct ath5k_ani_state *as)
         return listen;
 }
 
-
 /**
  * ath5k_ani_save_and_clear_phy_errors() - Clear and save PHY error counters
+ * @ah: The &struct ath5k_hw
+ * @as: The &struct ath5k_ani_state
  *
  * Clear the PHY error counters as soon as possible, since this might be called
  * from a MIB interrupt and we want to make sure we don't get interrupted again.
@@ -429,14 +438,14 @@ ath5k_ani_save_and_clear_phy_errors(struct ath5k_hw *ah,
         return 1;
 }
 
-
 /**
  * ath5k_ani_period_restart() - Restart ANI period
+ * @as: The &struct ath5k_ani_state
  *
  * Just reset counters, so they are clear for the next "ani period".
  */
 static void
-ath5k_ani_period_restart(struct ath5k_hw *ah, struct ath5k_ani_state *as)
+ath5k_ani_period_restart(struct ath5k_ani_state *as)
 {
         /* keep last values for debugging */
         as->last_ofdm_errors = as->ofdm_errors;
@@ -448,9 +457,9 @@ ath5k_ani_period_restart(struct ath5k_hw *ah, struct ath5k_ani_state *as)
         as->listen_time = 0;
 }
 
-
 /**
  * ath5k_ani_calibration() - The main ANI calibration function
+ * @ah: The &struct ath5k_hw
  *
  * We count OFDM and CCK errors relative to the time where we did not send or
  * receive ("listen" time) and raise or lower immunity accordingly.
@@ -492,7 +501,7 @@ ath5k_ani_calibration(struct ath5k_hw *ah)
                 /* too many PHY errors - we have to raise immunity */
                 bool ofdm_flag = as->ofdm_errors > ofdm_high ? true : false;
                 ath5k_ani_raise_immunity(ah, as, ofdm_flag);
-                ath5k_ani_period_restart(ah, as);
+                ath5k_ani_period_restart(as);
 
         } else if (as->listen_time > 5 * ATH5K_ANI_LISTEN_PERIOD) {
                 /* If more than 5 (TODO: why 5?) periods have passed and we got
@@ -504,15 +513,18 @@ ath5k_ani_calibration(struct ath5k_hw *ah)
                 if (as->ofdm_errors <= ofdm_low && as->cck_errors <= cck_low)
                         ath5k_ani_lower_immunity(ah, as);
 
-                ath5k_ani_period_restart(ah, as);
+                ath5k_ani_period_restart(as);
         }
 }
 
 
-/*** INTERRUPT HANDLER ***/
+/*******************\
+* Interrupt handler *
+\*******************/
 
 /**
  * ath5k_ani_mib_intr() - Interrupt handler for ANI MIB counters
+ * @ah: The &struct ath5k_hw
  *
  * Just read & reset the registers quickly, so they don't generate more
  * interrupts, save the counters and schedule the tasklet to decide whether
@@ -549,9 +561,11 @@ ath5k_ani_mib_intr(struct ath5k_hw *ah)
                 tasklet_schedule(&ah->ani_tasklet);
 }
 
-
 /**
- * ath5k_ani_phy_error_report() - Used by older HW to report PHY errors
+ * ath5k_ani_phy_error_report - Used by older HW to report PHY errors
+ *
+ * @ah: The &struct ath5k_hw
+ * @phyerr: One of enum ath5k_phy_error_code
  *
  * This is used by hardware without PHY error counters to report PHY errors
  * on a frame-by-frame basis, instead of the interrupt.
@@ -574,10 +588,13 @@ ath5k_ani_phy_error_report(struct ath5k_hw *ah,
 }
 
 
-/*** INIT ***/
+/****************\
+* Initialization *
+\****************/
 
 /**
  * ath5k_enable_phy_err_counters() - Enable PHY error counters
+ * @ah: The &struct ath5k_hw
  *
  * Enable PHY error counters for OFDM and CCK timing errors.
  */
@@ -596,9 +613,9 @@ ath5k_enable_phy_err_counters(struct ath5k_hw *ah)
         ath5k_hw_reg_write(ah, 0, AR5K_CCK_FIL_CNT);
 }
 
-
 /**
  * ath5k_disable_phy_err_counters() - Disable PHY error counters
+ * @ah: The &struct ath5k_hw
  *
  * Disable PHY error counters for OFDM and CCK timing errors.
  */
@@ -615,10 +632,10 @@ ath5k_disable_phy_err_counters(struct ath5k_hw *ah)
         ath5k_hw_reg_write(ah, 0, AR5K_CCK_FIL_CNT);
 }
 
-
 /**
  * ath5k_ani_init() - Initialize ANI
- * @mode: Which mode to use (auto, manual high, manual low, off)
+ * @ah: The &struct ath5k_hw
+ * @mode: One of enum ath5k_ani_mode
  *
  * Initialize ANI according to mode.
  */
@@ -695,10 +712,18 @@ ath5k_ani_init(struct ath5k_hw *ah, enum ath5k_ani_mode mode)
 }
 
 
-/*** DEBUG ***/
+/**************\
+* Debug output *
+\**************/
 
 #ifdef CONFIG_ATH5K_DEBUG
 
+/**
+ * ath5k_ani_print_counters() - Print ANI counters
+ * @ah: The &struct ath5k_hw
+ *
+ * Used for debugging ANI
+ */
 void
 ath5k_ani_print_counters(struct ath5k_hw *ah)
 {
diff --git a/drivers/net/wireless/ath/ath5k/ani.h b/drivers/net/wireless/ath/ath5k/ani.h
index 7358b6c83c6c..21aa355460bb 100644
--- a/drivers/net/wireless/ath/ath5k/ani.h
+++ b/drivers/net/wireless/ath/ath5k/ani.h
@@ -40,13 +40,13 @@ enum ath5k_phy_error_code;
  * enum ath5k_ani_mode - mode for ANI / noise sensitivity
  *
  * @ATH5K_ANI_MODE_OFF: Turn ANI off. This can be useful to just stop the ANI
- *      algorithm after it has been on auto mode.
- * ATH5K_ANI_MODE_MANUAL_LOW: Manually set all immunity parameters to low,
- *      maximizing sensitivity. ANI will not run.
- * ATH5K_ANI_MODE_MANUAL_HIGH: Manually set all immunity parameters to high,
- *      minimizing sensitivity. ANI will not run.
- * ATH5K_ANI_MODE_AUTO: Automatically control immunity parameters based on the
- *      amount of OFDM and CCK frame errors (default).
+ *                      algorithm after it has been on auto mode.
+ * @ATH5K_ANI_MODE_MANUAL_LOW: Manually set all immunity parameters to low,
+ *                      maximizing sensitivity. ANI will not run.
+ * @ATH5K_ANI_MODE_MANUAL_HIGH: Manually set all immunity parameters to high,
+ *                      minimizing sensitivity. ANI will not run.
+ * @ATH5K_ANI_MODE_AUTO: Automatically control immunity parameters based on the
+ *                      amount of OFDM and CCK frame errors (default).
  */
 enum ath5k_ani_mode {
         ATH5K_ANI_MODE_OFF              = 0,
@@ -58,8 +58,22 @@ enum ath5k_ani_mode {
 
 /**
  * struct ath5k_ani_state - ANI state and associated counters
- *
- * @max_spur_level: the maximum spur level is chip dependent
+ * @ani_mode: One of enum ath5k_ani_mode
+ * @noise_imm_level: Noise immunity level
+ * @spur_level: Spur immunity level
+ * @firstep_level: FIRstep level
+ * @ofdm_weak_sig: OFDM weak signal detection state (on/off)
+ * @cck_weak_sig: CCK weak signal detection state (on/off)
+ * @max_spur_level: Max spur immunity level (chip specific)
+ * @listen_time: Listen time
+ * @ofdm_errors: OFDM timing error count
+ * @cck_errors: CCK timing error count
+ * @last_cc: The &struct ath_cycle_counters (for stats)
+ * @last_listen: Listen time from previous run (for stats)
+ * @last_ofdm_errors: OFDM timing error count from previous run (for tats)
+ * @last_cck_errors: CCK timing error count from previous run (for stats)
+ * @sum_ofdm_errors: Sum of OFDM timing errors (for stats)
+ * @sum_cck_errors: Sum of all CCK timing errors (for stats)
  */
 struct ath5k_ani_state {
         enum ath5k_ani_mode     ani_mode;
diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h
index fecbcd9a4259..e564e585b221 100644
--- a/drivers/net/wireless/ath/ath5k/ath5k.h
+++ b/drivers/net/wireless/ath/ath5k/ath5k.h
@@ -187,10 +187,9 @@
 #define AR5K_TUNE_MAX_TXPOWER                   63
 #define AR5K_TUNE_DEFAULT_TXPOWER               25
 #define AR5K_TUNE_TPC_TXPOWER                   false
-#define ATH5K_TUNE_CALIBRATION_INTERVAL_FULL    10000   /* 10 sec */
+#define ATH5K_TUNE_CALIBRATION_INTERVAL_FULL    60000   /* 60 sec */
+#define ATH5K_TUNE_CALIBRATION_INTERVAL_SHORT   10000   /* 10 sec */
 #define ATH5K_TUNE_CALIBRATION_INTERVAL_ANI     1000    /* 1 sec */
-#define ATH5K_TUNE_CALIBRATION_INTERVAL_NF      60000   /* 60 sec */
-
 #define ATH5K_TX_COMPLETE_POLL_INT              3000    /* 3 sec */
 
 #define AR5K_INIT_CARR_SENSE_EN                 1
@@ -262,16 +261,34 @@
 #define AR5K_AGC_SETTLING_TURBO                 37
 
 
-/* GENERIC CHIPSET DEFINITIONS */
 
-/* MAC Chips */
+/*****************************\
+* GENERIC CHIPSET DEFINITIONS *
+\*****************************/
+
+/**
+ * enum ath5k_version - MAC Chips
+ * @AR5K_AR5210: AR5210 (Crete)
+ * @AR5K_AR5211: AR5211 (Oahu/Maui)
+ * @AR5K_AR5212: AR5212 (Venice) and newer
+ */
 enum ath5k_version {
         AR5K_AR5210     = 0,
         AR5K_AR5211     = 1,
         AR5K_AR5212     = 2,
 };
 
-/* PHY Chips */
+/**
+ * enum ath5k_radio - PHY Chips
+ * @AR5K_RF5110: RF5110 (Fez)
+ * @AR5K_RF5111: RF5111 (Sombrero)
+ * @AR5K_RF5112: RF2112/5112(A) (Derby/Derby2)
+ * @AR5K_RF2413: RF2413/2414 (Griffin/Griffin-Lite)
+ * @AR5K_RF5413: RF5413/5414/5424 (Eagle/Condor)
+ * @AR5K_RF2316: RF2315/2316 (Cobra SoC)
+ * @AR5K_RF2317: RF2317 (Spider SoC)
+ * @AR5K_RF2425: RF2425/2417 (Swan/Nalla)
+ */
 enum ath5k_radio {
         AR5K_RF5110     = 0,
         AR5K_RF5111     = 1,
@@ -303,11 +320,11 @@ enum ath5k_radio {
 #define AR5K_SREV_AR5213A       0x59 /* Hainan */
 #define AR5K_SREV_AR2413        0x78 /* Griffin lite */
 #define AR5K_SREV_AR2414        0x70 /* Griffin */
-#define AR5K_SREV_AR2315_R6 0x86 /* AP51-Light */
-#define AR5K_SREV_AR2315_R7 0x87 /* AP51-Full */
+#define AR5K_SREV_AR2315_R6     0x86 /* AP51-Light */
+#define AR5K_SREV_AR2315_R7     0x87 /* AP51-Full */
 #define AR5K_SREV_AR5424        0x90 /* Condor */
-#define AR5K_SREV_AR2317_R1 0x90 /* AP61-Light */
-#define AR5K_SREV_AR2317_R2 0x91 /* AP61-Full */
+#define AR5K_SREV_AR2317_R1     0x90 /* AP61-Light */
+#define AR5K_SREV_AR2317_R2     0x91 /* AP61-Full */
 #define AR5K_SREV_AR5413        0xa4 /* Eagle lite */
 #define AR5K_SREV_AR5414        0xa0 /* Eagle */
 #define AR5K_SREV_AR2415        0xb0 /* Talon */
@@ -344,32 +361,40 @@ enum ath5k_radio {
 
 /* TODO add support to mac80211 for vendor-specific rates and modes */
 
-/*
+/**
+ * DOC: Atheros XR
+ *
  * Some of this information is based on Documentation from:
  *
  * http://madwifi-project.org/wiki/ChipsetFeatures/SuperAG
  *
- * Modulation for Atheros' eXtended Range - range enhancing extension that is
- * supposed to double the distance an Atheros client device can keep a
- * connection with an Atheros access point. This is achieved by increasing
- * the receiver sensitivity up to, -105dBm, which is about 20dB above what
- * the 802.11 specifications demand. In addition, new (proprietary) data rates
- * are introduced: 3, 2, 1, 0.5 and 0.25 MBit/s.
+ * Atheros' eXtended Range - range enhancing extension is a modulation scheme
+ * that is supposed to double the link distance between an Atheros XR-enabled
+ * client device with an Atheros XR-enabled access point. This is achieved
+ * by increasing the receiver sensitivity up to, -105dBm, which is about 20dB
+ * above what the 802.11 specifications demand. In addition, new (proprietary)
+ * data rates are introduced: 3, 2, 1, 0.5 and 0.25 MBit/s.
  *
  * Please note that can you either use XR or TURBO but you cannot use both,
  * they are exclusive.
  *
+ * Also note that we do not plan to support XR mode at least for now. You can
+ * get a mode similar to XR by using 5MHz bwmode.
  */
-#define MODULATION_XR           0x00000200
-/*
- * Modulation for Atheros' Turbo G and Turbo A, its supposed to provide a
- * throughput transmission speed up to 40Mbit/s-60Mbit/s at a 108Mbit/s
- * signaling rate achieved through the bonding of two 54Mbit/s 802.11g
- * channels. To use this feature your Access Point must also support it.
+
+
+/**
+ * DOC: Atheros SuperAG
+ *
+ * In addition to XR we have another modulation scheme called TURBO mode
+ * that is supposed to provide a throughput transmission speed up to 40Mbit/s
+ * -60Mbit/s at a 108Mbit/s signaling rate achieved through the bonding of two
+ * 54Mbit/s 802.11g channels. To use this feature both ends must support it.
  * There is also a distinction between "static" and "dynamic" turbo modes:
  *
  * - Static: is the dumb version: devices set to this mode stick to it until
  *     the mode is turned off.
+ *
  * - Dynamic: is the intelligent version, the network decides itself if it
  *     is ok to use turbo. As soon as traffic is detected on adjacent channels
  *     (which would get used in turbo mode), or when a non-turbo station joins
@@ -383,24 +408,39 @@ enum ath5k_radio {
  *
  * http://www.pcworld.com/article/id,113428-page,1/article.html
  *
- * The channel bonding seems to be driver specific though. In addition to
- * deciding what channels will be used, these "Turbo" modes are accomplished
- * by also enabling the following features:
+ * The channel bonding seems to be driver specific though.
+ *
+ * In addition to TURBO modes we also have the following features for even
+ * greater speed-up:
  *
  * - Bursting: allows multiple frames to be sent at once, rather than pausing
  *     after each frame. Bursting is a standards-compliant feature that can be
  *     used with any Access Point.
+ *
  * - Fast frames: increases the amount of information that can be sent per
  *     frame, also resulting in a reduction of transmission overhead. It is a
  *     proprietary feature that needs to be supported by the Access Point.
+ *
  * - Compression: data frames are compressed in real time using a Lempel Ziv
  *     algorithm. This is done transparently. Once this feature is enabled,
  *     compression and decompression takes place inside the chipset, without
  *     putting additional load on the host CPU.
  *
+ * As with XR we also don't plan to support SuperAG features for now. You can
+ * get a mode similar to TURBO by using 40MHz bwmode.
  */
-#define MODULATION_TURBO        0x00000080
 
+
+/**
+ * enum ath5k_driver_mode - PHY operation mode
+ * @AR5K_MODE_11A: 802.11a
+ * @AR5K_MODE_11B: 802.11b
+ * @AR5K_MODE_11G: 801.11g
+ * @AR5K_MODE_MAX: Used for boundary checks
+ *
+ * Do not change the order here, we use these as
+ * array indices and it also maps EEPROM structures.
+ */
 enum ath5k_driver_mode {
         AR5K_MODE_11A           =       0,
         AR5K_MODE_11B           =       1,
@@ -408,30 +448,64 @@ enum ath5k_driver_mode {
         AR5K_MODE_MAX           =       3
 };
 
+/**
+ * enum ath5k_ant_mode - Antenna operation mode
+ * @AR5K_ANTMODE_DEFAULT: Default antenna setup
+ * @AR5K_ANTMODE_FIXED_A: Only antenna A is present
+ * @AR5K_ANTMODE_FIXED_B: Only antenna B is present
+ * @AR5K_ANTMODE_SINGLE_AP: STA locked on a single ap
+ * @AR5K_ANTMODE_SECTOR_AP: AP with tx antenna set on tx desc
+ * @AR5K_ANTMODE_SECTOR_STA: STA with tx antenna set on tx desc
+ * @AR5K_ANTMODE_DEBUG: Debug mode -A -> Rx, B-> Tx-
+ * @AR5K_ANTMODE_MAX: Used for boundary checks
+ *
+ * For more infos on antenna control check out phy.c
+ */
 enum ath5k_ant_mode {
-        AR5K_ANTMODE_DEFAULT    = 0,    /* default antenna setup */
-        AR5K_ANTMODE_FIXED_A    = 1,    /* only antenna A is present */
-        AR5K_ANTMODE_FIXED_B    = 2,    /* only antenna B is present */
-        AR5K_ANTMODE_SINGLE_AP  = 3,    /* sta locked on a single ap */
-        AR5K_ANTMODE_SECTOR_AP  = 4,    /* AP with tx antenna set on tx desc */
-        AR5K_ANTMODE_SECTOR_STA = 5,    /* STA with tx antenna set on tx desc */
-        AR5K_ANTMODE_DEBUG      = 6,    /* Debug mode -A -> Rx, B-> Tx- */
+        AR5K_ANTMODE_DEFAULT    = 0,
+        AR5K_ANTMODE_FIXED_A    = 1,
+        AR5K_ANTMODE_FIXED_B    = 2,
+        AR5K_ANTMODE_SINGLE_AP  = 3,
+        AR5K_ANTMODE_SECTOR_AP  = 4,
+        AR5K_ANTMODE_SECTOR_STA = 5,
+        AR5K_ANTMODE_DEBUG      = 6,
         AR5K_ANTMODE_MAX,
 };
 
+/**
+ * enum ath5k_bw_mode - Bandwidth operation mode
+ * @AR5K_BWMODE_DEFAULT: 20MHz, default operation
+ * @AR5K_BWMODE_5MHZ: Quarter rate
+ * @AR5K_BWMODE_10MHZ: Half rate
+ * @AR5K_BWMODE_40MHZ: Turbo
+ */
 enum ath5k_bw_mode {
-        AR5K_BWMODE_DEFAULT     = 0,    /* 20MHz, default operation */
-        AR5K_BWMODE_5MHZ        = 1,    /* Quarter rate */
-        AR5K_BWMODE_10MHZ       = 2,    /* Half rate */
-        AR5K_BWMODE_40MHZ       = 3     /* Turbo */
+        AR5K_BWMODE_DEFAULT     = 0,
+        AR5K_BWMODE_5MHZ        = 1,
+        AR5K_BWMODE_10MHZ       = 2,
+        AR5K_BWMODE_40MHZ       = 3
 };
 
+
+
 /****************\
   TX DEFINITIONS
 \****************/
 
-/*
- * TX Status descriptor
+/**
+ * struct ath5k_tx_status - TX Status descriptor
+ * @ts_seqnum: Sequence number
+ * @ts_tstamp: Timestamp
+ * @ts_status: Status code
+ * @ts_final_idx: Final transmission series index
+ * @ts_final_retry: Final retry count
+ * @ts_rssi: RSSI for received ACK
+ * @ts_shortretry: Short retry count
+ * @ts_virtcol: Virtual collision count
+ * @ts_antenna: Antenna used
+ *
+ * TX status descriptor gets filled by the hw
+ * on each transmission attempt.
  */
 struct ath5k_tx_status {
         u16     ts_seqnum;
@@ -454,7 +528,6 @@ struct ath5k_tx_status {
  * enum ath5k_tx_queue - Queue types used to classify tx queues.
  * @AR5K_TX_QUEUE_INACTIVE: q is unused -- see ath5k_hw_release_tx_queue
  * @AR5K_TX_QUEUE_DATA: A normal data queue
- * @AR5K_TX_QUEUE_XR_DATA: An XR-data queue
  * @AR5K_TX_QUEUE_BEACON: The beacon queue
  * @AR5K_TX_QUEUE_CAB: The after-beacon queue
  * @AR5K_TX_QUEUE_UAPSD: Unscheduled Automatic Power Save Delivery queue
@@ -462,7 +535,6 @@ struct ath5k_tx_status {
 enum ath5k_tx_queue {
         AR5K_TX_QUEUE_INACTIVE = 0,
         AR5K_TX_QUEUE_DATA,
-        AR5K_TX_QUEUE_XR_DATA,
         AR5K_TX_QUEUE_BEACON,
         AR5K_TX_QUEUE_CAB,
         AR5K_TX_QUEUE_UAPSD,
@@ -471,36 +543,46 @@ enum ath5k_tx_queue {
 #define AR5K_NUM_TX_QUEUES              10
 #define AR5K_NUM_TX_QUEUES_NOQCU        2
 
-/*
- * Queue syb-types to classify normal data queues.
+/**
+ * enum ath5k_tx_queue_subtype - Queue sub-types to classify normal data queues
+ * @AR5K_WME_AC_BK: Background traffic
+ * @AR5K_WME_AC_BE: Best-effort (normal) traffic
+ * @AR5K_WME_AC_VI: Video traffic
+ * @AR5K_WME_AC_VO: Voice traffic
+ *
  * These are the 4 Access Categories as defined in
  * WME spec. 0 is the lowest priority and 4 is the
  * highest. Normal data that hasn't been classified
  * goes to the Best Effort AC.
  */
 enum ath5k_tx_queue_subtype {
-        AR5K_WME_AC_BK = 0,     /*Background traffic*/
-        AR5K_WME_AC_BE,         /*Best-effort (normal) traffic*/
-        AR5K_WME_AC_VI,         /*Video traffic*/
-        AR5K_WME_AC_VO,         /*Voice traffic*/
+        AR5K_WME_AC_BK = 0,
+        AR5K_WME_AC_BE,
+        AR5K_WME_AC_VI,
+        AR5K_WME_AC_VO,
 };
 
-/*
- * Queue ID numbers as returned by the hw functions, each number
- * represents a hw queue. If hw does not support hw queues
- * (eg 5210) all data goes in one queue. These match
- * d80211 definitions (net80211/MadWiFi don't use them).
+/**
+ * enum ath5k_tx_queue_id - Queue ID numbers as returned by the hw functions
+ * @AR5K_TX_QUEUE_ID_NOQCU_DATA: Data queue on AR5210 (no QCU available)
+ * @AR5K_TX_QUEUE_ID_NOQCU_BEACON: Beacon queue on AR5210 (no QCU available)
+ * @AR5K_TX_QUEUE_ID_DATA_MIN: Data queue min index
+ * @AR5K_TX_QUEUE_ID_DATA_MAX: Data queue max index
+ * @AR5K_TX_QUEUE_ID_CAB: Content after beacon queue
+ * @AR5K_TX_QUEUE_ID_BEACON: Beacon queue
+ * @AR5K_TX_QUEUE_ID_UAPSD: Urgent Automatic Power Save Delivery,
+ *
+ * Each number represents a hw queue. If hw does not support hw queues
+ * (eg 5210) all data goes in one queue.
  */
 enum ath5k_tx_queue_id {
         AR5K_TX_QUEUE_ID_NOQCU_DATA     = 0,
         AR5K_TX_QUEUE_ID_NOQCU_BEACON   = 1,
-        AR5K_TX_QUEUE_ID_DATA_MIN       = 0, /*IEEE80211_TX_QUEUE_DATA0*/
-        AR5K_TX_QUEUE_ID_DATA_MAX       = 3, /*IEEE80211_TX_QUEUE_DATA3*/
-        AR5K_TX_QUEUE_ID_DATA_SVP       = 5, /*IEEE80211_TX_QUEUE_SVP - Spectralink Voice Protocol*/
-        AR5K_TX_QUEUE_ID_CAB            = 6, /*IEEE80211_TX_QUEUE_AFTER_BEACON*/
-        AR5K_TX_QUEUE_ID_BEACON         = 7, /*IEEE80211_TX_QUEUE_BEACON*/
-        AR5K_TX_QUEUE_ID_UAPSD          = 8,
-        AR5K_TX_QUEUE_ID_XR_DATA        = 9,
+        AR5K_TX_QUEUE_ID_DATA_MIN       = 0,
+        AR5K_TX_QUEUE_ID_DATA_MAX       = 3,
+        AR5K_TX_QUEUE_ID_UAPSD          = 7,
+        AR5K_TX_QUEUE_ID_CAB            = 8,
+        AR5K_TX_QUEUE_ID_BEACON         = 9,
 };
 
 /*
@@ -521,46 +603,70 @@ enum ath5k_tx_queue_id {
 #define AR5K_TXQ_FLAG_POST_FR_BKOFF_DIS         0x1000  /* Disable backoff while bursting */
 #define AR5K_TXQ_FLAG_COMPRESSION_ENABLE        0x2000  /* Enable hw compression -not implemented-*/
 
-/*
- * Data transmit queue state.  One of these exists for each
- * hardware transmit queue.  Packets sent to us from above
- * are assigned to queues based on their priority.  Not all
- * devices support a complete set of hardware transmit queues.
- * For those devices the array sc_ac2q will map multiple
- * priorities to fewer hardware queues (typically all to one
- * hardware queue).
+/**
+ * struct ath5k_txq - Transmit queue state
+ * @qnum: Hardware q number
+ * @link: Link ptr in last TX desc
+ * @q: Transmit queue (&struct list_head)
+ * @lock: Lock on q and link
+ * @setup: Is the queue configured
+ * @txq_len:Number of queued buffers
+ * @txq_max: Max allowed num of queued buffers
+ * @txq_poll_mark: Used to check if queue got stuck
+ * @txq_stuck: Queue stuck counter
+ *
+ * One of these exists for each hardware transmit queue.
+ * Packets sent to us from above are assigned to queues based
+ * on their priority.  Not all devices support a complete set
+ * of hardware transmit queues. For those devices the array
+ * sc_ac2q will map multiple priorities to fewer hardware queues
+ * (typically all to one hardware queue).
  */
 struct ath5k_txq {
-        unsigned int            qnum;   /* hardware q number */
-        u32                     *link;  /* link ptr in last TX desc */
-        struct list_head        q;      /* transmit queue */
-        spinlock_t              lock;   /* lock on q and link */
+        unsigned int            qnum;
+        u32                     *link;
+        struct list_head        q;
+        spinlock_t              lock;
         bool                    setup;
-        int                     txq_len; /* number of queued buffers */
-        int                     txq_max; /* max allowed num of queued buffers */
+        int                     txq_len;
+        int                     txq_max;
         bool                    txq_poll_mark;
-        unsigned int            txq_stuck;      /* informational counter */
+        unsigned int            txq_stuck;
 };
 
-/*
- * A struct to hold tx queue's parameters
+/**
+ * struct ath5k_txq_info - A struct to hold TX queue's parameters
+ * @tqi_type: One of enum ath5k_tx_queue
+ * @tqi_subtype: One of enum ath5k_tx_queue_subtype
+ * @tqi_flags: TX queue flags (see above)
+ * @tqi_aifs: Arbitrated Inter-frame Space
+ * @tqi_cw_min: Minimum Contention Window
+ * @tqi_cw_max: Maximum Contention Window
+ * @tqi_cbr_period: Constant bit rate period
+ * @tqi_ready_time: Time queue waits after an event when RDYTIME is enabled
  */
 struct ath5k_txq_info {
         enum ath5k_tx_queue tqi_type;
         enum ath5k_tx_queue_subtype tqi_subtype;
-        u16     tqi_flags;      /* Tx queue flags (see above) */
-        u8      tqi_aifs;       /* Arbitrated Interframe Space */
-        u16     tqi_cw_min;     /* Minimum Contention Window */
-        u16     tqi_cw_max;     /* Maximum Contention Window */
-        u32     tqi_cbr_period; /* Constant bit rate period */
+        u16     tqi_flags;
+        u8      tqi_aifs;
+        u16     tqi_cw_min;
+        u16     tqi_cw_max;
+        u32     tqi_cbr_period;
         u32     tqi_cbr_overflow_limit;
         u32     tqi_burst_time;
-        u32     tqi_ready_time; /* Time queue waits after an event */
+        u32     tqi_ready_time;
 };
 
-/*
- * Transmit packet types.
- * used on tx control descriptor
+/**
+ * enum ath5k_pkt_type - Transmit packet types
+ * @AR5K_PKT_TYPE_NORMAL: Normal data
+ * @AR5K_PKT_TYPE_ATIM: ATIM
+ * @AR5K_PKT_TYPE_PSPOLL: PS-Poll
+ * @AR5K_PKT_TYPE_BEACON: Beacon
+ * @AR5K_PKT_TYPE_PROBE_RESP: Probe response
+ * @AR5K_PKT_TYPE_PIFS: PIFS
+ * Used on tx control descriptor
  */
 enum ath5k_pkt_type {
         AR5K_PKT_TYPE_NORMAL            = 0,
@@ -583,27 +689,23 @@ enum ath5k_pkt_type {
         (ah->ah_txpower.txp_rates_power_table[(_r)] & 0x3f) << (_v)     \
 )
 
-/*
- * DMA size definitions (2^(n+2))
- */
-enum ath5k_dmasize {
-        AR5K_DMASIZE_4B = 0,
-        AR5K_DMASIZE_8B,
-        AR5K_DMASIZE_16B,
-        AR5K_DMASIZE_32B,
-        AR5K_DMASIZE_64B,
-        AR5K_DMASIZE_128B,
-        AR5K_DMASIZE_256B,
-        AR5K_DMASIZE_512B
-};
 
 
 /****************\
   RX DEFINITIONS
 \****************/
 
-/*
- * RX Status descriptor
+/**
+ * struct ath5k_rx_status - RX Status descriptor
+ * @rs_datalen: Data length
+ * @rs_tstamp: Timestamp
+ * @rs_status: Status code
+ * @rs_phyerr: PHY error mask
+ * @rs_rssi: RSSI in 0.5dbm units
+ * @rs_keyix: Index to the key used for decrypting
+ * @rs_rate: Rate used to decode the frame
+ * @rs_antenna: Antenna used to receive the frame
+ * @rs_more: Indicates this is a frame fragment (Fast frames)
  */
 struct ath5k_rx_status {
         u16     rs_datalen;
@@ -645,10 +747,18 @@ struct ath5k_rx_status {
 #define TSF_TO_TU(_tsf) (u32)((_tsf) >> 10)
 
 
+
 /*******************************\
   GAIN OPTIMIZATION DEFINITIONS
 \*******************************/
 
+/**
+ * enum ath5k_rfgain - RF Gain optimization engine state
+ * @AR5K_RFGAIN_INACTIVE: Engine disabled
+ * @AR5K_RFGAIN_ACTIVE: Probe active
+ * @AR5K_RFGAIN_READ_REQUESTED: Probe requested
+ * @AR5K_RFGAIN_NEED_CHANGE: Gain_F needs change
+ */
 enum ath5k_rfgain {
         AR5K_RFGAIN_INACTIVE = 0,
         AR5K_RFGAIN_ACTIVE,
@@ -656,6 +766,16 @@ enum ath5k_rfgain {
         AR5K_RFGAIN_NEED_CHANGE,
 };
 
+/**
+ * struct ath5k_gain - RF Gain optimization engine state data
+ * @g_step_idx: Current step index
+ * @g_current: Current gain
+ * @g_target: Target gain
+ * @g_low: Low gain boundary
+ * @g_high: High gain boundary
+ * @g_f_corr: Gain_F correction
+ * @g_state: One of enum ath5k_rfgain
+ */
 struct ath5k_gain {
         u8                      g_step_idx;
         u8                      g_current;
@@ -666,6 +786,8 @@ struct ath5k_gain {
         u8                      g_state;
 };
 
+
+
 /********************\
   COMMON DEFINITIONS
 \********************/
@@ -674,9 +796,14 @@ struct ath5k_gain {
 #define AR5K_SLOT_TIME_20       880
 #define AR5K_SLOT_TIME_MAX      0xffff
 
-/*
- * The following structure is used to map 2GHz channels to
- * 5GHz Atheros channels.
+/**
+ * struct ath5k_athchan_2ghz - 2GHz to 5GHZ map for RF5111
+ * @a2_flags: Channel flags (internal)
+ * @a2_athchan: HW channel number (internal)
+ *
+ * This structure is used to map 2GHz channels to
+ * 5GHz Atheros channels on 2111 frequency converter
+ * that comes together with RF5111
  * TODO: Clean up
  */
 struct ath5k_athchan_2ghz {
@@ -684,36 +811,80 @@ struct ath5k_athchan_2ghz {
         u16     a2_athchan;
 };
 
+/**
+ * enum ath5k_dmasize -  DMA size definitions (2^(n+2))
+ * @AR5K_DMASIZE_4B: 4Bytes
+ * @AR5K_DMASIZE_8B: 8Bytes
+ * @AR5K_DMASIZE_16B: 16Bytes
+ * @AR5K_DMASIZE_32B: 32Bytes
+ * @AR5K_DMASIZE_64B: 64Bytes (Default)
+ * @AR5K_DMASIZE_128B: 128Bytes
+ * @AR5K_DMASIZE_256B: 256Bytes
+ * @AR5K_DMASIZE_512B: 512Bytes
+ *
+ * These are used to set DMA burst size on hw
+ *
+ * Note: Some platforms can't handle more than 4Bytes
+ * be careful on embedded boards.
+ */
+enum ath5k_dmasize {
+        AR5K_DMASIZE_4B = 0,
+        AR5K_DMASIZE_8B,
+        AR5K_DMASIZE_16B,
+        AR5K_DMASIZE_32B,
+        AR5K_DMASIZE_64B,
+        AR5K_DMASIZE_128B,
+        AR5K_DMASIZE_256B,
+        AR5K_DMASIZE_512B
+};
+
+
 
 /******************\
   RATE DEFINITIONS
 \******************/
 
 /**
+ * DOC: Rate codes
+ *
  * Seems the ar5xxx hardware supports up to 32 rates, indexed by 1-32.
  *
  * The rate code is used to get the RX rate or set the TX rate on the
  * hardware descriptors. It is also used for internal modulation control
  * and settings.
  *
- * This is the hardware rate map we are aware of:
- *
- * rate_code   0x01    0x02    0x03    0x04    0x05    0x06    0x07    0x08
- * rate_kbps   3000    1000    ?       ?       ?       2000    500     48000
- *
- * rate_code   0x09    0x0A    0x0B    0x0C    0x0D    0x0E    0x0F    0x10
- * rate_kbps   24000   12000   6000    54000   36000   18000   9000    ?
+ * This is the hardware rate map we are aware of (html unfriendly):
  *
- * rate_code   17      18      19      20      21      22      23      24
- * rate_kbps   ?       ?       ?       ?       ?       ?       ?       11000
+ * Rate code    Rate (Kbps)
+ * ---------    -----------
+ * 0x01          3000 (XR)
+ * 0x02          1000 (XR)
+ * 0x03           250 (XR)
+ * 0x04 - 05    -Reserved-
+ * 0x06          2000 (XR)
+ * 0x07           500 (XR)
+ * 0x08         48000 (OFDM)
+ * 0x09         24000 (OFDM)
+ * 0x0A         12000 (OFDM)
+ * 0x0B          6000 (OFDM)
+ * 0x0C         54000 (OFDM)
+ * 0x0D         36000 (OFDM)
+ * 0x0E         18000 (OFDM)
+ * 0x0F          9000 (OFDM)
+ * 0x10 - 17    -Reserved-
+ * 0x18         11000L (CCK)
+ * 0x19          5500L (CCK)
+ * 0x1A          2000L (CCK)
+ * 0x1B          1000L (CCK)
+ * 0x1C         11000S (CCK)
+ * 0x1D          5500S (CCK)
+ * 0x1E          2000S (CCK)
+ * 0x1F         -Reserved-
  *
- * rate_code   25      26      27      28      29      30      31      32
- * rate_kbps   5500    2000    1000    11000S  5500S   2000S   ?       ?
- *
- * "S" indicates CCK rates with short preamble.
+ * "S" indicates CCK rates with short preamble and "L" with long preamble.
  *
  * AR5211 has different rate codes for CCK (802.11B) rates. It only uses the
- * lowest 4 bits, so they are the same as below with a 0xF mask.
+ * lowest 4 bits, so they are the same as above with a 0xF mask.
  * (0xB, 0xA, 0x9 and 0x8 for 1M, 2M, 5.5M and 11M).
  * We handle this in ath5k_setup_bands().
  */
@@ -733,13 +904,9 @@ struct ath5k_athchan_2ghz {
 #define ATH5K_RATE_CODE_36M     0x0D
 #define ATH5K_RATE_CODE_48M     0x08
 #define ATH5K_RATE_CODE_54M     0x0C
-/* XR */
-#define ATH5K_RATE_CODE_XR_500K 0x07
-#define ATH5K_RATE_CODE_XR_1M   0x02
-#define ATH5K_RATE_CODE_XR_2M   0x06
-#define ATH5K_RATE_CODE_XR_3M   0x01
 
-/* adding this flag to rate_code enables short preamble */
+/* Adding this flag to rate_code on B rates
+ * enables short preamble */
 #define AR5K_SET_SHORT_PREAMBLE 0x04
 
 /*
@@ -769,49 +936,65 @@ extern int ath5k_modparam_nohwcrypt;
 
 /**
  * enum ath5k_int - Hardware interrupt masks helpers
+ * @AR5K_INT_RXOK: Frame successfully received
+ * @AR5K_INT_RXDESC: Request RX descriptor/Read RX descriptor
+ * @AR5K_INT_RXERR: Frame reception failed
+ * @AR5K_INT_RXNOFRM: No frame received within a specified time period
+ * @AR5K_INT_RXEOL: Reached "End Of List", means we need more RX descriptors
+ * @AR5K_INT_RXORN: Indicates we got RX FIFO overrun. Note that Rx overrun is
+ *              not always fatal, on some chips we can continue operation
+ *              without resetting the card, that's why %AR5K_INT_FATAL is not
+ *              common for all chips.
+ * @AR5K_INT_RX_ALL: Mask to identify all RX related interrupts
+ *
+ * @AR5K_INT_TXOK: Frame transmission success
+ * @AR5K_INT_TXDESC: Request TX descriptor/Read TX status descriptor
+ * @AR5K_INT_TXERR: Frame transmission failure
+ * @AR5K_INT_TXEOL: Received End Of List for VEOL (Virtual End Of List). The
+ *              Queue Control Unit (QCU) signals an EOL interrupt only if a
+ *              descriptor's LinkPtr is NULL. For more details, refer to:
+ *              "http://www.freepatentsonline.com/20030225739.html"
+ * @AR5K_INT_TXNOFRM: No frame was transmitted within a specified time period
+ * @AR5K_INT_TXURN: Indicates we got TX FIFO underrun. In such case we should
+ *              increase the TX trigger threshold.
+ * @AR5K_INT_TX_ALL: Mask to identify all TX related interrupts
  *
- * @AR5K_INT_RX: mask to identify received frame interrupts, of type
- *      AR5K_ISR_RXOK or AR5K_ISR_RXERR
- * @AR5K_INT_RXDESC: Request RX descriptor/Read RX descriptor (?)
- * @AR5K_INT_RXNOFRM: No frame received (?)
- * @AR5K_INT_RXEOL: received End Of List for VEOL (Virtual End Of List). The
- *      Queue Control Unit (QCU) signals an EOL interrupt only if a descriptor's
- *      LinkPtr is NULL. For more details, refer to:
- *      http://www.freepatentsonline.com/20030225739.html
- * @AR5K_INT_RXORN: Indicates we got RX overrun (eg. no more descriptors).
- *      Note that Rx overrun is not always fatal, on some chips we can continue
- *      operation without resetting the card, that's why int_fatal is not
- *      common for all chips.
- * @AR5K_INT_TX: mask to identify received frame interrupts, of type
- *      AR5K_ISR_TXOK or AR5K_ISR_TXERR
- * @AR5K_INT_TXDESC: Request TX descriptor/Read TX status descriptor (?)
- * @AR5K_INT_TXURN: received when we should increase the TX trigger threshold
- *      We currently do increments on interrupt by
- *      (AR5K_TUNE_MAX_TX_FIFO_THRES - current_trigger_level) / 2
  * @AR5K_INT_MIB: Indicates the either Management Information Base counters or
- *      one of the PHY error counters reached the maximum value and should be
- *      read and cleared.
+ *              one of the PHY error counters reached the maximum value and
+ *              should be read and cleared.
+ * @AR5K_INT_SWI: Software triggered interrupt.
  * @AR5K_INT_RXPHY: RX PHY Error
  * @AR5K_INT_RXKCM: RX Key cache miss
  * @AR5K_INT_SWBA: SoftWare Beacon Alert - indicates its time to send a
- *      beacon that must be handled in software. The alternative is if you
- *      have VEOL support, in that case you let the hardware deal with things.
+ *              beacon that must be handled in software. The alternative is if
+ *              you have VEOL support, in that case you let the hardware deal
+ *              with things.
+ * @AR5K_INT_BRSSI: Beacon received with an RSSI value below our threshold
  * @AR5K_INT_BMISS: If in STA mode this indicates we have stopped seeing
- *      beacons from the AP have associated with, we should probably try to
- *      reassociate. When in IBSS mode this might mean we have not received
- *      any beacons from any local stations. Note that every station in an
- *      IBSS schedules to send beacons at the Target Beacon Transmission Time
- *      (TBTT) with a random backoff.
- * @AR5K_INT_BNR: Beacon Not Ready interrupt - ??
- * @AR5K_INT_GPIO: GPIO interrupt is used for RF Kill, disabled for now
- *      until properly handled
- * @AR5K_INT_FATAL: Fatal errors were encountered, typically caused by DMA
- *      errors. These types of errors we can enable seem to be of type
- *      AR5K_SIMR2_MCABT, AR5K_SIMR2_SSERR and AR5K_SIMR2_DPERR.
+ *              beacons from the AP have associated with, we should probably
+ *              try to reassociate. When in IBSS mode this might mean we have
+ *              not received any beacons from any local stations. Note that
+ *              every station in an IBSS schedules to send beacons at the
+ *              Target Beacon Transmission Time (TBTT) with a random backoff.
+ * @AR5K_INT_BNR: Beacon queue got triggered (DMA beacon alert) while empty.
+ * @AR5K_INT_TIM: Beacon with local station's TIM bit set
+ * @AR5K_INT_DTIM: Beacon with DTIM bit and zero DTIM count received
+ * @AR5K_INT_DTIM_SYNC: DTIM sync lost
+ * @AR5K_INT_GPIO: GPIO interrupt is used for RF Kill switches connected to
+ *              our GPIO pins.
+ * @AR5K_INT_BCN_TIMEOUT: Beacon timeout, we waited after TBTT but got noting
+ * @AR5K_INT_CAB_TIMEOUT: We waited for CAB traffic after the beacon but got
+ *              nothing or an incomplete CAB frame sequence.
+ * @AR5K_INT_QCBRORN: A queue got it's CBR counter expired
+ * @AR5K_INT_QCBRURN: A queue got triggered wile empty
+ * @AR5K_INT_QTRIG: A queue got triggered
+ *
+ * @AR5K_INT_FATAL: Fatal errors were encountered, typically caused by bus/DMA
+ *              errors. Indicates we need to reset the card.
  * @AR5K_INT_GLOBAL: Used to clear and set the IER
- * @AR5K_INT_NOCARD: signals the card has been removed
- * @AR5K_INT_COMMON: common interrupts shared among MACs with the same
- *      bit value
+ * @AR5K_INT_NOCARD: Signals the card has been removed
+ * @AR5K_INT_COMMON: Common interrupts shared among MACs with the same
+ *              bit value
  *
  * These are mapped to take advantage of some common bits
  * between the MACs, to be able to set intr properties
@@ -847,15 +1030,15 @@ enum ath5k_int {
         AR5K_INT_GPIO   =       0x01000000,
         AR5K_INT_BCN_TIMEOUT =  0x02000000, /* Non common */
         AR5K_INT_CAB_TIMEOUT =  0x04000000, /* Non common */
-        AR5K_INT_RX_DOPPLER =   0x08000000, /* Non common */
-        AR5K_INT_QCBRORN =      0x10000000, /* Non common */
-        AR5K_INT_QCBRURN =      0x20000000, /* Non common */
-        AR5K_INT_QTRIG  =       0x40000000, /* Non common */
+        AR5K_INT_QCBRORN =      0x08000000, /* Non common */
+        AR5K_INT_QCBRURN =      0x10000000, /* Non common */
+        AR5K_INT_QTRIG  =       0x20000000, /* Non common */
         AR5K_INT_GLOBAL =       0x80000000,
 
         AR5K_INT_TX_ALL = AR5K_INT_TXOK
                 | AR5K_INT_TXDESC
                 | AR5K_INT_TXERR
+                | AR5K_INT_TXNOFRM
                 | AR5K_INT_TXEOL
                 | AR5K_INT_TXURN,
 
@@ -891,15 +1074,32 @@ enum ath5k_int {
         AR5K_INT_NOCARD = 0xffffffff
 };
 
-/* mask which calibration is active at the moment */
+/**
+ * enum ath5k_calibration_mask - Mask which calibration is active at the moment
+ * @AR5K_CALIBRATION_FULL: Full calibration (AGC + SHORT)
+ * @AR5K_CALIBRATION_SHORT: Short calibration (NF + I/Q)
+ * @AR5K_CALIBRATION_NF: Noise Floor calibration
+ * @AR5K_CALIBRATION_ANI: Adaptive Noise Immunity
+ */
 enum ath5k_calibration_mask {
         AR5K_CALIBRATION_FULL = 0x01,
         AR5K_CALIBRATION_SHORT = 0x02,
-        AR5K_CALIBRATION_ANI = 0x04,
+        AR5K_CALIBRATION_NF = 0x04,
+        AR5K_CALIBRATION_ANI = 0x08,
 };
 
-/*
- * Power management
+/**
+ * enum ath5k_power_mode - Power management modes
+ * @AR5K_PM_UNDEFINED: Undefined
+ * @AR5K_PM_AUTO: Allow card to sleep if possible
+ * @AR5K_PM_AWAKE: Force card to wake up
+ * @AR5K_PM_FULL_SLEEP: Force card to full sleep (DANGEROUS)
+ * @AR5K_PM_NETWORK_SLEEP: Allow to sleep for a specified duration
+ *
+ * Currently only PM_AWAKE is used, FULL_SLEEP and NETWORK_SLEEP/AUTO
+ * are also known to have problems on some cards. This is not a big
+ * problem though because we can have almost the same effect as
+ * FULL_SLEEP by putting card on warm reset (it's almost powered down).
  */
 enum ath5k_power_mode {
         AR5K_PM_UNDEFINED = 0,
@@ -957,6 +1157,8 @@ struct ath5k_capabilities {
         } cap_queues;
 
         bool cap_has_phyerr_counters;
+        bool cap_has_mrr_support;
+        bool cap_needs_2GHz_ovr;
 };
 
 /* size of noise floor history (keep it a power of two) */
@@ -1072,13 +1274,11 @@ struct ath5k_hw {
         dma_addr_t              desc_daddr;     /* DMA (physical) address */
         size_t                  desc_len;       /* size of TX/RX descriptors */
 
-        DECLARE_BITMAP(status, 6);
+        DECLARE_BITMAP(status, 4);
 #define ATH_STAT_INVALID        0               /* disable hardware accesses */
-#define ATH_STAT_MRRETRY        1               /* multi-rate retry support */
-#define ATH_STAT_PROMISC        2
-#define ATH_STAT_LEDSOFT        3               /* enable LED gpio status */
-#define ATH_STAT_STARTED        4               /* opened & irqs enabled */
-#define ATH_STAT_2G_DISABLED    5               /* multiband radio without 2G */
+#define ATH_STAT_PROMISC        1
+#define ATH_STAT_LEDSOFT        2               /* enable LED gpio status */
+#define ATH_STAT_STARTED        3               /* opened & irqs enabled */
 
         unsigned int            filter_flags;   /* HW flags, AR5K_RX_FILTER_* */
         struct ieee80211_channel *curchan;      /* current h/w channel */
@@ -1097,6 +1297,7 @@ struct ath5k_hw {
                                 led_on;         /* pin setting for LED on */
 
         struct work_struct      reset_work;     /* deferred chip reset */
+        struct work_struct      calib_work;     /* deferred phy calibration */
 
         struct list_head        rxbuf;          /* receive buffer */
         spinlock_t              rxbuflock;
@@ -1113,8 +1314,6 @@ struct ath5k_hw {
 
         struct ath5k_rfkill     rf_kill;
 
-        struct tasklet_struct   calib;          /* calibration tasklet */
-
         spinlock_t              block;          /* protects beacon */
         struct tasklet_struct   beacontq;       /* beacon intr tasklet */
         struct list_head        bcbuf;          /* beacon buffer */
@@ -1144,7 +1343,7 @@ struct ath5k_hw {
         enum ath5k_int          ah_imr;
 
         struct ieee80211_channel *ah_current_channel;
-        bool                    ah_calibration;
+        bool                    ah_iq_cal_needed;
         bool                    ah_single_chip;
 
         enum ath5k_version      ah_version;
@@ -1187,7 +1386,13 @@ struct ath5k_hw {
         u32                     ah_txq_imr_cbrurn;
         u32                     ah_txq_imr_qtrig;
         u32                     ah_txq_imr_nofrm;
-        u32                     ah_txq_isr;
+
+        u32                     ah_txq_isr_txok_all;
+        u32                     ah_txq_isr_txurn;
+        u32                     ah_txq_isr_qcborn;
+        u32                     ah_txq_isr_qcburn;
+        u32                     ah_txq_isr_qtrig;
+
         u32                     *ah_rf_banks;
         size_t                  ah_rf_banks_size;
         size_t                  ah_rf_regs_count;
@@ -1228,8 +1433,8 @@ struct ath5k_hw {
 
         /* Calibration timestamp */
         unsigned long           ah_cal_next_full;
+        unsigned long           ah_cal_next_short;
         unsigned long           ah_cal_next_ani;
-        unsigned long           ah_cal_next_nf;
 
         /* Calibration mask */
         u8                      ah_cal_mask;
@@ -1338,11 +1543,11 @@ void ath5k_hw_stop_rx_pcu(struct ath5k_hw *ah);
 u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah);
 void ath5k_hw_set_tsf64(struct ath5k_hw *ah, u64 tsf64);
 void ath5k_hw_reset_tsf(struct ath5k_hw *ah);
-void ath5k_hw_init_beacon(struct ath5k_hw *ah, u32 next_beacon, u32 interval);
+void ath5k_hw_init_beacon_timers(struct ath5k_hw *ah, u32 next_beacon,
+                                                        u32 interval);
 bool ath5k_hw_check_beacon_timers(struct ath5k_hw *ah, int intval);
 /* Init function */
-void ath5k_hw_pcu_init(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
-                                                                u8 mode);
+void ath5k_hw_pcu_init(struct ath5k_hw *ah, enum nl80211_iftype op_mode);
 
 /* Queue Control Unit, DFS Control Unit Functions */
 int ath5k_hw_get_tx_queueprops(struct ath5k_hw *ah, int queue,
diff --git a/drivers/net/wireless/ath/ath5k/attach.c b/drivers/net/wireless/ath/ath5k/attach.c
index 91627dd2c26a..d7114c75fe9b 100644
--- a/drivers/net/wireless/ath/ath5k/attach.c
+++ b/drivers/net/wireless/ath/ath5k/attach.c
@@ -27,8 +27,7 @@
 #include "debug.h"
 
 /**
- * ath5k_hw_post - Power On Self Test helper function
- *
+ * ath5k_hw_post() - Power On Self Test helper function
  * @ah: The &struct ath5k_hw
  */
 static int ath5k_hw_post(struct ath5k_hw *ah)
@@ -92,8 +91,7 @@ static int ath5k_hw_post(struct ath5k_hw *ah)
 }
 
 /**
- * ath5k_hw_init - Check if hw is supported and init the needed structs
- *
+ * ath5k_hw_init() - Check if hw is supported and init the needed structs
  * @ah: The &struct ath5k_hw associated with the device
  *
  * Check if the device is supported, perform a POST and initialize the needed
@@ -298,7 +296,7 @@ int ath5k_hw_init(struct ath5k_hw *ah)
 
                 /* Reset SERDES to load new settings */
                 ath5k_hw_reg_write(ah, 0x00000000, AR5K_PCIE_SERDES_RESET);
-                mdelay(1);
+                usleep_range(1000, 1500);
         }
 
         /* Get misc capabilities */
@@ -308,11 +306,6 @@ int ath5k_hw_init(struct ath5k_hw *ah)
                 goto err;
         }
 
-        if (test_bit(ATH_STAT_2G_DISABLED, ah->status)) {
-                __clear_bit(AR5K_MODE_11B, ah->ah_capabilities.cap_mode);
-                __clear_bit(AR5K_MODE_11G, ah->ah_capabilities.cap_mode);
-        }
-
         /* Crypto settings */
         common->keymax = (ah->ah_version == AR5K_AR5210 ?
                           AR5K_KEYTABLE_SIZE_5210 : AR5K_KEYTABLE_SIZE_5211);
@@ -349,8 +342,7 @@ err:
 }
 
 /**
- * ath5k_hw_deinit - Free the ath5k_hw struct
- *
+ * ath5k_hw_deinit() - Free the &struct ath5k_hw
  * @ah: The &struct ath5k_hw
  */
 void ath5k_hw_deinit(struct ath5k_hw *ah)
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index b346d0492001..178a4dd10316 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -80,6 +80,11 @@ static int modparam_fastchanswitch;
 module_param_named(fastchanswitch, modparam_fastchanswitch, bool, S_IRUGO);
 MODULE_PARM_DESC(fastchanswitch, "Enable fast channel switching for AR2413/AR5413 radios.");
 
+static int ath5k_modparam_no_hw_rfkill_switch;
+module_param_named(no_hw_rfkill_switch, ath5k_modparam_no_hw_rfkill_switch,
+                                                                bool, S_IRUGO);
+MODULE_PARM_DESC(no_hw_rfkill_switch, "Ignore the GPIO RFKill switch state");
+
 
 /* Module info */
 MODULE_AUTHOR("Jiri Slaby");
@@ -183,7 +188,6 @@ static const struct ieee80211_rate ath5k_rates[] = {
         { .bitrate = 540,
           .hw_value = ATH5K_RATE_CODE_54M,
           .flags = 0 },
-        /* XR missing */
 };
 
 static inline u64 ath5k_extend_tsf(struct ath5k_hw *ah, u32 rstamp)
@@ -721,21 +725,24 @@ ath5k_txbuf_setup(struct ath5k_hw *ah, struct ath5k_buf *bf,
         if (ret)
                 goto err_unmap;
 
-        memset(mrr_rate, 0, sizeof(mrr_rate));
-        memset(mrr_tries, 0, sizeof(mrr_tries));
-        for (i = 0; i < 3; i++) {
-                rate = ieee80211_get_alt_retry_rate(ah->hw, info, i);
-                if (!rate)
-                        break;
+        /* Set up MRR descriptor */
+        if (ah->ah_capabilities.cap_has_mrr_support) {
+                memset(mrr_rate, 0, sizeof(mrr_rate));
+                memset(mrr_tries, 0, sizeof(mrr_tries));
+                for (i = 0; i < 3; i++) {
+                        rate = ieee80211_get_alt_retry_rate(ah->hw, info, i);
+                        if (!rate)
+                                break;
 
-                mrr_rate[i] = rate->hw_value;
-                mrr_tries[i] = info->control.rates[i + 1].count;
-        }
+                        mrr_rate[i] = rate->hw_value;
+                        mrr_tries[i] = info->control.rates[i + 1].count;
+                }
 
-        ath5k_hw_setup_mrr_tx_desc(ah, ds,
-                mrr_rate[0], mrr_tries[0],
-                mrr_rate[1], mrr_tries[1],
-                mrr_rate[2], mrr_tries[2]);
+                ath5k_hw_setup_mrr_tx_desc(ah, ds,
+                        mrr_rate[0], mrr_tries[0],
+                        mrr_rate[1], mrr_tries[1],
+                        mrr_rate[2], mrr_tries[2]);
+        }
 
         ds->ds_link = 0;
         ds->ds_data = bf->skbaddr;
@@ -1689,7 +1696,7 @@ ath5k_tasklet_tx(unsigned long data)
         struct ath5k_hw *ah = (void *)data;
 
         for (i = 0; i < AR5K_NUM_TX_QUEUES; i++)
-                if (ah->txqs[i].setup && (ah->ah_txq_isr & BIT(i)))
+                if (ah->txqs[i].setup && (ah->ah_txq_isr_txok_all & BIT(i)))
                         ath5k_tx_processq(ah, &ah->txqs[i]);
 
         ah->tx_pending = false;
@@ -2005,7 +2012,7 @@ ath5k_beacon_update_timers(struct ath5k_hw *ah, u64 bc_tsf)
         ah->nexttbtt = nexttbtt;
 
         intval |= AR5K_BEACON_ENA;
-        ath5k_hw_init_beacon(ah, nexttbtt, intval);
+        ath5k_hw_init_beacon_timers(ah, nexttbtt, intval);
 
         /*
          * debugging output last in order to preserve the time critical aspect
@@ -2112,16 +2119,29 @@ static void
 ath5k_intr_calibration_poll(struct ath5k_hw *ah)
 {
         if (time_is_before_eq_jiffies(ah->ah_cal_next_ani) &&
-            !(ah->ah_cal_mask & AR5K_CALIBRATION_FULL)) {
-                /* run ANI only when full calibration is not active */
+           !(ah->ah_cal_mask & AR5K_CALIBRATION_FULL) &&
+           !(ah->ah_cal_mask & AR5K_CALIBRATION_SHORT)) {
+
+                /* Run ANI only when calibration is not active */
+
                 ah->ah_cal_next_ani = jiffies +
                         msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_ANI);
                 tasklet_schedule(&ah->ani_tasklet);
 
-        } else if (time_is_before_eq_jiffies(ah->ah_cal_next_full)) {
-                ah->ah_cal_next_full = jiffies +
-                        msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_FULL);
-                tasklet_schedule(&ah->calib);
+        } else if (time_is_before_eq_jiffies(ah->ah_cal_next_short) &&
+                !(ah->ah_cal_mask & AR5K_CALIBRATION_FULL) &&
+                !(ah->ah_cal_mask & AR5K_CALIBRATION_SHORT)) {
+
+                /* Run calibration only when another calibration
+                 * is not running.
+                 *
+                 * Note: This is for both full/short calibration,
+                 * if it's time for a full one, ath5k_calibrate_work will deal
+                 * with it. */
+
+                ah->ah_cal_next_short = jiffies +
+                        msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_SHORT);
+                ieee80211_queue_work(ah->hw, &ah->calib_work);
         }
         /* we could use SWI to generate enough interrupts to meet our
          * calibration interval requirements, if necessary:
@@ -2149,69 +2169,110 @@ ath5k_intr(int irq, void *dev_id)
         enum ath5k_int status;
         unsigned int counter = 1000;
 
+
+        /*
+         * If hw is not ready (or detached) and we get an
+         * interrupt, or if we have no interrupts pending
+         * (that means it's not for us) skip it.
+         *
+         * NOTE: Group 0/1 PCI interface registers are not
+         * supported on WiSOCs, so we can't check for pending
+         * interrupts (ISR belongs to another register group
+         * so we are ok).
+         */
         if (unlikely(test_bit(ATH_STAT_INVALID, ah->status) ||
-                ((ath5k_get_bus_type(ah) != ATH_AHB) &&
-                                !ath5k_hw_is_intr_pending(ah))))
+                        ((ath5k_get_bus_type(ah) != ATH_AHB) &&
+                        !ath5k_hw_is_intr_pending(ah))))
                 return IRQ_NONE;
 
+        /** Main loop **/
         do {
-                ath5k_hw_get_isr(ah, &status);          /* NB: clears IRQ too */
+                ath5k_hw_get_isr(ah, &status);  /* NB: clears IRQ too */
+
                 ATH5K_DBG(ah, ATH5K_DEBUG_INTR, "status 0x%x/0x%x\n",
                                 status, ah->imask);
+
+                /*
+                 * Fatal hw error -> Log and reset
+                 *
+                 * Fatal errors are unrecoverable so we have to
+                 * reset the card. These errors include bus and
+                 * dma errors.
+                 */
                 if (unlikely(status & AR5K_INT_FATAL)) {
-                        /*
-                         * Fatal errors are unrecoverable.
-                         * Typically these are caused by DMA errors.
-                         */
+
                         ATH5K_DBG(ah, ATH5K_DEBUG_RESET,
                                   "fatal int, resetting\n");
                         ieee80211_queue_work(ah->hw, &ah->reset_work);
+
+                /*
+                 * RX Overrun -> Count and reset if needed
+                 *
+                 * Receive buffers are full. Either the bus is busy or
+                 * the CPU is not fast enough to process all received
+                 * frames.
+                 */
                 } else if (unlikely(status & AR5K_INT_RXORN)) {
+
                         /*
-                         * Receive buffers are full. Either the bus is busy or
-                         * the CPU is not fast enough to process all received
-                         * frames.
                          * Older chipsets need a reset to come out of this
                          * condition, but we treat it as RX for newer chips.
-                         * We don't know exactly which versions need a reset -
+                         * We don't know exactly which versions need a reset
                          * this guess is copied from the HAL.
                          */
                         ah->stats.rxorn_intr++;
+
                         if (ah->ah_mac_srev < AR5K_SREV_AR5212) {
                                 ATH5K_DBG(ah, ATH5K_DEBUG_RESET,
                                           "rx overrun, resetting\n");
                                 ieee80211_queue_work(ah->hw, &ah->reset_work);
                         } else
                                 ath5k_schedule_rx(ah);
+
                 } else {
+
+                        /* Software Beacon Alert -> Schedule beacon tasklet */
                         if (status & AR5K_INT_SWBA)
                                 tasklet_hi_schedule(&ah->beacontq);
 
-                        if (status & AR5K_INT_RXEOL) {
-                                /*
-                                * NB: the hardware should re-read the link when
-                                *     RXE bit is written, but it doesn't work at
-                                *     least on older hardware revs.
-                                */
+                        /*
+                         * No more RX descriptors -> Just count
+                         *
+                         * NB: the hardware should re-read the link when
+                         *     RXE bit is written, but it doesn't work at
+                         *     least on older hardware revs.
+                         */
+                        if (status & AR5K_INT_RXEOL)
                                 ah->stats.rxeol_intr++;
-                        }
-                        if (status & AR5K_INT_TXURN) {
-                                /* bump tx trigger level */
+
+
+                        /* TX Underrun -> Bump tx trigger level */
+                        if (status & AR5K_INT_TXURN)
                                 ath5k_hw_update_tx_triglevel(ah, true);
-                        }
+
+                        /* RX -> Schedule rx tasklet */
                         if (status & (AR5K_INT_RXOK | AR5K_INT_RXERR))
                                 ath5k_schedule_rx(ah);
-                        if (status & (AR5K_INT_TXOK | AR5K_INT_TXDESC
-                                        | AR5K_INT_TXERR | AR5K_INT_TXEOL))
+
+                        /* TX -> Schedule tx tasklet */
+                        if (status & (AR5K_INT_TXOK
+                                        | AR5K_INT_TXDESC
+                                        | AR5K_INT_TXERR
+                                        | AR5K_INT_TXEOL))
                                 ath5k_schedule_tx(ah);
-                        if (status & AR5K_INT_BMISS) {
-                                /* TODO */
-                        }
+
+                        /* Missed beacon -> TODO
+                        if (status & AR5K_INT_BMISS)
+                        */
+
+                        /* MIB event -> Update counters and notify ANI */
                         if (status & AR5K_INT_MIB) {
                                 ah->stats.mib_intr++;
                                 ath5k_hw_update_mib_counters(ah);
                                 ath5k_ani_mib_intr(ah);
                         }
+
+                        /* GPIO -> Notify RFKill layer */
                         if (status & AR5K_INT_GPIO)
                                 tasklet_schedule(&ah->rf_kill.toggleq);
 
@@ -2222,12 +2283,19 @@ ath5k_intr(int irq, void *dev_id)
 
         } while (ath5k_hw_is_intr_pending(ah) && --counter > 0);
 
+        /*
+         * Until we handle rx/tx interrupts mask them on IMR
+         *
+         * NOTE: ah->(rx/tx)_pending are set when scheduling the tasklets
+         * and unset after we 've handled the interrupts.
+         */
         if (ah->rx_pending || ah->tx_pending)
                 ath5k_set_current_imask(ah);
 
         if (unlikely(!counter))
                 ATH5K_WARN(ah, "too many interrupts, giving up for now\n");
 
+        /* Fire up calibration poll */
         ath5k_intr_calibration_poll(ah);
 
         return IRQ_HANDLED;
@@ -2238,41 +2306,58 @@ ath5k_intr(int irq, void *dev_id)
  * for temperature/environment changes.
  */
 static void
-ath5k_tasklet_calibrate(unsigned long data)
+ath5k_calibrate_work(struct work_struct *work)
 {
-        struct ath5k_hw *ah = (void *)data;
+        struct ath5k_hw *ah = container_of(work, struct ath5k_hw,
+                calib_work);
+
+        /* Should we run a full calibration ? */
+        if (time_is_before_eq_jiffies(ah->ah_cal_next_full)) {
+
+                ah->ah_cal_next_full = jiffies +
+                        msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_FULL);
+                ah->ah_cal_mask |= AR5K_CALIBRATION_FULL;
+
+                ATH5K_DBG(ah, ATH5K_DEBUG_CALIBRATE,
+                                "running full calibration\n");
+
+                if (ath5k_hw_gainf_calibrate(ah) == AR5K_RFGAIN_NEED_CHANGE) {
+                        /*
+                         * Rfgain is out of bounds, reset the chip
+                         * to load new gain values.
+                         */
+                        ATH5K_DBG(ah, ATH5K_DEBUG_RESET,
+                                        "got new rfgain, resetting\n");
+                        ieee80211_queue_work(ah->hw, &ah->reset_work);
+                }
+
+                /* TODO: On full calibration we should stop TX here,
+                 * so that it doesn't interfere (mostly due to gain_f
+                 * calibration that messes with tx packets -see phy.c).
+                 *
+                 * NOTE: Stopping the queues from above is not enough
+                 * to stop TX but saves us from disconecting (at least
+                 * we don't lose packets). */
+                ieee80211_stop_queues(ah->hw);
+        } else
+                ah->ah_cal_mask |= AR5K_CALIBRATION_SHORT;
 
-        /* Only full calibration for now */
-        ah->ah_cal_mask |= AR5K_CALIBRATION_FULL;
 
         ATH5K_DBG(ah, ATH5K_DEBUG_CALIBRATE, "channel %u/%x\n",
                 ieee80211_frequency_to_channel(ah->curchan->center_freq),
                 ah->curchan->hw_value);
 
-        if (ath5k_hw_gainf_calibrate(ah) == AR5K_RFGAIN_NEED_CHANGE) {
-                /*
-                 * Rfgain is out of bounds, reset the chip
-                 * to load new gain values.
-                 */
-                ATH5K_DBG(ah, ATH5K_DEBUG_RESET, "calibration, resetting\n");
-                ieee80211_queue_work(ah->hw, &ah->reset_work);
-        }
         if (ath5k_hw_phy_calibrate(ah, ah->curchan))
                 ATH5K_ERR(ah, "calibration of channel %u failed\n",
                         ieee80211_frequency_to_channel(
                                 ah->curchan->center_freq));
 
-        /* Noise floor calibration interrupts rx/tx path while I/Q calibration
-         * doesn't.
-         * TODO: We should stop TX here, so that it doesn't interfere.
-         * Note that stopping the queues is not enough to stop TX! */
-        if (time_is_before_eq_jiffies(ah->ah_cal_next_nf)) {
-                ah->ah_cal_next_nf = jiffies +
-                        msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_NF);
-                ath5k_hw_update_noise_floor(ah);
-        }
-
-        ah->ah_cal_mask &= ~AR5K_CALIBRATION_FULL;
+        /* Clear calibration flags */
+        if (ah->ah_cal_mask & AR5K_CALIBRATION_FULL) {
+                ieee80211_wake_queues(ah->hw);
+                ah->ah_cal_mask &= ~AR5K_CALIBRATION_FULL;
+        } else if (ah->ah_cal_mask & AR5K_CALIBRATION_SHORT)
+                ah->ah_cal_mask &= ~AR5K_CALIBRATION_SHORT;
 }
 
 
@@ -2407,8 +2492,8 @@ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
         if (ret)
                 goto err_irq;
 
-        /* set up multi-rate retry capabilities */
-        if (ah->ah_version == AR5K_AR5212) {
+        /* Set up multi-rate retry capabilities */
+        if (ah->ah_capabilities.cap_has_mrr_support) {
                 hw->max_rates = 4;
                 hw->max_rate_tries = max(AR5K_INIT_RETRY_SHORT,
                                          AR5K_INIT_RETRY_LONG);
@@ -2544,15 +2629,22 @@ int ath5k_start(struct ieee80211_hw *hw)
          * and then setup of the interrupt mask.
          */
         ah->curchan = ah->hw->conf.channel;
-        ah->imask = AR5K_INT_RXOK | AR5K_INT_RXERR | AR5K_INT_RXEOL |
-                AR5K_INT_RXORN | AR5K_INT_TXDESC | AR5K_INT_TXEOL |
-                AR5K_INT_FATAL | AR5K_INT_GLOBAL | AR5K_INT_MIB;
+        ah->imask = AR5K_INT_RXOK
+                | AR5K_INT_RXERR
+                | AR5K_INT_RXEOL
+                | AR5K_INT_RXORN
+                | AR5K_INT_TXDESC
+                | AR5K_INT_TXEOL
+                | AR5K_INT_FATAL
+                | AR5K_INT_GLOBAL
+                | AR5K_INT_MIB;
 
         ret = ath5k_reset(ah, NULL, false);
         if (ret)
                 goto done;
 
-        ath5k_rfkill_hw_start(ah);
+        if (!ath5k_modparam_no_hw_rfkill_switch)
+                ath5k_rfkill_hw_start(ah);
 
         /*
          * Reset the key cache since some parts do not reset the
@@ -2585,7 +2677,6 @@ static void ath5k_stop_tasklets(struct ath5k_hw *ah)
         ah->tx_pending = false;
         tasklet_kill(&ah->rxtq);
         tasklet_kill(&ah->txtq);
-        tasklet_kill(&ah->calib);
         tasklet_kill(&ah->beacontq);
         tasklet_kill(&ah->ani_tasklet);
 }
@@ -2637,7 +2728,8 @@ void ath5k_stop(struct ieee80211_hw *hw)
 
         cancel_delayed_work_sync(&ah->tx_complete_work);
 
-        ath5k_rfkill_hw_stop(ah);
+        if (!ath5k_modparam_no_hw_rfkill_switch)
+                ath5k_rfkill_hw_stop(ah);
 }
 
 /*
@@ -2689,9 +2781,24 @@ ath5k_reset(struct ath5k_hw *ah, struct ieee80211_channel *chan,
 
         ath5k_ani_init(ah, ani_mode);
 
-        ah->ah_cal_next_full = jiffies + msecs_to_jiffies(100);
-        ah->ah_cal_next_ani = jiffies;
-        ah->ah_cal_next_nf = jiffies;
+        /*
+         * Set calibration intervals
+         *
+         * Note: We don't need to run calibration imediately
+         * since some initial calibration is done on reset
+         * even for fast channel switching. Also on scanning
+         * this will get set again and again and it won't get
+         * executed unless we connect somewhere and spend some
+         * time on the channel (that's what calibration needs
+         * anyway to be accurate).
+         */
+        ah->ah_cal_next_full = jiffies +
+                msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_FULL);
+        ah->ah_cal_next_ani = jiffies +
+                msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_ANI);
+        ah->ah_cal_next_short = jiffies +
+                msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_SHORT);
+
         ewma_init(&ah->ah_beacon_rssi_avg, 1024, 8);
 
         /* clear survey data and cycle counters */
@@ -2745,20 +2852,6 @@ ath5k_init(struct ieee80211_hw *hw)
 
 
         /*
-         * Check if the MAC has multi-rate retry support.
-         * We do this by trying to setup a fake extended
-         * descriptor.  MACs that don't have support will
-         * return false w/o doing anything.  MACs that do
-         * support it will return true w/o doing anything.
-         */
-        ret = ath5k_hw_setup_mrr_tx_desc(ah, NULL, 0, 0, 0, 0, 0, 0);
-
-        if (ret < 0)
-                goto err;
-        if (ret > 0)
-                __set_bit(ATH_STAT_MRRETRY, ah->status);
-
-        /*
          * Collect the channel list.  The 802.11 layer
          * is responsible for filtering this list based
          * on settings like the phy mode and regulatory
@@ -2841,11 +2934,11 @@ ath5k_init(struct ieee80211_hw *hw)
 
         tasklet_init(&ah->rxtq, ath5k_tasklet_rx, (unsigned long)ah);
         tasklet_init(&ah->txtq, ath5k_tasklet_tx, (unsigned long)ah);
-        tasklet_init(&ah->calib, ath5k_tasklet_calibrate, (unsigned long)ah);
         tasklet_init(&ah->beacontq, ath5k_tasklet_beacon, (unsigned long)ah);
         tasklet_init(&ah->ani_tasklet, ath5k_tasklet_ani, (unsigned long)ah);
 
         INIT_WORK(&ah->reset_work, ath5k_reset_work);
+        INIT_WORK(&ah->calib_work, ath5k_calibrate_work);
         INIT_DELAYED_WORK(&ah->tx_complete_work, ath5k_tx_complete_poll_work);
 
         ret = ath5k_hw_common(ah)->bus_ops->eeprom_read_mac(ah, mac);
diff --git a/drivers/net/wireless/ath/ath5k/caps.c b/drivers/net/wireless/ath/ath5k/caps.c
index 810fba96702b..994169ad39cb 100644
--- a/drivers/net/wireless/ath/ath5k/caps.c
+++ b/drivers/net/wireless/ath/ath5k/caps.c
@@ -85,12 +85,19 @@ int ath5k_hw_set_capabilities(struct ath5k_hw *ah)
                         caps->cap_range.range_2ghz_min = 2412;
                         caps->cap_range.range_2ghz_max = 2732;
 
-                        if (AR5K_EEPROM_HDR_11B(ee_header))
-                                __set_bit(AR5K_MODE_11B, caps->cap_mode);
-
-                        if (AR5K_EEPROM_HDR_11G(ee_header) &&
-                            ah->ah_version != AR5K_AR5211)
-                                __set_bit(AR5K_MODE_11G, caps->cap_mode);
+                        /* Override 2GHz modes on SoCs that need it
+                         * NOTE: cap_needs_2GHz_ovr gets set from
+                         * ath_ahb_probe */
+                        if (!caps->cap_needs_2GHz_ovr) {
+                                if (AR5K_EEPROM_HDR_11B(ee_header))
+                                        __set_bit(AR5K_MODE_11B,
+                                                        caps->cap_mode);
+
+                                if (AR5K_EEPROM_HDR_11G(ee_header) &&
+                                ah->ah_version != AR5K_AR5211)
+                                        __set_bit(AR5K_MODE_11G,
+                                                        caps->cap_mode);
+                        }
                 }
         }
 
@@ -103,12 +110,18 @@ int ath5k_hw_set_capabilities(struct ath5k_hw *ah)
         else
                 caps->cap_queues.q_tx_num = AR5K_NUM_TX_QUEUES;
 
-        /* newer hardware has PHY error counters */
+        /* Newer hardware has PHY error counters */
         if (ah->ah_mac_srev >= AR5K_SREV_AR5213A)
                 caps->cap_has_phyerr_counters = true;
         else
                 caps->cap_has_phyerr_counters = false;
 
+        /* MACs since AR5212 have MRR support */
+        if (ah->ah_version == AR5K_AR5212)
+                caps->cap_has_mrr_support = true;
+        else
+                caps->cap_has_mrr_support = false;
+
         return 0;
 }
 
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index fce8c904eea9..8c5ce8b0c734 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -57,8 +57,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  */
+#include <linux/export.h>
+#include <linux/moduleparam.h>
 
-#include <linux/module.h>
 #include <linux/seq_file.h>
 #include <linux/list.h>
 #include "debug.h"
diff --git a/drivers/net/wireless/ath/ath5k/debug.h b/drivers/net/wireless/ath/ath5k/debug.h
index 7f37df3125fd..0a3f916a1ef3 100644
--- a/drivers/net/wireless/ath/ath5k/debug.h
+++ b/drivers/net/wireless/ath/ath5k/debug.h
@@ -141,10 +141,10 @@ ath5k_debug_printtxbuf(struct ath5k_hw *ah, struct ath5k_buf *bf);
 
 #include <linux/compiler.h>
 
-static inline void __attribute__ ((format (printf, 3, 4)))
+static inline __printf(3, 4) void
 ATH5K_DBG(struct ath5k_hw *ah, unsigned int m, const char *fmt, ...) {}
 
-static inline void __attribute__ ((format (printf, 3, 4)))
+static inline __printf(3, 4) void
 ATH5K_DBG_UNLIMIT(struct ath5k_hw *ah, unsigned int m, const char *fmt, ...)
 {}
 
diff --git a/drivers/net/wireless/ath/ath5k/desc.c b/drivers/net/wireless/ath/ath5k/desc.c
index 7e88dda82221..f8bfa3ac2af0 100644
--- a/drivers/net/wireless/ath/ath5k/desc.c
+++ b/drivers/net/wireless/ath/ath5k/desc.c
@@ -26,20 +26,61 @@
 #include "debug.h"
 
 
+/**
+ * DOC: Hardware descriptor functions
+ *
+ * Here we handle the processing of the low-level hw descriptors
+ * that hw reads and writes via DMA for each TX and RX attempt (that means
+ * we can also have descriptors for failed TX/RX tries). We have two kind of
+ * descriptors for RX and TX, control descriptors tell the hw how to send or
+ * receive a packet where to read/write it from/to etc and status descriptors
+ * that contain information about how the packet was sent or received (errors
+ * included).
+ *
+ * Descriptor format is not exactly the same for each MAC chip version so we
+ * have function pointers on &struct ath5k_hw we initialize at runtime based on
+ * the chip used.
+ */
+
+
 /************************\
 * TX Control descriptors *
 \************************/
 
-/*
- * Initialize the 2-word tx control descriptor on 5210/5211
+/**
+ * ath5k_hw_setup_2word_tx_desc() - Initialize a 2-word tx control descriptor
+ * @ah: The &struct ath5k_hw
+ * @desc: The &struct ath5k_desc
+ * @pkt_len: Frame length in bytes
+ * @hdr_len: Header length in bytes (only used on AR5210)
+ * @padsize: Any padding we've added to the frame length
+ * @type: One of enum ath5k_pkt_type
+ * @tx_power: Tx power in 0.5dB steps
+ * @tx_rate0: HW idx for transmission rate
+ * @tx_tries0: Max number of retransmissions
+ * @key_index: Index on key table to use for encryption
+ * @antenna_mode: Which antenna to use (0 for auto)
+ * @flags: One of AR5K_TXDESC_* flags (desc.h)
+ * @rtscts_rate: HW idx for RTS/CTS transmission rate
+ * @rtscts_duration: What to put on duration field on the header of RTS/CTS
+ *
+ * Internal function to initialize a 2-Word TX control descriptor
+ * found on AR5210 and AR5211 MACs chips.
+ *
+ * Returns 0 on success or -EINVAL on false input
  */
 static int
-ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
-        unsigned int pkt_len, unsigned int hdr_len, int padsize,
-        enum ath5k_pkt_type type,
-        unsigned int tx_power, unsigned int tx_rate0, unsigned int tx_tries0,
-        unsigned int key_index, unsigned int antenna_mode, unsigned int flags,
-        unsigned int rtscts_rate, unsigned int rtscts_duration)
+ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah,
+                        struct ath5k_desc *desc,
+                        unsigned int pkt_len, unsigned int hdr_len,
+                        int padsize,
+                        enum ath5k_pkt_type type,
+                        unsigned int tx_power,
+                        unsigned int tx_rate0, unsigned int tx_tries0,
+                        unsigned int key_index,
+                        unsigned int antenna_mode,
+                        unsigned int flags,
+                        unsigned int rtscts_rate, unsigned int rtscts_duration)
 {
         u32 frame_type;
         struct ath5k_hw_2w_tx_ctl *tx_ctl;
@@ -172,17 +213,40 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         return 0;
 }
 
-/*
- * Initialize the 4-word tx control descriptor on 5212
+/**
+ * ath5k_hw_setup_4word_tx_desc() - Initialize a 4-word tx control descriptor
+ * @ah: The &struct ath5k_hw
+ * @desc: The &struct ath5k_desc
+ * @pkt_len: Frame length in bytes
+ * @hdr_len: Header length in bytes (only used on AR5210)
+ * @padsize: Any padding we've added to the frame length
+ * @type: One of enum ath5k_pkt_type
+ * @tx_power: Tx power in 0.5dB steps
+ * @tx_rate0: HW idx for transmission rate
+ * @tx_tries0: Max number of retransmissions
+ * @key_index: Index on key table to use for encryption
+ * @antenna_mode: Which antenna to use (0 for auto)
+ * @flags: One of AR5K_TXDESC_* flags (desc.h)
+ * @rtscts_rate: HW idx for RTS/CTS transmission rate
+ * @rtscts_duration: What to put on duration field on the header of RTS/CTS
+ *
+ * Internal function to initialize a 4-Word TX control descriptor
+ * found on AR5212 and later MACs chips.
+ *
+ * Returns 0 on success or -EINVAL on false input
  */
-static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
-        struct ath5k_desc *desc, unsigned int pkt_len, unsigned int hdr_len,
-        int padsize,
-        enum ath5k_pkt_type type, unsigned int tx_power, unsigned int tx_rate0,
-        unsigned int tx_tries0, unsigned int key_index,
-        unsigned int antenna_mode, unsigned int flags,
-        unsigned int rtscts_rate,
-        unsigned int rtscts_duration)
+static int
+ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
+                        struct ath5k_desc *desc,
+                        unsigned int pkt_len, unsigned int hdr_len,
+                        int padsize,
+                        enum ath5k_pkt_type type,
+                        unsigned int tx_power,
+                        unsigned int tx_rate0, unsigned int tx_tries0,
+                        unsigned int key_index,
+                        unsigned int antenna_mode,
+                        unsigned int flags,
+                        unsigned int rtscts_rate, unsigned int rtscts_duration)
 {
         struct ath5k_hw_4w_tx_ctl *tx_ctl;
         unsigned int frame_len;
@@ -292,13 +356,29 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
         return 0;
 }
 
-/*
- * Initialize a 4-word multi rate retry tx control descriptor on 5212
+/**
+ * ath5k_hw_setup_mrr_tx_desc() - Initialize an MRR tx control descriptor
+ * @ah: The &struct ath5k_hw
+ * @desc: The &struct ath5k_desc
+ * @tx_rate1: HW idx for rate used on transmission series 1
+ * @tx_tries1: Max number of retransmissions for transmission series 1
+ * @tx_rate2: HW idx for rate used on transmission series 2
+ * @tx_tries2: Max number of retransmissions for transmission series 2
+ * @tx_rate3: HW idx for rate used on transmission series 3
+ * @tx_tries3: Max number of retransmissions for transmission series 3
+ *
+ * Multi rate retry (MRR) tx control descriptors are available only on AR5212
+ * MACs, they are part of the normal 4-word tx control descriptor (see above)
+ * but we handle them through a separate function for better abstraction.
+ *
+ * Returns 0 on success or -EINVAL on invalid input
  */
 int
-ath5k_hw_setup_mrr_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)
+ath5k_hw_setup_mrr_tx_desc(struct ath5k_hw *ah,
+                        struct ath5k_desc *desc,
+                        u_int tx_rate1, u_int tx_tries1,
+                        u_int tx_rate2, u_int tx_tries2,
+                        u_int tx_rate3, u_int tx_tries3)
 {
         struct ath5k_hw_4w_tx_ctl *tx_ctl;
 
@@ -350,11 +430,16 @@ ath5k_hw_setup_mrr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
 * TX Status descriptors *
 \***********************/
 
-/*
- * Process the tx status descriptor on 5210/5211
+/**
+ * ath5k_hw_proc_2word_tx_status() - Process a tx status descriptor on 5210/1
+ * @ah: The &struct ath5k_hw
+ * @desc: The &struct ath5k_desc
+ * @ts: The &struct ath5k_tx_status
  */
-static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah,
-                struct ath5k_desc *desc, struct ath5k_tx_status *ts)
+static int
+ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah,
+                                struct ath5k_desc *desc,
+                                struct ath5k_tx_status *ts)
 {
         struct ath5k_hw_2w_tx_ctl *tx_ctl;
         struct ath5k_hw_tx_status *tx_status;
@@ -399,11 +484,16 @@ static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah,
         return 0;
 }
 
-/*
- * Process a tx status descriptor on 5212
+/**
+ * ath5k_hw_proc_4word_tx_status() - Process a tx status descriptor on 5212
+ * @ah: The &struct ath5k_hw
+ * @desc: The &struct ath5k_desc
+ * @ts: The &struct ath5k_tx_status
  */
-static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,
-                struct ath5k_desc *desc, struct ath5k_tx_status *ts)
+static int
+ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,
+                                struct ath5k_desc *desc,
+                                struct ath5k_tx_status *ts)
 {
         struct ath5k_hw_4w_tx_ctl *tx_ctl;
         struct ath5k_hw_tx_status *tx_status;
@@ -460,11 +550,17 @@ static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,
 * RX Descriptors *
 \****************/
 
-/*
- * Initialize an rx control descriptor
+/**
+ * ath5k_hw_setup_rx_desc() - Initialize an rx control descriptor
+ * @ah: The &struct ath5k_hw
+ * @desc: The &struct ath5k_desc
+ * @size: RX buffer length in bytes
+ * @flags: One of AR5K_RXDESC_* flags
  */
-int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
-                           u32 size, unsigned int flags)
+int
+ath5k_hw_setup_rx_desc(struct ath5k_hw *ah,
+                        struct ath5k_desc *desc,
+                        u32 size, unsigned int flags)
 {
         struct ath5k_hw_rx_ctl *rx_ctl;
 
@@ -491,11 +587,22 @@ int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
         return 0;
 }
 
-/*
- * Process the rx status descriptor on 5210/5211
+/**
+ * ath5k_hw_proc_5210_rx_status() - Process the rx status descriptor on 5210/1
+ * @ah: The &struct ath5k_hw
+ * @desc: The &struct ath5k_desc
+ * @rs: The &struct ath5k_rx_status
+ *
+ * Internal function used to process an RX status descriptor
+ * on AR5210/5211 MAC.
+ *
+ * Returns 0 on success or -EINPROGRESS in case we haven't received the who;e
+ * frame yet.
  */
-static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
-                struct ath5k_desc *desc, struct ath5k_rx_status *rs)
+static int
+ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
+                                struct ath5k_desc *desc,
+                                struct ath5k_rx_status *rs)
 {
         struct ath5k_hw_rx_status *rx_status;
 
@@ -574,12 +681,22 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
         return 0;
 }
 
-/*
- * Process the rx status descriptor on 5212
+/**
+ * ath5k_hw_proc_5212_rx_status() - Process the rx status descriptor on 5212
+ * @ah: The &struct ath5k_hw
+ * @desc: The &struct ath5k_desc
+ * @rs: The &struct ath5k_rx_status
+ *
+ * Internal function used to process an RX status descriptor
+ * on AR5212 and later MAC.
+ *
+ * Returns 0 on success or -EINPROGRESS in case we haven't received the who;e
+ * frame yet.
  */
-static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
-                                        struct ath5k_desc *desc,
-                                        struct ath5k_rx_status *rs)
+static int
+ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
+                                struct ath5k_desc *desc,
+                                struct ath5k_rx_status *rs)
 {
         struct ath5k_hw_rx_status *rx_status;
         u32 rxstat0, rxstat1;
@@ -646,10 +763,16 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
 * Attach *
 \********/
 
-/*
- * Init function pointers inside ath5k_hw struct
+/**
+ * ath5k_hw_init_desc_functions() - Init function pointers inside ah
+ * @ah: The &struct ath5k_hw
+ *
+ * Maps the internal descriptor functions to the function pointers on ah, used
+ * from above. This is used as an abstraction layer to handle the various chips
+ * the same way.
  */
-int ath5k_hw_init_desc_functions(struct ath5k_hw *ah)
+int
+ath5k_hw_init_desc_functions(struct ath5k_hw *ah)
 {
         if (ah->ah_version == AR5K_AR5212) {
                 ah->ah_setup_tx_desc = ath5k_hw_setup_4word_tx_desc;
diff --git a/drivers/net/wireless/ath/ath5k/desc.h b/drivers/net/wireless/ath/ath5k/desc.h
index cfd529b548f3..8d6c01a49ea3 100644
--- a/drivers/net/wireless/ath/ath5k/desc.h
+++ b/drivers/net/wireless/ath/ath5k/desc.h
@@ -20,25 +20,30 @@
  * RX/TX descriptor structures
  */
 
-/*
- * Common hardware RX control descriptor
+/**
+ * struct ath5k_hw_rx_ctl - Common hardware RX control descriptor
+ * @rx_control_0: RX control word 0
+ * @rx_control_1: RX control word 1
  */
 struct ath5k_hw_rx_ctl {
-        u32     rx_control_0; /* RX control word 0 */
-        u32     rx_control_1; /* RX control word 1 */
+        u32     rx_control_0;
+        u32     rx_control_1;
 } __packed __aligned(4);
 
 /* RX control word 1 fields/flags */
 #define AR5K_DESC_RX_CTL1_BUF_LEN               0x00000fff /* data buffer length */
 #define AR5K_DESC_RX_CTL1_INTREQ                0x00002000 /* RX interrupt request */
 
-/*
- * Common hardware RX status descriptor
+/**
+ * struct ath5k_hw_rx_status - Common hardware RX status descriptor
+ * @rx_status_0: RX status word 0
+ * @rx_status_1: RX status word 1
+ *
  * 5210, 5211 and 5212 differ only in the fields and flags defined below
  */
 struct ath5k_hw_rx_status {
-        u32     rx_status_0; /* RX status word 0 */
-        u32     rx_status_1; /* RX status word 1 */
+        u32     rx_status_0;
+        u32     rx_status_1;
 } __packed __aligned(4);
 
 /* 5210/5211 */
@@ -98,17 +103,36 @@ struct ath5k_hw_rx_status {
 
 /**
  * enum ath5k_phy_error_code - PHY Error codes
+ * @AR5K_RX_PHY_ERROR_UNDERRUN: Transmit underrun, [5210] No error
+ * @AR5K_RX_PHY_ERROR_TIMING: Timing error
+ * @AR5K_RX_PHY_ERROR_PARITY: Illegal parity
+ * @AR5K_RX_PHY_ERROR_RATE: Illegal rate
+ * @AR5K_RX_PHY_ERROR_LENGTH: Illegal length
+ * @AR5K_RX_PHY_ERROR_RADAR: Radar detect, [5210] 64 QAM rate
+ * @AR5K_RX_PHY_ERROR_SERVICE: Illegal service
+ * @AR5K_RX_PHY_ERROR_TOR: Transmit override receive
+ * @AR5K_RX_PHY_ERROR_OFDM_TIMING: OFDM Timing error [5212+]
+ * @AR5K_RX_PHY_ERROR_OFDM_SIGNAL_PARITY: OFDM Signal parity error [5212+]
+ * @AR5K_RX_PHY_ERROR_OFDM_RATE_ILLEGAL: OFDM Illegal rate [5212+]
+ * @AR5K_RX_PHY_ERROR_OFDM_LENGTH_ILLEGAL: OFDM Illegal length [5212+]
+ * @AR5K_RX_PHY_ERROR_OFDM_POWER_DROP: OFDM Power drop [5212+]
+ * @AR5K_RX_PHY_ERROR_OFDM_SERVICE: OFDM Service (?) [5212+]
+ * @AR5K_RX_PHY_ERROR_OFDM_RESTART: OFDM Restart (?) [5212+]
+ * @AR5K_RX_PHY_ERROR_CCK_TIMING: CCK Timing error [5212+]
+ * @AR5K_RX_PHY_ERROR_CCK_HEADER_CRC: Header CRC error [5212+]
+ * @AR5K_RX_PHY_ERROR_CCK_RATE_ILLEGAL: Illegal rate [5212+]
+ * @AR5K_RX_PHY_ERROR_CCK_SERVICE: CCK Service (?) [5212+]
+ * @AR5K_RX_PHY_ERROR_CCK_RESTART: CCK Restart (?) [5212+]
  */
 enum ath5k_phy_error_code {
-        AR5K_RX_PHY_ERROR_UNDERRUN              = 0,    /* Transmit underrun, [5210] No error */
-        AR5K_RX_PHY_ERROR_TIMING                = 1,    /* Timing error */
-        AR5K_RX_PHY_ERROR_PARITY                = 2,    /* Illegal parity */
-        AR5K_RX_PHY_ERROR_RATE                  = 3,    /* Illegal rate */
-        AR5K_RX_PHY_ERROR_LENGTH                = 4,    /* Illegal length */
-        AR5K_RX_PHY_ERROR_RADAR                 = 5,    /* Radar detect, [5210] 64 QAM rate */
-        AR5K_RX_PHY_ERROR_SERVICE               = 6,    /* Illegal service */
-        AR5K_RX_PHY_ERROR_TOR                   = 7,    /* Transmit override receive */
-        /* these are specific to the 5212 */
+        AR5K_RX_PHY_ERROR_UNDERRUN              = 0,
+        AR5K_RX_PHY_ERROR_TIMING                = 1,
+        AR5K_RX_PHY_ERROR_PARITY                = 2,
+        AR5K_RX_PHY_ERROR_RATE                  = 3,
+        AR5K_RX_PHY_ERROR_LENGTH                = 4,
+        AR5K_RX_PHY_ERROR_RADAR                 = 5,
+        AR5K_RX_PHY_ERROR_SERVICE               = 6,
+        AR5K_RX_PHY_ERROR_TOR                   = 7,
         AR5K_RX_PHY_ERROR_OFDM_TIMING           = 17,
         AR5K_RX_PHY_ERROR_OFDM_SIGNAL_PARITY    = 18,
         AR5K_RX_PHY_ERROR_OFDM_RATE_ILLEGAL     = 19,
@@ -123,12 +147,14 @@ enum ath5k_phy_error_code {
         AR5K_RX_PHY_ERROR_CCK_RESTART           = 31,
 };
 
-/*
- * 5210/5211 hardware 2-word TX control descriptor
+/**
+ * struct ath5k_hw_2w_tx_ctl  - 5210/5211 hardware 2-word TX control descriptor
+ * @tx_control_0: TX control word 0
+ * @tx_control_1: TX control word 1
  */
 struct ath5k_hw_2w_tx_ctl {
-        u32     tx_control_0; /* TX control word 0 */
-        u32     tx_control_1; /* TX control word 1 */
+        u32     tx_control_0;
+        u32     tx_control_1;
 } __packed __aligned(4);
 
 /* TX control word 0 fields/flags */
@@ -177,14 +203,18 @@ struct ath5k_hw_2w_tx_ctl {
 #define AR5K_AR5210_TX_DESC_FRAME_TYPE_PIFS     4
 #define AR5K_AR5211_TX_DESC_FRAME_TYPE_PRESP    4
 
-/*
- * 5212 hardware 4-word TX control descriptor
+/**
+ * struct ath5k_hw_4w_tx_ctl - 5212 hardware 4-word TX control descriptor
+ * @tx_control_0: TX control word 0
+ * @tx_control_1: TX control word 1
+ * @tx_control_2: TX control word 2
+ * @tx_control_3: TX control word 3
  */
 struct ath5k_hw_4w_tx_ctl {
-        u32     tx_control_0; /* TX control word 0 */
-        u32     tx_control_1; /* TX control word 1 */
-        u32     tx_control_2; /* TX control word 2 */
-        u32     tx_control_3; /* TX control word 3 */
+        u32     tx_control_0;
+        u32     tx_control_1;
+        u32     tx_control_2;
+        u32     tx_control_3;
 } __packed __aligned(4);
 
 /* TX control word 0 fields/flags */
@@ -238,12 +268,14 @@ struct ath5k_hw_4w_tx_ctl {
 #define AR5K_4W_TX_DESC_CTL3_RTS_CTS_RATE       0x01f00000 /* RTS or CTS rate */
 #define AR5K_4W_TX_DESC_CTL3_RTS_CTS_RATE_S     20
 
-/*
- * Common TX status descriptor
+/**
+ * struct ath5k_hw_tx_status - Common TX status descriptor
+ * @tx_status_0: TX status word 0
+ * @tx_status_1: TX status word 1
  */
 struct ath5k_hw_tx_status {
-        u32     tx_status_0; /* TX status word 0 */
-        u32     tx_status_1; /* TX status word 1 */
+        u32     tx_status_0;
+        u32     tx_status_1;
 } __packed __aligned(4);
 
 /* TX status word 0 fields/flags */
@@ -276,37 +308,47 @@ struct ath5k_hw_tx_status {
 #define AR5K_DESC_TX_STATUS1_COMP_SUCCESS_5212  0x00800000 /* [5212] compression status */
 #define AR5K_DESC_TX_STATUS1_XMIT_ANTENNA_5212  0x01000000 /* [5212] transmit antenna */
 
-/*
- * 5210/5211 hardware TX descriptor
+/**
+ * struct ath5k_hw_5210_tx_desc - 5210/5211 hardware TX descriptor
+ * @tx_ctl: The &struct ath5k_hw_2w_tx_ctl
+ * @tx_stat: The &struct ath5k_hw_tx_status
  */
 struct ath5k_hw_5210_tx_desc {
         struct ath5k_hw_2w_tx_ctl       tx_ctl;
         struct ath5k_hw_tx_status       tx_stat;
 } __packed __aligned(4);
 
-/*
- * 5212 hardware TX descriptor
+/**
+ * struct ath5k_hw_5212_tx_desc - 5212 hardware TX descriptor
+ * @tx_ctl: The &struct ath5k_hw_4w_tx_ctl
+ * @tx_stat: The &struct ath5k_hw_tx_status
  */
 struct ath5k_hw_5212_tx_desc {
         struct ath5k_hw_4w_tx_ctl       tx_ctl;
         struct ath5k_hw_tx_status       tx_stat;
 } __packed __aligned(4);
 
-/*
- * Common hardware RX descriptor
+/**
+ * struct ath5k_hw_all_rx_desc - Common hardware RX descriptor
+ * @rx_ctl: The &struct ath5k_hw_rx_ctl
+ * @rx_stat: The &struct ath5k_hw_rx_status
  */
 struct ath5k_hw_all_rx_desc {
         struct ath5k_hw_rx_ctl          rx_ctl;
         struct ath5k_hw_rx_status       rx_stat;
 } __packed __aligned(4);
 
-/*
- * Atheros hardware DMA descriptor
+/**
+ * struct ath5k_desc - Atheros hardware DMA descriptor
+ * @ds_link: Physical address of the next descriptor
+ * @ds_data: Physical address of data buffer (skb)
+ * @ud: Union containing hw_5xxx_tx_desc structs and hw_all_rx_desc
+ *
  * This is read and written to by the hardware
  */
 struct ath5k_desc {
-        u32     ds_link;        /* physical address of the next descriptor */
-        u32     ds_data;        /* physical address of data buffer (skb) */
+        u32     ds_link;
+        u32     ds_data;
 
         union {
                 struct ath5k_hw_5210_tx_desc    ds_tx5210;
diff --git a/drivers/net/wireless/ath/ath5k/dma.c b/drivers/net/wireless/ath/ath5k/dma.c
index 2481f9c7f4b6..5cc9aa814697 100644
--- a/drivers/net/wireless/ath/ath5k/dma.c
+++ b/drivers/net/wireless/ath/ath5k/dma.c
@@ -20,16 +20,13 @@
 * DMA and interrupt masking functions *
 \*************************************/
 
-/*
- * dma.c - DMA and interrupt masking functions
+/**
+ * DOC: DMA and interrupt masking functions
  *
  * Here we setup descriptor pointers (rxdp/txdp) start/stop dma engine and
  * handle queue setup for 5210 chipset (rest are handled on qcu.c).
  * Also we setup interrupt mask register (IMR) and read the various interrupt
  * status registers (ISR).
- *
- * TODO: Handle SISR on 5211+ and introduce a function to return the queue
- * number that resulted the interrupt.
  */
 
 #include "ath5k.h"
@@ -42,22 +39,22 @@
 \*********/
 
 /**
- * ath5k_hw_start_rx_dma - Start DMA receive
- *
+ * ath5k_hw_start_rx_dma() - Start DMA receive
  * @ah: The &struct ath5k_hw
  */
-void ath5k_hw_start_rx_dma(struct ath5k_hw *ah)
+void
+ath5k_hw_start_rx_dma(struct ath5k_hw *ah)
 {
         ath5k_hw_reg_write(ah, AR5K_CR_RXE, AR5K_CR);
         ath5k_hw_reg_read(ah, AR5K_CR);
 }
 
 /**
- * ath5k_hw_stop_rx_dma - Stop DMA receive
- *
+ * ath5k_hw_stop_rx_dma() - Stop DMA receive
  * @ah: The &struct ath5k_hw
  */
-static int ath5k_hw_stop_rx_dma(struct ath5k_hw *ah)
+static int
+ath5k_hw_stop_rx_dma(struct ath5k_hw *ah)
 {
         unsigned int i;
 
@@ -79,24 +76,24 @@ static int ath5k_hw_stop_rx_dma(struct ath5k_hw *ah)
 }
 
 /**
- * ath5k_hw_get_rxdp - Get RX Descriptor's address
- *
+ * ath5k_hw_get_rxdp() - Get RX Descriptor's address
  * @ah: The &struct ath5k_hw
  */
-u32 ath5k_hw_get_rxdp(struct ath5k_hw *ah)
+u32
+ath5k_hw_get_rxdp(struct ath5k_hw *ah)
 {
         return ath5k_hw_reg_read(ah, AR5K_RXDP);
 }
 
 /**
- * ath5k_hw_set_rxdp - Set RX Descriptor's address
- *
+ * ath5k_hw_set_rxdp() - Set RX Descriptor's address
  * @ah: The &struct ath5k_hw
  * @phys_addr: RX descriptor address
  *
  * Returns -EIO if rx is active
  */
-int ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr)
+int
+ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr)
 {
         if (ath5k_hw_reg_read(ah, AR5K_CR) & AR5K_CR_RXE) {
                 ATH5K_DBG(ah, ATH5K_DEBUG_DMA,
@@ -114,8 +111,7 @@ int ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr)
 \**********/
 
 /**
- * ath5k_hw_start_tx_dma - Start DMA transmit for a specific queue
- *
+ * ath5k_hw_start_tx_dma() - Start DMA transmit for a specific queue
  * @ah: The &struct ath5k_hw
  * @queue: The hw queue number
  *
@@ -128,7 +124,8 @@ int ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr)
  * NOTE: Must be called after setting up tx control descriptor for that
  * queue (see below).
  */
-int ath5k_hw_start_tx_dma(struct ath5k_hw *ah, unsigned int queue)
+int
+ath5k_hw_start_tx_dma(struct ath5k_hw *ah, unsigned int queue)
 {
         u32 tx_queue;
 
@@ -177,17 +174,16 @@ int ath5k_hw_start_tx_dma(struct ath5k_hw *ah, unsigned int queue)
 }
 
 /**
- * ath5k_hw_stop_tx_dma - Stop DMA transmit on a specific queue
- *
+ * ath5k_hw_stop_tx_dma() - Stop DMA transmit on a specific queue
  * @ah: The &struct ath5k_hw
  * @queue: The hw queue number
  *
  * Stop DMA transmit on a specific hw queue and drain queue so we don't
  * have any pending frames. Returns -EBUSY if we still have pending frames,
  * -EINVAL if queue number is out of range or inactive.
- *
  */
-static int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue)
+static int
+ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue)
 {
         unsigned int i = 40;
         u32 tx_queue, pending;
@@ -320,14 +316,14 @@ static int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue)
 }
 
 /**
- * ath5k_hw_stop_beacon_queue - Stop beacon queue
- *
- * @ah The &struct ath5k_hw
- * @queue The queue number
+ * ath5k_hw_stop_beacon_queue() - Stop beacon queue
+ * @ah: The &struct ath5k_hw
+ * @queue: The queue number
  *
  * Returns -EIO if queue didn't stop
  */
-int ath5k_hw_stop_beacon_queue(struct ath5k_hw *ah, unsigned int queue)
+int
+ath5k_hw_stop_beacon_queue(struct ath5k_hw *ah, unsigned int queue)
 {
         int ret;
         ret = ath5k_hw_stop_tx_dma(ah, queue);
@@ -340,8 +336,7 @@ int ath5k_hw_stop_beacon_queue(struct ath5k_hw *ah, unsigned int queue)
 }
 
 /**
- * ath5k_hw_get_txdp - Get TX Descriptor's address for a specific queue
- *
+ * ath5k_hw_get_txdp() - Get TX Descriptor's address for a specific queue
  * @ah: The &struct ath5k_hw
  * @queue: The hw queue number
  *
@@ -352,7 +347,8 @@ int ath5k_hw_stop_beacon_queue(struct ath5k_hw *ah, unsigned int queue)
  *
  * XXX: Is TXDP read and clear ?
  */
-u32 ath5k_hw_get_txdp(struct ath5k_hw *ah, unsigned int queue)
+u32
+ath5k_hw_get_txdp(struct ath5k_hw *ah, unsigned int queue)
 {
         u16 tx_reg;
 
@@ -382,10 +378,10 @@ u32 ath5k_hw_get_txdp(struct ath5k_hw *ah, unsigned int queue)
 }
 
 /**
- * ath5k_hw_set_txdp - Set TX Descriptor's address for a specific queue
- *
+ * ath5k_hw_set_txdp() - Set TX Descriptor's address for a specific queue
  * @ah: The &struct ath5k_hw
  * @queue: The hw queue number
+ * @phys_addr: The physical address
  *
  * Set TX descriptor's address for a specific queue. For 5210 we ignore
  * the queue number and we use tx queue type since we only have 2 queues
@@ -394,7 +390,8 @@ u32 ath5k_hw_get_txdp(struct ath5k_hw *ah, unsigned int queue)
  * Returns -EINVAL if queue type is invalid for 5210 and -EIO if queue is still
  * active.
  */
-int ath5k_hw_set_txdp(struct ath5k_hw *ah, unsigned int queue, u32 phys_addr)
+int
+ath5k_hw_set_txdp(struct ath5k_hw *ah, unsigned int queue, u32 phys_addr)
 {
         u16 tx_reg;
 
@@ -435,8 +432,7 @@ int ath5k_hw_set_txdp(struct ath5k_hw *ah, unsigned int queue, u32 phys_addr)
 }
 
 /**
- * ath5k_hw_update_tx_triglevel - Update tx trigger level
- *
+ * ath5k_hw_update_tx_triglevel() - Update tx trigger level
  * @ah: The &struct ath5k_hw
  * @increase: Flag to force increase of trigger level
  *
@@ -444,15 +440,15 @@ int ath5k_hw_set_txdp(struct ath5k_hw *ah, unsigned int queue, u32 phys_addr)
  * buffer (aka FIFO threshold) that is used to indicate when PCU flushes
  * the buffer and transmits its data. Lowering this results sending small
  * frames more quickly but can lead to tx underruns, raising it a lot can
- * result other problems (i think bmiss is related). Right now we start with
- * the lowest possible (64Bytes) and if we get tx underrun we increase it using
- * the increase flag. Returns -EIO if we have reached maximum/minimum.
+ * result other problems. Right now we start with the lowest possible
+ * (64Bytes) and if we get tx underrun we increase it using the increase
+ * flag. Returns -EIO if we have reached maximum/minimum.
  *
  * XXX: Link this with tx DMA size ?
- * XXX: Use it to save interrupts ?
- * TODO: Needs testing, i think it's related to bmiss...
+ * XXX2: Use it to save interrupts ?
  */
-int ath5k_hw_update_tx_triglevel(struct ath5k_hw *ah, bool increase)
+int
+ath5k_hw_update_tx_triglevel(struct ath5k_hw *ah, bool increase)
 {
         u32 trigger_level, imr;
         int ret = -EIO;
@@ -498,21 +494,20 @@ done:
 \*******************/
 
 /**
- * ath5k_hw_is_intr_pending - Check if we have pending interrupts
- *
+ * ath5k_hw_is_intr_pending() - Check if we have pending interrupts
  * @ah: The &struct ath5k_hw
  *
  * Check if we have pending interrupts to process. Returns 1 if we
  * have pending interrupts and 0 if we haven't.
  */
-bool ath5k_hw_is_intr_pending(struct ath5k_hw *ah)
+bool
+ath5k_hw_is_intr_pending(struct ath5k_hw *ah)
 {
         return ath5k_hw_reg_read(ah, AR5K_INTPEND) == 1 ? 1 : 0;
 }
 
 /**
- * ath5k_hw_get_isr - Get interrupt status
- *
+ * ath5k_hw_get_isr() - Get interrupt status
  * @ah: The @struct ath5k_hw
  * @interrupt_mask: Driver's interrupt mask used to filter out
  * interrupts in sw.
@@ -523,62 +518,162 @@ bool ath5k_hw_is_intr_pending(struct ath5k_hw *ah)
  * being mapped on some standard non hw-specific positions
  * (check out &ath5k_int).
  *
- * NOTE: We use read-and-clear register, so after this function is called ISR
- * is zeroed.
+ * NOTE: We do write-to-clear, so the active PISR/SISR bits at the time this
+ * function gets called are cleared on return.
  */
-int ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)
+int
+ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)
 {
-        u32 data;
+        u32 data = 0;
 
         /*
-         * Read interrupt status from the Interrupt Status register
-         * on 5210
+         * Read interrupt status from Primary Interrupt
+         * Register.
+         *
+         * Note: PISR/SISR Not available on 5210
          */
         if (ah->ah_version == AR5K_AR5210) {
-                data = ath5k_hw_reg_read(ah, AR5K_ISR);
-                if (unlikely(data == AR5K_INT_NOCARD)) {
-                        *interrupt_mask = data;
+                u32 isr = 0;
+                isr = ath5k_hw_reg_read(ah, AR5K_ISR);
+                if (unlikely(isr == AR5K_INT_NOCARD)) {
+                        *interrupt_mask = isr;
                         return -ENODEV;
                 }
-        } else {
+
                 /*
-                 * Read interrupt status from Interrupt
-                 * Status Register shadow copy (Read And Clear)
-                 *
-                 * Note: PISR/SISR Not available on 5210
+                 * Filter out the non-common bits from the interrupt
+                 * status.
                  */
-                data = ath5k_hw_reg_read(ah, AR5K_RAC_PISR);
-                if (unlikely(data == AR5K_INT_NOCARD)) {
-                        *interrupt_mask = data;
+                *interrupt_mask = (isr & AR5K_INT_COMMON) & ah->ah_imr;
+
+                /* Hanlde INT_FATAL */
+                if (unlikely(isr & (AR5K_ISR_SSERR | AR5K_ISR_MCABT
+                                                | AR5K_ISR_DPERR)))
+                        *interrupt_mask |= AR5K_INT_FATAL;
+
+                /*
+                 * XXX: BMISS interrupts may occur after association.
+                 * I found this on 5210 code but it needs testing. If this is
+                 * true we should disable them before assoc and re-enable them
+                 * after a successful assoc + some jiffies.
+                        interrupt_mask &= ~AR5K_INT_BMISS;
+                 */
+
+                data = isr;
+        } else {
+                u32 pisr = 0;
+                u32 pisr_clear = 0;
+                u32 sisr0 = 0;
+                u32 sisr1 = 0;
+                u32 sisr2 = 0;
+                u32 sisr3 = 0;
+                u32 sisr4 = 0;
+
+                /* Read PISR and SISRs... */
+                pisr = ath5k_hw_reg_read(ah, AR5K_PISR);
+                if (unlikely(pisr == AR5K_INT_NOCARD)) {
+                        *interrupt_mask = pisr;
                         return -ENODEV;
                 }
-        }
 
-        /*
-         * Get abstract interrupt mask (driver-compatible)
-         */
-        *interrupt_mask = (data & AR5K_INT_COMMON) & ah->ah_imr;
+                sisr0 = ath5k_hw_reg_read(ah, AR5K_SISR0);
+                sisr1 = ath5k_hw_reg_read(ah, AR5K_SISR1);
+                sisr2 = ath5k_hw_reg_read(ah, AR5K_SISR2);
+                sisr3 = ath5k_hw_reg_read(ah, AR5K_SISR3);
+                sisr4 = ath5k_hw_reg_read(ah, AR5K_SISR4);
 
-        if (ah->ah_version != AR5K_AR5210) {
-                u32 sisr2 = ath5k_hw_reg_read(ah, AR5K_RAC_SISR2);
+                /*
+                 * PISR holds the logical OR of interrupt bits
+                 * from SISR registers:
+                 *
+                 * TXOK and TXDESC  -> Logical OR of TXOK and TXDESC
+                 *                      per-queue bits on SISR0
+                 *
+                 * TXERR and TXEOL -> Logical OR of TXERR and TXEOL
+                 *                      per-queue bits on SISR1
+                 *
+                 * TXURN -> Logical OR of TXURN per-queue bits on SISR2
+                 *
+                 * HIUERR -> Logical OR of MCABT, SSERR and DPER bits on SISR2
+                 *
+                 * BCNMISC -> Logical OR of TIM, CAB_END, DTIM_SYNC
+                 *              BCN_TIMEOUT, CAB_TIMEOUT and DTIM
+                 *              (and TSFOOR ?) bits on SISR2
+                 *
+                 * QCBRORN and QCBRURN -> Logical OR of QCBRORN and
+                 *                      QCBRURN per-queue bits on SISR3
+                 * QTRIG -> Logical OR of QTRIG per-queue bits on SISR4
+                 *
+                 * If we clean these bits on PISR we 'll also clear all
+                 * related bits from SISRs, e.g. if we write the TXOK bit on
+                 * PISR we 'll clean all TXOK bits from SISR0 so if a new TXOK
+                 * interrupt got fired for another queue while we were reading
+                 * the interrupt registers and we write back the TXOK bit on
+                 * PISR we 'll lose it. So make sure that we don't write back
+                 * on PISR any bits that come from SISRs. Clearing them from
+                 * SISRs will also clear PISR so no need to worry here.
+                 */
 
-                /*HIU = Host Interface Unit (PCI etc)*/
-                if (unlikely(data & (AR5K_ISR_HIUERR)))
-                        *interrupt_mask |= AR5K_INT_FATAL;
+                pisr_clear = pisr & ~AR5K_ISR_BITS_FROM_SISRS;
 
-                /*Beacon Not Ready*/
-                if (unlikely(data & (AR5K_ISR_BNR)))
-                        *interrupt_mask |= AR5K_INT_BNR;
+                /*
+                 * Write to clear them...
+                 * Note: This means that each bit we write back
+                 * to the registers will get cleared, leaving the
+                 * rest unaffected. So this won't affect new interrupts
+                 * we didn't catch while reading/processing, we 'll get
+                 * them next time get_isr gets called.
+                 */
+                ath5k_hw_reg_write(ah, sisr0, AR5K_SISR0);
+                ath5k_hw_reg_write(ah, sisr1, AR5K_SISR1);
+                ath5k_hw_reg_write(ah, sisr2, AR5K_SISR2);
+                ath5k_hw_reg_write(ah, sisr3, AR5K_SISR3);
+                ath5k_hw_reg_write(ah, sisr4, AR5K_SISR4);
+                ath5k_hw_reg_write(ah, pisr_clear, AR5K_PISR);
+                /* Flush previous write */
+                ath5k_hw_reg_read(ah, AR5K_PISR);
 
-                if (unlikely(sisr2 & (AR5K_SISR2_SSERR |
-                                        AR5K_SISR2_DPERR |
-                                        AR5K_SISR2_MCABT)))
-                        *interrupt_mask |= AR5K_INT_FATAL;
+                /*
+                 * Filter out the non-common bits from the interrupt
+                 * status.
+                 */
+                *interrupt_mask = (pisr & AR5K_INT_COMMON) & ah->ah_imr;
+
+
+                /* We treat TXOK,TXDESC, TXERR and TXEOL
+                 * the same way (schedule the tx tasklet)
+                 * so we track them all together per queue */
+                if (pisr & AR5K_ISR_TXOK)
+                        ah->ah_txq_isr_txok_all |= AR5K_REG_MS(sisr0,
+                                                AR5K_SISR0_QCU_TXOK);
 
-                if (data & AR5K_ISR_TIM)
+                if (pisr & AR5K_ISR_TXDESC)
+                        ah->ah_txq_isr_txok_all |= AR5K_REG_MS(sisr0,
+                                                AR5K_SISR0_QCU_TXDESC);
+
+                if (pisr & AR5K_ISR_TXERR)
+                        ah->ah_txq_isr_txok_all |= AR5K_REG_MS(sisr1,
+                                                AR5K_SISR1_QCU_TXERR);
+
+                if (pisr & AR5K_ISR_TXEOL)
+                        ah->ah_txq_isr_txok_all |= AR5K_REG_MS(sisr1,
+                                                AR5K_SISR1_QCU_TXEOL);
+
+                /* Currently this is not much usefull since we treat
+                 * all queues the same way if we get a TXURN (update
+                 * tx trigger level) but we might need it later on*/
+                if (pisr & AR5K_ISR_TXURN)
+                        ah->ah_txq_isr_txurn |= AR5K_REG_MS(sisr2,
+                                                AR5K_SISR2_QCU_TXURN);
+
+                /* Misc Beacon related interrupts */
+
+                /* For AR5211 */
+                if (pisr & AR5K_ISR_TIM)
                         *interrupt_mask |= AR5K_INT_TIM;
 
-                if (data & AR5K_ISR_BCNMISC) {
+                /* For AR5212+ */
+                if (pisr & AR5K_ISR_BCNMISC) {
                         if (sisr2 & AR5K_SISR2_TIM)
                                 *interrupt_mask |= AR5K_INT_TIM;
                         if (sisr2 & AR5K_SISR2_DTIM)
@@ -591,63 +686,39 @@ int ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)
                                 *interrupt_mask |= AR5K_INT_CAB_TIMEOUT;
                 }
 
-                if (data & AR5K_ISR_RXDOPPLER)
-                        *interrupt_mask |= AR5K_INT_RX_DOPPLER;
-                if (data & AR5K_ISR_QCBRORN) {
+                /* Below interrupts are unlikely to happen */
+
+                /* HIU = Host Interface Unit (PCI etc)
+                 * Can be one of MCABT, SSERR, DPERR from SISR2 */
+                if (unlikely(pisr & (AR5K_ISR_HIUERR)))
+                        *interrupt_mask |= AR5K_INT_FATAL;
+
+                /*Beacon Not Ready*/
+                if (unlikely(pisr & (AR5K_ISR_BNR)))
+                        *interrupt_mask |= AR5K_INT_BNR;
+
+                /* A queue got CBR overrun */
+                if (unlikely(pisr & (AR5K_ISR_QCBRORN))) {
                         *interrupt_mask |= AR5K_INT_QCBRORN;
-                        ah->ah_txq_isr |= AR5K_REG_MS(
-                                        ath5k_hw_reg_read(ah, AR5K_RAC_SISR3),
-                                        AR5K_SISR3_QCBRORN);
+                        ah->ah_txq_isr_qcborn |= AR5K_REG_MS(sisr3,
+                                                AR5K_SISR3_QCBRORN);
                 }
-                if (data & AR5K_ISR_QCBRURN) {
+
+                /* A queue got CBR underrun */
+                if (unlikely(pisr & (AR5K_ISR_QCBRURN))) {
                         *interrupt_mask |= AR5K_INT_QCBRURN;
-                        ah->ah_txq_isr |= AR5K_REG_MS(
-                                        ath5k_hw_reg_read(ah, AR5K_RAC_SISR3),
-                                        AR5K_SISR3_QCBRURN);
+                        ah->ah_txq_isr_qcburn |= AR5K_REG_MS(sisr3,
+                                                AR5K_SISR3_QCBRURN);
                 }
-                if (data & AR5K_ISR_QTRIG) {
+
+                /* A queue got triggered */
+                if (unlikely(pisr & (AR5K_ISR_QTRIG))) {
                         *interrupt_mask |= AR5K_INT_QTRIG;
-                        ah->ah_txq_isr |= AR5K_REG_MS(
-                                        ath5k_hw_reg_read(ah, AR5K_RAC_SISR4),
-                                        AR5K_SISR4_QTRIG);
+                        ah->ah_txq_isr_qtrig |= AR5K_REG_MS(sisr4,
+                                                AR5K_SISR4_QTRIG);
                 }
 
-                if (data & AR5K_ISR_TXOK)
-                        ah->ah_txq_isr |= AR5K_REG_MS(
-                                        ath5k_hw_reg_read(ah, AR5K_RAC_SISR0),
-                                        AR5K_SISR0_QCU_TXOK);
-
-                if (data & AR5K_ISR_TXDESC)
-                        ah->ah_txq_isr |= AR5K_REG_MS(
-                                        ath5k_hw_reg_read(ah, AR5K_RAC_SISR0),
-                                        AR5K_SISR0_QCU_TXDESC);
-
-                if (data & AR5K_ISR_TXERR)
-                        ah->ah_txq_isr |= AR5K_REG_MS(
-                                        ath5k_hw_reg_read(ah, AR5K_RAC_SISR1),
-                                        AR5K_SISR1_QCU_TXERR);
-
-                if (data & AR5K_ISR_TXEOL)
-                        ah->ah_txq_isr |= AR5K_REG_MS(
-                                        ath5k_hw_reg_read(ah, AR5K_RAC_SISR1),
-                                        AR5K_SISR1_QCU_TXEOL);
-
-                if (data & AR5K_ISR_TXURN)
-                        ah->ah_txq_isr |= AR5K_REG_MS(
-                                        ath5k_hw_reg_read(ah, AR5K_RAC_SISR2),
-                                        AR5K_SISR2_QCU_TXURN);
-        } else {
-                if (unlikely(data & (AR5K_ISR_SSERR | AR5K_ISR_MCABT
-                                | AR5K_ISR_HIUERR | AR5K_ISR_DPERR)))
-                        *interrupt_mask |= AR5K_INT_FATAL;
-
-                /*
-                 * XXX: BMISS interrupts may occur after association.
-                 * I found this on 5210 code but it needs testing. If this is
-                 * true we should disable them before assoc and re-enable them
-                 * after a successful assoc + some jiffies.
-                        interrupt_mask &= ~AR5K_INT_BMISS;
-                 */
+                data = pisr;
         }
 
         /*
@@ -661,8 +732,7 @@ int ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)
 }
 
 /**
- * ath5k_hw_set_imr - Set interrupt mask
- *
+ * ath5k_hw_set_imr() - Set interrupt mask
  * @ah: The &struct ath5k_hw
  * @new_mask: The new interrupt mask to be set
  *
@@ -670,7 +740,8 @@ int ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)
  * ath5k_int bits to hw-specific bits to remove abstraction and writing
  * Interrupt Mask Register.
  */
-enum ath5k_int ath5k_hw_set_imr(struct ath5k_hw *ah, enum ath5k_int new_mask)
+enum ath5k_int
+ath5k_hw_set_imr(struct ath5k_hw *ah, enum ath5k_int new_mask)
 {
         enum ath5k_int old_mask, int_mask;
 
@@ -697,16 +768,14 @@ enum ath5k_int ath5k_hw_set_imr(struct ath5k_hw *ah, enum ath5k_int new_mask)
                 u32 simr2 = ath5k_hw_reg_read(ah, AR5K_SIMR2)
                                 & AR5K_SIMR2_QCU_TXURN;
 
+                /* Fatal interrupt abstraction for 5211+ */
                 if (new_mask & AR5K_INT_FATAL) {
                         int_mask |= AR5K_IMR_HIUERR;
                         simr2 |= (AR5K_SIMR2_MCABT | AR5K_SIMR2_SSERR
                                 | AR5K_SIMR2_DPERR);
                 }
 
-                /*Beacon Not Ready*/
-                if (new_mask & AR5K_INT_BNR)
-                        int_mask |= AR5K_INT_BNR;
-
+                /* Misc beacon related interrupts */
                 if (new_mask & AR5K_INT_TIM)
                         int_mask |= AR5K_IMR_TIM;
 
@@ -721,8 +790,9 @@ enum ath5k_int ath5k_hw_set_imr(struct ath5k_hw *ah, enum ath5k_int new_mask)
                 if (new_mask & AR5K_INT_CAB_TIMEOUT)
                         simr2 |= AR5K_SISR2_CAB_TIMEOUT;
 
-                if (new_mask & AR5K_INT_RX_DOPPLER)
-                        int_mask |= AR5K_IMR_RXDOPPLER;
+                /*Beacon Not Ready*/
+                if (new_mask & AR5K_INT_BNR)
+                        int_mask |= AR5K_INT_BNR;
 
                 /* Note: Per queue interrupt masks
                  * are set via ath5k_hw_reset_tx_queue() (qcu.c) */
@@ -730,10 +800,12 @@ enum ath5k_int ath5k_hw_set_imr(struct ath5k_hw *ah, enum ath5k_int new_mask)
                 ath5k_hw_reg_write(ah, simr2, AR5K_SIMR2);
 
         } else {
+                /* Fatal interrupt abstraction for 5210 */
                 if (new_mask & AR5K_INT_FATAL)
                         int_mask |= (AR5K_IMR_SSERR | AR5K_IMR_MCABT
                                 | AR5K_IMR_HIUERR | AR5K_IMR_DPERR);
 
+                /* Only common interrupts left for 5210 (no SIMRs) */
                 ath5k_hw_reg_write(ah, int_mask, AR5K_IMR);
         }
 
@@ -760,8 +832,7 @@ enum ath5k_int ath5k_hw_set_imr(struct ath5k_hw *ah, enum ath5k_int new_mask)
 \********************/
 
 /**
- * ath5k_hw_dma_init - Initialize DMA unit
- *
+ * ath5k_hw_dma_init() - Initialize DMA unit
  * @ah: The &struct ath5k_hw
  *
  * Set DMA size and pre-enable interrupts
@@ -770,7 +841,8 @@ enum ath5k_int ath5k_hw_set_imr(struct ath5k_hw *ah, enum ath5k_int new_mask)
  *
  * XXX: Save/restore RXDP/TXDP registers ?
  */
-void ath5k_hw_dma_init(struct ath5k_hw *ah)
+void
+ath5k_hw_dma_init(struct ath5k_hw *ah)
 {
         /*
          * Set Rx/Tx DMA Configuration
@@ -799,8 +871,7 @@ void ath5k_hw_dma_init(struct ath5k_hw *ah)
 }
 
 /**
- * ath5k_hw_dma_stop - stop DMA unit
- *
+ * ath5k_hw_dma_stop() - stop DMA unit
  * @ah: The &struct ath5k_hw
  *
  * Stop tx/rx DMA and interrupts. Returns
@@ -810,7 +881,8 @@ void ath5k_hw_dma_init(struct ath5k_hw *ah)
  * stuck frames on tx queues, only a reset
  * can fix that.
  */
-int ath5k_hw_dma_stop(struct ath5k_hw *ah)
+int
+ath5k_hw_dma_stop(struct ath5k_hw *ah)
 {
         int i, qmax, err;
         err = 0;
diff --git a/drivers/net/wireless/ath/ath5k/gpio.c b/drivers/net/wireless/ath/ath5k/gpio.c
index 859297811914..73d3dd8a306a 100644
--- a/drivers/net/wireless/ath/ath5k/gpio.c
+++ b/drivers/net/wireless/ath/ath5k/gpio.c
@@ -24,10 +24,33 @@
 #include "reg.h"
 #include "debug.h"
 
-/*
- * Set led state
+
+/**
+ * DOC: GPIO/LED functions
+ *
+ * Here we control the 6 bidirectional GPIO pins provided by the hw.
+ * We can set a GPIO pin to be an input or an output pin on GPIO control
+ * register and then read or set its status from GPIO data input/output
+ * registers.
+ *
+ * We also control the two LED pins provided by the hw, LED_0 is our
+ * "power" LED and LED_1 is our "network activity" LED but many scenarios
+ * are available from hw. Vendors might also provide LEDs connected to the
+ * GPIO pins, we handle them through the LED subsystem on led.c
+ */
+
+
+/**
+ * ath5k_hw_set_ledstate() - Set led state
+ * @ah: The &struct ath5k_hw
+ * @state: One of AR5K_LED_*
+ *
+ * Used to set the LED blinking state. This only
+ * works for the LED connected to the LED_0, LED_1 pins,
+ * not the GPIO based.
  */
-void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state)
+void
+ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state)
 {
         u32 led;
         /*5210 has different led mode handling*/
@@ -74,10 +97,13 @@ void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state)
                 AR5K_REG_ENABLE_BITS(ah, AR5K_PCICFG, led_5210);
 }
 
-/*
- * Set GPIO inputs
+/**
+ * ath5k_hw_set_gpio_input() - Set GPIO inputs
+ * @ah: The &struct ath5k_hw
+ * @gpio: GPIO pin to set as input
  */
-int ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio)
+int
+ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio)
 {
         if (gpio >= AR5K_NUM_GPIO)
                 return -EINVAL;
@@ -89,10 +115,13 @@ int ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio)
         return 0;
 }
 
-/*
- * Set GPIO outputs
+/**
+ * ath5k_hw_set_gpio_output() - Set GPIO outputs
+ * @ah: The &struct ath5k_hw
+ * @gpio: The GPIO pin to set as output
  */
-int ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio)
+int
+ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio)
 {
         if (gpio >= AR5K_NUM_GPIO)
                 return -EINVAL;
@@ -104,10 +133,13 @@ int ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio)
         return 0;
 }
 
-/*
- * Get GPIO state
+/**
+ * ath5k_hw_get_gpio() - Get GPIO state
+ * @ah: The &struct ath5k_hw
+ * @gpio: The GPIO pin to read
  */
-u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio)
+u32
+ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio)
 {
         if (gpio >= AR5K_NUM_GPIO)
                 return 0xffffffff;
@@ -117,10 +149,14 @@ u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio)
                 0x1;
 }
 
-/*
- * Set GPIO state
+/**
+ * ath5k_hw_set_gpio() - Set GPIO state
+ * @ah: The &struct ath5k_hw
+ * @gpio: The GPIO pin to set
+ * @val: Value to set (boolean)
  */
-int ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val)
+int
+ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val)
 {
         u32 data;
 
@@ -138,10 +174,19 @@ int ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val)
         return 0;
 }
 
-/*
- * Initialize the GPIO interrupt (RFKill switch)
+/**
+ * ath5k_hw_set_gpio_intr() - Initialize the GPIO interrupt (RFKill switch)
+ * @ah: The &struct ath5k_hw
+ * @gpio: The GPIO pin to use
+ * @interrupt_level: True to generate interrupt on active pin (high)
+ *
+ * This function is used to set up the GPIO interrupt for the hw RFKill switch.
+ * That switch is connected to a GPIO pin and it's number is stored on EEPROM.
+ * It can either open or close the circuit to indicate that we should disable
+ * RF/Wireless to save power (we also get that from EEPROM).
  */
-void ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio,
+void
+ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio,
                 u32 interrupt_level)
 {
         u32 data;
diff --git a/drivers/net/wireless/ath/ath5k/initvals.c b/drivers/net/wireless/ath/ath5k/initvals.c
index 1ffecc0fd3ed..a1ea78e05b47 100644
--- a/drivers/net/wireless/ath/ath5k/initvals.c
+++ b/drivers/net/wireless/ath/ath5k/initvals.c
@@ -23,24 +23,27 @@
 #include "reg.h"
 #include "debug.h"
 
-/*
- * Mode-independent initial register writes
+/**
+ * struct ath5k_ini - Mode-independent initial register writes
+ * @ini_register: Register address
+ * @ini_value: Default value
+ * @ini_mode: 0 to write 1 to read (and clear)
  */
-
 struct ath5k_ini {
         u16     ini_register;
         u32     ini_value;
 
         enum {
                 AR5K_INI_WRITE = 0,     /* Default */
-                AR5K_INI_READ = 1,      /* Cleared on read */
+                AR5K_INI_READ = 1,
         } ini_mode;
 };
 
-/*
- * Mode specific initial register values
+/**
+ * struct ath5k_ini_mode - Mode specific initial register values
+ * @mode_register: Register address
+ * @mode_value: Set of values for each enum ath5k_driver_mode
  */
-
 struct ath5k_ini_mode {
         u16     mode_register;
         u32     mode_value[3];
@@ -386,11 +389,10 @@ static const struct ath5k_ini ar5211_ini[] = {
 
 /* Initial mode-specific settings for AR5211
  * 5211 supports OFDM-only g (draft g) but we
- * need to test it !
- */
+ * need to test it ! */
 static const struct ath5k_ini_mode ar5211_ini_mode[] = {
         { AR5K_TXCFG,
-        /*      A/XR          B           G       */
+        /*      A          B           G       */
            { 0x00000015, 0x0000001d, 0x00000015 } },
         { AR5K_QUEUE_DFS_LOCAL_IFS(0),
            { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
@@ -460,7 +462,7 @@ static const struct ath5k_ini_mode ar5211_ini_mode[] = {
            { 0x00000010, 0x00000010, 0x00000010 } },
 };
 
-/* Initial register settings for AR5212 */
+/* Initial register settings for AR5212 and newer chips */
 static const struct ath5k_ini ar5212_ini_common_start[] = {
         { AR5K_RXDP,            0x00000000 },
         { AR5K_RXCFG,           0x00000005 },
@@ -724,7 +726,8 @@ static const struct ath5k_ini_mode ar5212_ini_mode_start[] = {
            { 0x00000000, 0x00000000, 0x00000108 } },
 };
 
-/* Initial mode-specific settings for AR5212 + RF5111 (Written after ar5212_ini) */
+/* Initial mode-specific settings for AR5212 + RF5111
+ * (Written after ar5212_ini) */
 static const struct ath5k_ini_mode rf5111_ini_mode_end[] = {
         { AR5K_TXCFG,
         /*      A/XR          B           G       */
@@ -757,6 +760,7 @@ static const struct ath5k_ini_mode rf5111_ini_mode_end[] = {
            { 0x1883800a, 0x1873800a, 0x1883800a } },
 };
 
+/* Common for all modes */
 static const struct ath5k_ini rf5111_ini_common_end[] = {
         { AR5K_DCU_FP,          0x00000000 },
         { AR5K_PHY_AGC,         0x00000000 },
@@ -774,7 +778,9 @@ static const struct ath5k_ini rf5111_ini_common_end[] = {
         { 0xa23c,               0x13c889af },
 };
 
-/* Initial mode-specific settings for AR5212 + RF5112 (Written after ar5212_ini) */
+
+/* Initial mode-specific settings for AR5212 + RF5112
+ * (Written after ar5212_ini) */
 static const struct ath5k_ini_mode rf5112_ini_mode_end[] = {
         { AR5K_TXCFG,
         /*      A/XR          B           G       */
@@ -825,7 +831,9 @@ static const struct ath5k_ini rf5112_ini_common_end[] = {
         { 0xa23c,               0x13c889af },
 };
 
-/* Initial mode-specific settings for RF5413/5414 (Written after ar5212_ini) */
+
+/* Initial mode-specific settings for RF5413/5414
+ * (Written after ar5212_ini) */
 static const struct ath5k_ini_mode rf5413_ini_mode_end[] = {
         { AR5K_TXCFG,
         /*      A/XR          B           G       */
@@ -963,7 +971,8 @@ static const struct ath5k_ini rf5413_ini_common_end[] = {
         { 0xa384, 0xf3307ff0 },
 };
 
-/* Initial mode-specific settings for RF2413/2414 (Written after ar5212_ini) */
+/* Initial mode-specific settings for RF2413/2414
+ * (Written after ar5212_ini) */
 /* XXX: a mode ? */
 static const struct ath5k_ini_mode rf2413_ini_mode_end[] = {
         { AR5K_TXCFG,
@@ -1085,7 +1094,8 @@ static const struct ath5k_ini rf2413_ini_common_end[] = {
         { 0xa384, 0xf3307ff0 },
 };
 
-/* Initial mode-specific settings for RF2425 (Written after ar5212_ini) */
+/* Initial mode-specific settings for RF2425
+ * (Written after ar5212_ini) */
 /* XXX: a mode ? */
 static const struct ath5k_ini_mode rf2425_ini_mode_end[] = {
         { AR5K_TXCFG,
@@ -1357,10 +1367,15 @@ static const struct ath5k_ini rf5112_ini_bbgain[] = {
 };
 
 
-/*
- * Write initial register dump
+/**
+ * ath5k_hw_ini_registers() - Write initial register dump common for all modes
+ * @ah: The &struct ath5k_hw
+ * @size: Dump size
+ * @ini_regs: The array of &struct ath5k_ini
+ * @skip_pcu: Skip PCU registers
  */
-static void ath5k_hw_ini_registers(struct ath5k_hw *ah, unsigned int size,
+static void
+ath5k_hw_ini_registers(struct ath5k_hw *ah, unsigned int size,
                 const struct ath5k_ini *ini_regs, bool skip_pcu)
 {
         unsigned int i;
@@ -1388,7 +1403,15 @@ static void ath5k_hw_ini_registers(struct ath5k_hw *ah, unsigned int size,
         }
 }
 
-static void ath5k_hw_ini_mode_registers(struct ath5k_hw *ah,
+/**
+ * ath5k_hw_ini_mode_registers() - Write initial mode-specific register dump
+ * @ah: The &struct ath5k_hw
+ * @size: Dump size
+ * @ini_mode: The array of &struct ath5k_ini_mode
+ * @mode: One of enum ath5k_driver_mode
+ */
+static void
+ath5k_hw_ini_mode_registers(struct ath5k_hw *ah,
                 unsigned int size, const struct ath5k_ini_mode *ini_mode,
                 u8 mode)
 {
@@ -1402,7 +1425,17 @@ static void ath5k_hw_ini_mode_registers(struct ath5k_hw *ah,
 
 }
 
-int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool skip_pcu)
+/**
+ * ath5k_hw_write_initvals() - Write initial chip-specific register dump
+ * @ah: The &struct ath5k_hw
+ * @mode: One of enum ath5k_driver_mode
+ * @skip_pcu: Skip PCU registers
+ *
+ * Write initial chip-specific register dump, to get the chipset on a
+ * clean and ready-to-work state after warm reset.
+ */
+int
+ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool skip_pcu)
 {
         /*
          * Write initial register settings
diff --git a/drivers/net/wireless/ath/ath5k/pci.c b/drivers/net/wireless/ath/ath5k/pci.c
index c1dff2ced044..849fa060ebc4 100644
--- a/drivers/net/wireless/ath/ath5k/pci.c
+++ b/drivers/net/wireless/ath/ath5k/pci.c
@@ -18,6 +18,7 @@
 #include <linux/pci.h>
 #include <linux/pci-aspm.h>
 #include <linux/etherdevice.h>
+#include <linux/module.h>
 #include "../ath.h"
 #include "ath5k.h"
 #include "debug.h"
@@ -97,7 +98,7 @@ ath5k_pci_eeprom_read(struct ath_common *common, u32 offset, u16 *data)
                                         0xffff);
                         return true;
                 }
-                udelay(15);
+                usleep_range(15, 20);
         }
 
         return false;
diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c
index a7eafa3edc21..cebfd6fd31d3 100644
--- a/drivers/net/wireless/ath/ath5k/pcu.c
+++ b/drivers/net/wireless/ath/ath5k/pcu.c
@@ -30,11 +30,47 @@
 #include "reg.h"
 #include "debug.h"
 
-/*
+/**
+ * DOC: Protocol Control Unit (PCU) functions
+ *
+ * Protocol control unit is responsible to maintain various protocol
+ * properties before a frame is send and after a frame is received to/from
+ * baseband. To be more specific, PCU handles:
+ *
+ * - Buffering of RX and TX frames (after QCU/DCUs)
+ *
+ * - Encrypting and decrypting (using the built-in engine)
+ *
+ * - Generating ACKs, RTS/CTS frames
+ *
+ * - Maintaining TSF
+ *
+ * - FCS
+ *
+ * - Updating beacon data (with TSF etc)
+ *
+ * - Generating virtual CCA
+ *
+ * - RX/Multicast filtering
+ *
+ * - BSSID filtering
+ *
+ * - Various statistics
+ *
+ * -Different operating modes: AP, STA, IBSS
+ *
+ * Note: Most of these functions can be tweaked/bypassed so you can do
+ * them on sw above for debugging or research. For more infos check out PCU
+ * registers on reg.h.
+ */
+
+/**
+ * DOC: ACK rates
+ *
  * AR5212+ can use higher rates for ack transmission
  * based on current tx rate instead of the base rate.
  * It does this to better utilize channel usage.
- * This is a mapping between G rates (that cover both
+ * There is a mapping between G rates (that cover both
  * CCK and OFDM) and ack rates that we use when setting
  * rate -> duration table. This mapping is hw-based so
  * don't change anything.
@@ -63,17 +99,18 @@ static const unsigned int ack_rates_high[] =
 \*******************/
 
 /**
- * ath5k_hw_get_frame_duration - Get tx time of a frame
- *
+ * ath5k_hw_get_frame_duration() - Get tx time of a frame
  * @ah: The &struct ath5k_hw
  * @len: Frame's length in bytes
  * @rate: The @struct ieee80211_rate
+ * @shortpre: Indicate short preample
  *
  * Calculate tx duration of a frame given it's rate and length
  * It extends ieee80211_generic_frame_duration for non standard
  * bwmodes.
  */
-int ath5k_hw_get_frame_duration(struct ath5k_hw *ah,
+int
+ath5k_hw_get_frame_duration(struct ath5k_hw *ah,
                 int len, struct ieee80211_rate *rate, bool shortpre)
 {
         int sifs, preamble, plcp_bits, sym_time;
@@ -129,11 +166,11 @@ int ath5k_hw_get_frame_duration(struct ath5k_hw *ah,
 }
 
 /**
- * ath5k_hw_get_default_slottime - Get the default slot time for current mode
- *
+ * ath5k_hw_get_default_slottime() - Get the default slot time for current mode
  * @ah: The &struct ath5k_hw
  */
-unsigned int ath5k_hw_get_default_slottime(struct ath5k_hw *ah)
+unsigned int
+ath5k_hw_get_default_slottime(struct ath5k_hw *ah)
 {
         struct ieee80211_channel *channel = ah->ah_current_channel;
         unsigned int slot_time;
@@ -160,11 +197,11 @@ unsigned int ath5k_hw_get_default_slottime(struct ath5k_hw *ah)
 }
 
 /**
- * ath5k_hw_get_default_sifs - Get the default SIFS for current mode
- *
+ * ath5k_hw_get_default_sifs() - Get the default SIFS for current mode
  * @ah: The &struct ath5k_hw
  */
-unsigned int ath5k_hw_get_default_sifs(struct ath5k_hw *ah)
+unsigned int
+ath5k_hw_get_default_sifs(struct ath5k_hw *ah)
 {
         struct ieee80211_channel *channel = ah->ah_current_channel;
         unsigned int sifs;
@@ -191,17 +228,17 @@ unsigned int ath5k_hw_get_default_sifs(struct ath5k_hw *ah)
 }
 
 /**
- * ath5k_hw_update_mib_counters - Update MIB counters (mac layer statistics)
- *
+ * ath5k_hw_update_mib_counters() - Update MIB counters (mac layer statistics)
  * @ah: The &struct ath5k_hw
  *
  * Reads MIB counters from PCU and updates sw statistics. Is called after a
  * MIB interrupt, because one of these counters might have reached their maximum
  * and triggered the MIB interrupt, to let us read and clear the counter.
  *
- * Is called in interrupt context!
+ * NOTE: Is called in interrupt context!
  */
-void ath5k_hw_update_mib_counters(struct ath5k_hw *ah)
+void
+ath5k_hw_update_mib_counters(struct ath5k_hw *ah)
 {
         struct ath5k_statistics *stats = &ah->stats;
 
@@ -219,10 +256,8 @@ void ath5k_hw_update_mib_counters(struct ath5k_hw *ah)
 \******************/
 
 /**
- * ath5k_hw_write_rate_duration - fill rate code to duration table
- *
- * @ah: the &struct ath5k_hw
- * @mode: one of enum ath5k_driver_mode
+ * ath5k_hw_write_rate_duration() - Fill rate code to duration table
+ * @ah: The &struct ath5k_hw
  *
  * Write the rate code to duration table upon hw reset. This is a helper for
  * ath5k_hw_pcu_init(). It seems all this is doing is setting an ACK timeout on
@@ -236,7 +271,8 @@ void ath5k_hw_update_mib_counters(struct ath5k_hw *ah)
  * that include all OFDM and CCK rates.
  *
  */
-static inline void ath5k_hw_write_rate_duration(struct ath5k_hw *ah)
+static inline void
+ath5k_hw_write_rate_duration(struct ath5k_hw *ah)
 {
         struct ieee80211_rate *rate;
         unsigned int i;
@@ -280,12 +316,12 @@ static inline void ath5k_hw_write_rate_duration(struct ath5k_hw *ah)
 }
 
 /**
- * ath5k_hw_set_ack_timeout - Set ACK timeout on PCU
- *
+ * ath5k_hw_set_ack_timeout() - Set ACK timeout on PCU
  * @ah: The &struct ath5k_hw
  * @timeout: Timeout in usec
  */
-static int ath5k_hw_set_ack_timeout(struct ath5k_hw *ah, unsigned int timeout)
+static int
+ath5k_hw_set_ack_timeout(struct ath5k_hw *ah, unsigned int timeout)
 {
         if (ath5k_hw_clocktoh(ah, AR5K_REG_MS(0xffffffff, AR5K_TIME_OUT_ACK))
                         <= timeout)
@@ -298,12 +334,12 @@ static int ath5k_hw_set_ack_timeout(struct ath5k_hw *ah, unsigned int timeout)
 }
 
 /**
- * ath5k_hw_set_cts_timeout - Set CTS timeout on PCU
- *
+ * ath5k_hw_set_cts_timeout() - Set CTS timeout on PCU
  * @ah: The &struct ath5k_hw
  * @timeout: Timeout in usec
  */
-static int ath5k_hw_set_cts_timeout(struct ath5k_hw *ah, unsigned int timeout)
+static int
+ath5k_hw_set_cts_timeout(struct ath5k_hw *ah, unsigned int timeout)
 {
         if (ath5k_hw_clocktoh(ah, AR5K_REG_MS(0xffffffff, AR5K_TIME_OUT_CTS))
                         <= timeout)
@@ -321,14 +357,14 @@ static int ath5k_hw_set_cts_timeout(struct ath5k_hw *ah, unsigned int timeout)
 \*******************/
 
 /**
- * ath5k_hw_set_lladdr - Set station id
- *
+ * ath5k_hw_set_lladdr() - Set station id
  * @ah: The &struct ath5k_hw
- * @mac: The card's mac address
+ * @mac: The card's mac address (array of octets)
  *
  * Set station id on hw using the provided mac address
  */
-int ath5k_hw_set_lladdr(struct ath5k_hw *ah, const u8 *mac)
+int
+ath5k_hw_set_lladdr(struct ath5k_hw *ah, const u8 *mac)
 {
         struct ath_common *common = ath5k_hw_common(ah);
         u32 low_id, high_id;
@@ -349,14 +385,14 @@ int ath5k_hw_set_lladdr(struct ath5k_hw *ah, const u8 *mac)
 }
 
 /**
- * ath5k_hw_set_bssid - Set current BSSID on hw
- *
+ * ath5k_hw_set_bssid() - Set current BSSID on hw
  * @ah: The &struct ath5k_hw
  *
  * Sets the current BSSID and BSSID mask we have from the
  * common struct into the hardware
  */
-void ath5k_hw_set_bssid(struct ath5k_hw *ah)
+void
+ath5k_hw_set_bssid(struct ath5k_hw *ah)
 {
         struct ath_common *common = ath5k_hw_common(ah);
         u16 tim_offset = 0;
@@ -389,7 +425,23 @@ void ath5k_hw_set_bssid(struct ath5k_hw *ah)
         ath5k_hw_enable_pspoll(ah, NULL, 0);
 }
 
-void ath5k_hw_set_bssid_mask(struct ath5k_hw *ah, const u8 *mask)
+/**
+ * ath5k_hw_set_bssid_mask() - Filter out bssids we listen
+ * @ah: The &struct ath5k_hw
+ * @mask: The BSSID mask to set (array of octets)
+ *
+ * BSSID masking is a method used by AR5212 and newer hardware to inform PCU
+ * which bits of the interface's MAC address should be looked at when trying
+ * to decide which packets to ACK. In station mode and AP mode with a single
+ * BSS every bit matters since we lock to only one BSS. In AP mode with
+ * multiple BSSes (virtual interfaces) not every bit matters because hw must
+ * accept frames for all BSSes and so we tweak some bits of our mac address
+ * in order to have multiple BSSes.
+ *
+ * For more information check out ../hw.c of the common ath module.
+ */
+void
+ath5k_hw_set_bssid_mask(struct ath5k_hw *ah, const u8 *mask)
 {
         struct ath_common *common = ath5k_hw_common(ah);
 
@@ -400,18 +452,21 @@ void ath5k_hw_set_bssid_mask(struct ath5k_hw *ah, const u8 *mask)
                 ath_hw_setbssidmask(common);
 }
 
-/*
- * Set multicast filter
+/**
+ * ath5k_hw_set_mcast_filter() - Set multicast filter
+ * @ah: The &struct ath5k_hw
+ * @filter0: Lower 32bits of muticast filter
+ * @filter1: Higher 16bits of multicast filter
  */
-void ath5k_hw_set_mcast_filter(struct ath5k_hw *ah, u32 filter0, u32 filter1)
+void
+ath5k_hw_set_mcast_filter(struct ath5k_hw *ah, u32 filter0, u32 filter1)
 {
         ath5k_hw_reg_write(ah, filter0, AR5K_MCAST_FILTER0);
         ath5k_hw_reg_write(ah, filter1, AR5K_MCAST_FILTER1);
 }
 
 /**
- * ath5k_hw_get_rx_filter - Get current rx filter
- *
+ * ath5k_hw_get_rx_filter() - Get current rx filter
  * @ah: The &struct ath5k_hw
  *
  * Returns the RX filter by reading rx filter and
@@ -420,7 +475,8 @@ void ath5k_hw_set_mcast_filter(struct ath5k_hw *ah, u32 filter0, u32 filter1)
  * and pass to the driver. For a list of frame types
  * check out reg.h.
  */
-u32 ath5k_hw_get_rx_filter(struct ath5k_hw *ah)
+u32
+ath5k_hw_get_rx_filter(struct ath5k_hw *ah)
 {
         u32 data, filter = 0;
 
@@ -440,8 +496,7 @@ u32 ath5k_hw_get_rx_filter(struct ath5k_hw *ah)
 }
 
 /**
- * ath5k_hw_set_rx_filter - Set rx filter
- *
+ * ath5k_hw_set_rx_filter() - Set rx filter
  * @ah: The &struct ath5k_hw
  * @filter: RX filter mask (see reg.h)
  *
@@ -449,7 +504,8 @@ u32 ath5k_hw_get_rx_filter(struct ath5k_hw *ah)
  * register on 5212 and newer chips so that we have proper PHY
  * error reporting.
  */
-void ath5k_hw_set_rx_filter(struct ath5k_hw *ah, u32 filter)
+void
+ath5k_hw_set_rx_filter(struct ath5k_hw *ah, u32 filter)
 {
         u32 data = 0;
 
@@ -493,13 +549,13 @@ void ath5k_hw_set_rx_filter(struct ath5k_hw *ah, u32 filter)
 #define ATH5K_MAX_TSF_READ 10
 
 /**
- * ath5k_hw_get_tsf64 - Get the full 64bit TSF
- *
+ * ath5k_hw_get_tsf64() - Get the full 64bit TSF
  * @ah: The &struct ath5k_hw
  *
  * Returns the current TSF
  */
-u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah)
+u64
+ath5k_hw_get_tsf64(struct ath5k_hw *ah)
 {
         u32 tsf_lower, tsf_upper1, tsf_upper2;
         int i;
@@ -536,28 +592,30 @@ u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah)
         return ((u64)tsf_upper1 << 32) | tsf_lower;
 }
 
+#undef ATH5K_MAX_TSF_READ
+
 /**
- * ath5k_hw_set_tsf64 - Set a new 64bit TSF
- *
+ * ath5k_hw_set_tsf64() - Set a new 64bit TSF
  * @ah: The &struct ath5k_hw
  * @tsf64: The new 64bit TSF
  *
  * Sets the new TSF
  */
-void ath5k_hw_set_tsf64(struct ath5k_hw *ah, u64 tsf64)
+void
+ath5k_hw_set_tsf64(struct ath5k_hw *ah, u64 tsf64)
 {
         ath5k_hw_reg_write(ah, tsf64 & 0xffffffff, AR5K_TSF_L32);
         ath5k_hw_reg_write(ah, (tsf64 >> 32) & 0xffffffff, AR5K_TSF_U32);
 }
 
 /**
- * ath5k_hw_reset_tsf - Force a TSF reset
- *
+ * ath5k_hw_reset_tsf() - Force a TSF reset
  * @ah: The &struct ath5k_hw
  *
  * Forces a TSF reset on PCU
  */
-void ath5k_hw_reset_tsf(struct ath5k_hw *ah)
+void
+ath5k_hw_reset_tsf(struct ath5k_hw *ah)
 {
         u32 val;
 
@@ -573,10 +631,17 @@ void ath5k_hw_reset_tsf(struct ath5k_hw *ah)
         ath5k_hw_reg_write(ah, val, AR5K_BEACON);
 }
 
-/*
- * Initialize beacon timers
+/**
+ * ath5k_hw_init_beacon_timers() - Initialize beacon timers
+ * @ah: The &struct ath5k_hw
+ * @next_beacon: Next TBTT
+ * @interval: Current beacon interval
+ *
+ * This function is used to initialize beacon timers based on current
+ * operation mode and settings.
  */
-void ath5k_hw_init_beacon(struct ath5k_hw *ah, u32 next_beacon, u32 interval)
+void
+ath5k_hw_init_beacon_timers(struct ath5k_hw *ah, u32 next_beacon, u32 interval)
 {
         u32 timer1, timer2, timer3;
 
@@ -655,8 +720,7 @@ void ath5k_hw_init_beacon(struct ath5k_hw *ah, u32 next_beacon, u32 interval)
 }
 
 /**
- * ath5k_check_timer_win - Check if timer B is timer A + window
- *
+ * ath5k_check_timer_win() - Check if timer B is timer A + window
  * @a: timer a (before b)
  * @b: timer b (after a)
  * @window: difference between a and b
@@ -686,12 +750,11 @@ ath5k_check_timer_win(int a, int b, int window, int intval)
 }
 
 /**
- * ath5k_hw_check_beacon_timers - Check if the beacon timers are correct
- *
+ * ath5k_hw_check_beacon_timers() - Check if the beacon timers are correct
  * @ah: The &struct ath5k_hw
  * @intval: beacon interval
  *
- * This is a workaround for IBSS mode:
+ * This is a workaround for IBSS mode
  *
  * The need for this function arises from the fact that we have 4 separate
  * HW timer registers (TIMER0 - TIMER3), which are closely related to the
@@ -746,14 +809,14 @@ ath5k_hw_check_beacon_timers(struct ath5k_hw *ah, int intval)
 }
 
 /**
- * ath5k_hw_set_coverage_class - Set IEEE 802.11 coverage class
- *
+ * ath5k_hw_set_coverage_class() - Set IEEE 802.11 coverage class
  * @ah: The &struct ath5k_hw
  * @coverage_class: IEEE 802.11 coverage class number
  *
  * Sets IFS intervals and ACK/CTS timeouts for given coverage class.
  */
-void ath5k_hw_set_coverage_class(struct ath5k_hw *ah, u8 coverage_class)
+void
+ath5k_hw_set_coverage_class(struct ath5k_hw *ah, u8 coverage_class)
 {
         /* As defined by IEEE 802.11-2007 17.3.8.6 */
         int slot_time = ath5k_hw_get_default_slottime(ah) + 3 * coverage_class;
@@ -772,8 +835,7 @@ void ath5k_hw_set_coverage_class(struct ath5k_hw *ah, u8 coverage_class)
 \***************************/
 
 /**
- * ath5k_hw_start_rx_pcu - Start RX engine
- *
+ * ath5k_hw_start_rx_pcu() - Start RX engine
  * @ah: The &struct ath5k_hw
  *
  * Starts RX engine on PCU so that hw can process RXed frames
@@ -781,32 +843,33 @@ void ath5k_hw_set_coverage_class(struct ath5k_hw *ah, u8 coverage_class)
  *
  * NOTE: RX DMA should be already enabled using ath5k_hw_start_rx_dma
  */
-void ath5k_hw_start_rx_pcu(struct ath5k_hw *ah)
+void
+ath5k_hw_start_rx_pcu(struct ath5k_hw *ah)
 {
         AR5K_REG_DISABLE_BITS(ah, AR5K_DIAG_SW, AR5K_DIAG_SW_DIS_RX);
 }
 
 /**
- * at5k_hw_stop_rx_pcu - Stop RX engine
- *
+ * at5k_hw_stop_rx_pcu() - Stop RX engine
  * @ah: The &struct ath5k_hw
  *
  * Stops RX engine on PCU
  */
-void ath5k_hw_stop_rx_pcu(struct ath5k_hw *ah)
+void
+ath5k_hw_stop_rx_pcu(struct ath5k_hw *ah)
 {
         AR5K_REG_ENABLE_BITS(ah, AR5K_DIAG_SW, AR5K_DIAG_SW_DIS_RX);
 }
 
 /**
- * ath5k_hw_set_opmode - Set PCU operating mode
- *
+ * ath5k_hw_set_opmode() - Set PCU operating mode
  * @ah: The &struct ath5k_hw
- * @op_mode: &enum nl80211_iftype operating mode
+ * @op_mode: One of enum nl80211_iftype
  *
  * Configure PCU for the various operating modes (AP/STA etc)
  */
-int ath5k_hw_set_opmode(struct ath5k_hw *ah, enum nl80211_iftype op_mode)
+int
+ath5k_hw_set_opmode(struct ath5k_hw *ah, enum nl80211_iftype op_mode)
 {
         struct ath_common *common = ath5k_hw_common(ah);
         u32 pcu_reg, beacon_reg, low_id, high_id;
@@ -873,8 +936,17 @@ int ath5k_hw_set_opmode(struct ath5k_hw *ah, enum nl80211_iftype op_mode)
         return 0;
 }
 
-void ath5k_hw_pcu_init(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
-                                                                u8 mode)
+/**
+ * ath5k_hw_pcu_init() - Initialize PCU
+ * @ah: The &struct ath5k_hw
+ * @op_mode: One of enum nl80211_iftype
+ * @mode: One of enum ath5k_driver_mode
+ *
+ * This function is used to initialize PCU by setting current
+ * operation mode and various other settings.
+ */
+void
+ath5k_hw_pcu_init(struct ath5k_hw *ah, enum nl80211_iftype op_mode)
 {
         /* Set bssid and bssid mask */
         ath5k_hw_set_bssid(ah);
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
index 01cb72de44cb..e1f8613426a9 100644
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@ -1,6 +1,4 @@
 /*
- * PHY functions
- *
  * Copyright (c) 2004-2007 Reyk Floeter <reyk@openbsd.org>
  * Copyright (c) 2006-2009 Nick Kossifidis <mickflemm@gmail.com>
  * Copyright (c) 2007-2008 Jiri Slaby <jirislaby@gmail.com>
@@ -20,6 +18,10 @@
  *
  */
 
+/***********************\
+* PHY related functions *
+\***********************/
+
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <asm/unaligned.h>
@@ -31,14 +33,53 @@
 #include "../regd.h"
 
 
+/**
+ * DOC: PHY related functions
+ *
+ * Here we handle the low-level functions related to baseband
+ * and analog frontend (RF) parts. This is by far the most complex
+ * part of the hw code so make sure you know what you are doing.
+ *
+ * Here is a list of what this is all about:
+ *
+ * - Channel setting/switching
+ *
+ * - Automatic Gain Control (AGC) calibration
+ *
+ * - Noise Floor calibration
+ *
+ * - I/Q imbalance calibration (QAM correction)
+ *
+ * - Calibration due to thermal changes (gain_F)
+ *
+ * - Spur noise mitigation
+ *
+ * - RF/PHY initialization for the various operating modes and bwmodes
+ *
+ * - Antenna control
+ *
+ * - TX power control per channel/rate/packet type
+ *
+ * Also have in mind we never got documentation for most of these
+ * functions, what we have comes mostly from Atheros's code, reverse
+ * engineering and patent docs/presentations etc.
+ */
+
+
 /******************\
 * Helper functions *
 \******************/
 
-/*
- * Get the PHY Chip revision
+/**
+ * ath5k_hw_radio_revision() - Get the PHY Chip revision
+ * @ah: The &struct ath5k_hw
+ * @band: One of enum ieee80211_band
+ *
+ * Returns the revision number of a 2GHz, 5GHz or single chip
+ * radio.
  */
-u16 ath5k_hw_radio_revision(struct ath5k_hw *ah, enum ieee80211_band band)
+u16
+ath5k_hw_radio_revision(struct ath5k_hw *ah, enum ieee80211_band band)
 {
         unsigned int i;
         u32 srev;
@@ -58,7 +99,7 @@ u16 ath5k_hw_radio_revision(struct ath5k_hw *ah, enum ieee80211_band band)
                 return 0;
         }
 
-        mdelay(2);
+        usleep_range(2000, 2500);
 
         /* ...wait until PHY is ready and read the selected radio revision */
         ath5k_hw_reg_write(ah, 0x00001c16, AR5K_PHY(0x34));
@@ -81,10 +122,16 @@ u16 ath5k_hw_radio_revision(struct ath5k_hw *ah, enum ieee80211_band band)
         return ret;
 }
 
-/*
- * Check if a channel is supported
+/**
+ * ath5k_channel_ok() - Check if a channel is supported by the hw
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
+ *
+ * Note: We don't do any regulatory domain checks here, it's just
+ * a sanity check.
  */
-bool ath5k_channel_ok(struct ath5k_hw *ah, struct ieee80211_channel *channel)
+bool
+ath5k_channel_ok(struct ath5k_hw *ah, struct ieee80211_channel *channel)
 {
         u16 freq = channel->center_freq;
 
@@ -101,7 +148,13 @@ bool ath5k_channel_ok(struct ath5k_hw *ah, struct ieee80211_channel *channel)
         return false;
 }
 
-bool ath5k_hw_chan_has_spur_noise(struct ath5k_hw *ah,
+/**
+ * ath5k_hw_chan_has_spur_noise() - Check if channel is sensitive to spur noise
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
+ */
+bool
+ath5k_hw_chan_has_spur_noise(struct ath5k_hw *ah,
                                 struct ieee80211_channel *channel)
 {
         u8 refclk_freq;
@@ -122,11 +175,20 @@ bool ath5k_hw_chan_has_spur_noise(struct ath5k_hw *ah,
                 return false;
 }
 
-/*
- * Used to modify RF Banks before writing them to AR5K_RF_BUFFER
+/**
+ * ath5k_hw_rfb_op() - Perform an operation on the given RF Buffer
+ * @ah: The &struct ath5k_hw
+ * @rf_regs: The struct ath5k_rf_reg
+ * @val: New value
+ * @reg_id: RF register ID
+ * @set: Indicate we need to swap data
+ *
+ * This is an internal function used to modify RF Banks before
+ * writing them to AR5K_RF_BUFFER. Check out rfbuffer.h for more
+ * infos.
  */
-static unsigned int ath5k_hw_rfb_op(struct ath5k_hw *ah,
-                                        const struct ath5k_rf_reg *rf_regs,
+static unsigned int
+ath5k_hw_rfb_op(struct ath5k_hw *ah, const struct ath5k_rf_reg *rf_regs,
                                         u32 val, u8 reg_id, bool set)
 {
         const struct ath5k_rf_reg *rfreg = NULL;
@@ -204,8 +266,7 @@ static unsigned int ath5k_hw_rfb_op(struct ath5k_hw *ah,
 }
 
 /**
- * ath5k_hw_write_ofdm_timings - set OFDM timings on AR5212
- *
+ * ath5k_hw_write_ofdm_timings() - set OFDM timings on AR5212
  * @ah: the &struct ath5k_hw
  * @channel: the currently set channel upon reset
  *
@@ -216,10 +277,11 @@ static unsigned int ath5k_hw_rfb_op(struct ath5k_hw *ah,
  * mantissa and provide these values on hw.
  *
  * For more infos i think this patent is related
- * http://www.freepatentsonline.com/7184495.html
+ * "http://www.freepatentsonline.com/7184495.html"
  */
-static inline int ath5k_hw_write_ofdm_timings(struct ath5k_hw *ah,
-        struct ieee80211_channel *channel)
+static inline int
+ath5k_hw_write_ofdm_timings(struct ath5k_hw *ah,
+                                struct ieee80211_channel *channel)
 {
         /* Get exponent and mantissa and set it */
         u32 coef_scaled, coef_exp, coef_man,
@@ -278,6 +340,10 @@ static inline int ath5k_hw_write_ofdm_timings(struct ath5k_hw *ah,
         return 0;
 }
 
+/**
+ * ath5k_hw_phy_disable() - Disable PHY
+ * @ah: The &struct ath5k_hw
+ */
 int ath5k_hw_phy_disable(struct ath5k_hw *ah)
 {
         /*Just a try M.F.*/
@@ -286,10 +352,13 @@ int ath5k_hw_phy_disable(struct ath5k_hw *ah)
         return 0;
 }
 
-/*
- * Wait for synth to settle
+/**
+ * ath5k_hw_wait_for_synth() - Wait for synth to settle
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
  */
-static void ath5k_hw_wait_for_synth(struct ath5k_hw *ah,
+static void
+ath5k_hw_wait_for_synth(struct ath5k_hw *ah,
                         struct ieee80211_channel *channel)
 {
         /*
@@ -308,9 +377,9 @@ static void ath5k_hw_wait_for_synth(struct ath5k_hw *ah,
                         delay = delay << 2;
                 /* XXX: /2 on turbo ? Let's be safe
                  * for now */
-                udelay(100 + delay);
+                usleep_range(100 + delay, 100 + (2 * delay));
         } else {
-                mdelay(1);
+                usleep_range(1000, 1500);
         }
 }
 
@@ -319,7 +388,9 @@ static void ath5k_hw_wait_for_synth(struct ath5k_hw *ah,
 * RF Gain optimization *
 \**********************/
 
-/*
+/**
+ * DOC: RF Gain optimization
+ *
  * This code is used to optimize RF gain on different environments
  * (temperature mostly) based on feedback from a power detector.
  *
@@ -328,22 +399,22 @@ static void ath5k_hw_wait_for_synth(struct ath5k_hw *ah,
  * no gain optimization ladder-.
  *
  * For more infos check out this patent doc
- * http://www.freepatentsonline.com/7400691.html
+ * "http://www.freepatentsonline.com/7400691.html"
  *
  * This paper describes power drops as seen on the receiver due to
  * probe packets
- * http://www.cnri.dit.ie/publications/ICT08%20-%20Practical%20Issues
- * %20of%20Power%20Control.pdf
+ * "http://www.cnri.dit.ie/publications/ICT08%20-%20Practical%20Issues
+ * %20of%20Power%20Control.pdf"
  *
  * And this is the MadWiFi bug entry related to the above
- * http://madwifi-project.org/ticket/1659
+ * "http://madwifi-project.org/ticket/1659"
  * with various measurements and diagrams
- *
- * TODO: Deal with power drops due to probes by setting an appropriate
- * tx power on the probe packets ! Make this part of the calibration process.
  */
 
-/* Initialize ah_gain during attach */
+/**
+ * ath5k_hw_rfgain_opt_init() - Initialize ah_gain during attach
+ * @ah: The &struct ath5k_hw
+ */
 int ath5k_hw_rfgain_opt_init(struct ath5k_hw *ah)
 {
         /* Initialize the gain optimization values */
@@ -367,17 +438,21 @@ int ath5k_hw_rfgain_opt_init(struct ath5k_hw *ah)
         return 0;
 }
 
-/* Schedule a gain probe check on the next transmitted packet.
+/**
+ * ath5k_hw_request_rfgain_probe() - Request a PAPD probe packet
+ * @ah: The &struct ath5k_hw
+ *
+ * Schedules a gain probe check on the next transmitted packet.
  * That means our next packet is going to be sent with lower
  * tx power and a Peak to Average Power Detector (PAPD) will try
  * to measure the gain.
  *
- * XXX:  How about forcing a tx packet (bypassing PCU arbitrator etc)
+ * TODO: Force a tx packet (bypassing PCU arbitrator etc)
  * just after we enable the probe so that we don't mess with
- * standard traffic ? Maybe it's time to use sw interrupts and
- * a probe tasklet !!!
+ * standard traffic.
  */
-static void ath5k_hw_request_rfgain_probe(struct ath5k_hw *ah)
+static void
+ath5k_hw_request_rfgain_probe(struct ath5k_hw *ah)
 {
 
         /* Skip if gain calibration is inactive or
@@ -395,9 +470,15 @@ static void ath5k_hw_request_rfgain_probe(struct ath5k_hw *ah)
 
 }
 
-/* Calculate gain_F measurement correction
- * based on the current step for RF5112 rev. 2 */
-static u32 ath5k_hw_rf_gainf_corr(struct ath5k_hw *ah)
+/**
+ * ath5k_hw_rf_gainf_corr() - Calculate Gain_F measurement correction
+ * @ah: The &struct ath5k_hw
+ *
+ * Calculate Gain_F measurement correction
+ * based on the current step for RF5112 rev. 2
+ */
+static u32
+ath5k_hw_rf_gainf_corr(struct ath5k_hw *ah)
 {
         u32 mix, step;
         u32 *rf;
@@ -450,11 +531,19 @@ static u32 ath5k_hw_rf_gainf_corr(struct ath5k_hw *ah)
         return ah->ah_gain.g_f_corr;
 }
 
-/* Check if current gain_F measurement is in the range of our
+/**
+ * ath5k_hw_rf_check_gainf_readback() - Validate Gain_F feedback from detector
+ * @ah: The &struct ath5k_hw
+ *
+ * Check if current gain_F measurement is in the range of our
  * power detector windows. If we get a measurement outside range
  * we know it's not accurate (detectors can't measure anything outside
- * their detection window) so we must ignore it */
-static bool ath5k_hw_rf_check_gainf_readback(struct ath5k_hw *ah)
+ * their detection window) so we must ignore it.
+ *
+ * Returns true if readback was O.K. or false on failure
+ */
+static bool
+ath5k_hw_rf_check_gainf_readback(struct ath5k_hw *ah)
 {
         const struct ath5k_rf_reg *rf_regs;
         u32 step, mix_ovr, level[4];
@@ -506,9 +595,15 @@ static bool ath5k_hw_rf_check_gainf_readback(struct ath5k_hw *ah)
                         ah->ah_gain.g_current <= level[3]);
 }
 
-/* Perform gain_F adjustment by choosing the right set
- * of parameters from RF gain optimization ladder */
-static s8 ath5k_hw_rf_gainf_adjust(struct ath5k_hw *ah)
+/**
+ * ath5k_hw_rf_gainf_adjust() - Perform Gain_F adjustment
+ * @ah: The &struct ath5k_hw
+ *
+ * Choose the right target gain based on current gain
+ * and RF gain optimization ladder
+ */
+static s8
+ath5k_hw_rf_gainf_adjust(struct ath5k_hw *ah)
 {
         const struct ath5k_gain_opt *go;
         const struct ath5k_gain_opt_step *g_step;
@@ -572,13 +667,18 @@ done:
         return ret;
 }
 
-/* Main callback for thermal RF gain calibration engine
+/**
+ * ath5k_hw_gainf_calibrate() - Do a gain_F calibration
+ * @ah: The &struct ath5k_hw
+ *
+ * Main callback for thermal RF gain calibration engine
  * Check for a new gain reading and schedule an adjustment
  * if needed.
  *
- * TODO: Use sw interrupt to schedule reset if gain_F needs
- * adjustment */
-enum ath5k_rfgain ath5k_hw_gainf_calibrate(struct ath5k_hw *ah)
+ * Returns one of enum ath5k_rfgain codes
+ */
+enum ath5k_rfgain
+ath5k_hw_gainf_calibrate(struct ath5k_hw *ah)
 {
         u32 data, type;
         struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
@@ -638,10 +738,18 @@ done:
         return ah->ah_gain.g_state;
 }
 
-/* Write initial RF gain table to set the RF sensitivity
- * this one works on all RF chips and has nothing to do
- * with gain_F calibration */
-static int ath5k_hw_rfgain_init(struct ath5k_hw *ah, enum ieee80211_band band)
+/**
+ * ath5k_hw_rfgain_init() - Write initial RF gain settings to hw
+ * @ah: The &struct ath5k_hw
+ * @band: One of enum ieee80211_band
+ *
+ * Write initial RF gain table to set the RF sensitivity.
+ *
+ * NOTE: This one works on all RF chips and has nothing to do
+ * with Gain_F calibration
+ */
+static int
+ath5k_hw_rfgain_init(struct ath5k_hw *ah, enum ieee80211_band band)
 {
         const struct ath5k_ini_rfgain *ath5k_rfg;
         unsigned int i, size, index;
@@ -688,16 +796,23 @@ static int ath5k_hw_rfgain_init(struct ath5k_hw *ah, enum ieee80211_band band)
 }
 
 
-
 /********************\
 * RF Registers setup *
 \********************/
 
-/*
- * Setup RF registers by writing RF buffer on hw
+/**
+ * ath5k_hw_rfregs_init() - Initialize RF register settings
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
+ * @mode: One of enum ath5k_driver_mode
+ *
+ * Setup RF registers by writing RF buffer on hw. For
+ * more infos on this, check out rfbuffer.h
  */
-static int ath5k_hw_rfregs_init(struct ath5k_hw *ah,
-        struct ieee80211_channel *channel, unsigned int mode)
+static int
+ath5k_hw_rfregs_init(struct ath5k_hw *ah,
+                        struct ieee80211_channel *channel,
+                        unsigned int mode)
 {
         const struct ath5k_rf_reg *rf_regs;
         const struct ath5k_ini_rfbuffer *ini_rfb;
@@ -1055,19 +1170,18 @@ static int ath5k_hw_rfregs_init(struct ath5k_hw *ah,
   PHY/RF channel functions
 \**************************/
 
-/*
- * Conversion needed for RF5110
+/**
+ * ath5k_hw_rf5110_chan2athchan() - Convert channel freq on RF5110
+ * @channel: The &struct ieee80211_channel
+ *
+ * Map channel frequency to IEEE channel number and convert it
+ * to an internal channel value used by the RF5110 chipset.
  */
-static u32 ath5k_hw_rf5110_chan2athchan(struct ieee80211_channel *channel)
+static u32
+ath5k_hw_rf5110_chan2athchan(struct ieee80211_channel *channel)
 {
         u32 athchan;
 
-        /*
-         * Convert IEEE channel/MHz to an internal channel value used
-         * by the AR5210 chipset. This has not been verified with
-         * newer chipsets like the AR5212A who have a completely
-         * different RF/PHY part.
-         */
         athchan = (ath5k_hw_bitswap(
                         (ieee80211_frequency_to_channel(
                                 channel->center_freq) - 24) / 2, 5)
@@ -1075,10 +1189,13 @@ static u32 ath5k_hw_rf5110_chan2athchan(struct ieee80211_channel *channel)
         return athchan;
 }
 
-/*
- * Set channel on RF5110
+/**
+ * ath5k_hw_rf5110_channel() - Set channel frequency on RF5110
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
  */
-static int ath5k_hw_rf5110_channel(struct ath5k_hw *ah,
+static int
+ath5k_hw_rf5110_channel(struct ath5k_hw *ah,
                 struct ieee80211_channel *channel)
 {
         u32 data;
@@ -1089,15 +1206,23 @@ static int ath5k_hw_rf5110_channel(struct ath5k_hw *ah,
         data = ath5k_hw_rf5110_chan2athchan(channel);
         ath5k_hw_reg_write(ah, data, AR5K_RF_BUFFER);
         ath5k_hw_reg_write(ah, 0, AR5K_RF_BUFFER_CONTROL_0);
-        mdelay(1);
+        usleep_range(1000, 1500);
 
         return 0;
 }
 
-/*
- * Conversion needed for 5111
+/**
+ * ath5k_hw_rf5111_chan2athchan() - Handle 2GHz channels on RF5111/2111
+ * @ieee: IEEE channel number
+ * @athchan: The &struct ath5k_athchan_2ghz
+ *
+ * In order to enable the RF2111 frequency converter on RF5111/2111 setups
+ * we need to add some offsets and extra flags to the data values we pass
+ * on to the PHY. So for every 2GHz channel this function gets called
+ * to do the conversion.
  */
-static int ath5k_hw_rf5111_chan2athchan(unsigned int ieee,
+static int
+ath5k_hw_rf5111_chan2athchan(unsigned int ieee,
                 struct ath5k_athchan_2ghz *athchan)
 {
         int channel;
@@ -1123,10 +1248,13 @@ static int ath5k_hw_rf5111_chan2athchan(unsigned int ieee,
         return 0;
 }
 
-/*
- * Set channel on 5111
+/**
+ * ath5k_hw_rf5111_channel() - Set channel frequency on RF5111/2111
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
  */
-static int ath5k_hw_rf5111_channel(struct ath5k_hw *ah,
+static int
+ath5k_hw_rf5111_channel(struct ath5k_hw *ah,
                 struct ieee80211_channel *channel)
 {
         struct ath5k_athchan_2ghz ath5k_channel_2ghz;
@@ -1171,10 +1299,20 @@ static int ath5k_hw_rf5111_channel(struct ath5k_hw *ah,
         return 0;
 }
 
-/*
- * Set channel on 5112 and newer
+/**
+ * ath5k_hw_rf5112_channel() - Set channel frequency on 5112 and newer
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
+ *
+ * On RF5112/2112 and newer we don't need to do any conversion.
+ * We pass the frequency value after a few modifications to the
+ * chip directly.
+ *
+ * NOTE: Make sure channel frequency given is within our range or else
+ * we might damage the chip ! Use ath5k_channel_ok before calling this one.
  */
-static int ath5k_hw_rf5112_channel(struct ath5k_hw *ah,
+static int
+ath5k_hw_rf5112_channel(struct ath5k_hw *ah,
                 struct ieee80211_channel *channel)
 {
         u32 data, data0, data1, data2;
@@ -1183,17 +1321,37 @@ static int ath5k_hw_rf5112_channel(struct ath5k_hw *ah,
         data = data0 = data1 = data2 = 0;
         c = channel->center_freq;
 
+        /* My guess based on code:
+         * 2GHz RF has 2 synth modes, one with a Local Oscillator
+         * at 2224Hz and one with a LO at 2192Hz. IF is 1520Hz
+         * (3040/2). data0 is used to set the PLL divider and data1
+         * selects synth mode. */
         if (c < 4800) {
+                /* Channel 14 and all frequencies with 2Hz spacing
+                 * below/above (non-standard channels) */
                 if (!((c - 2224) % 5)) {
+                        /* Same as (c - 2224) / 5 */
                         data0 = ((2 * (c - 704)) - 3040) / 10;
                         data1 = 1;
+                /* Channel 1 and all frequencies with 5Hz spacing
+                 * below/above (standard channels without channel 14) */
                 } else if (!((c - 2192) % 5)) {
+                        /* Same as (c - 2192) / 5 */
                         data0 = ((2 * (c - 672)) - 3040) / 10;
                         data1 = 0;
                 } else
                         return -EINVAL;
 
                 data0 = ath5k_hw_bitswap((data0 << 2) & 0xff, 8);
+        /* This is more complex, we have a single synthesizer with
+         * 4 reference clock settings (?) based on frequency spacing
+         * and set using data2. LO is at 4800Hz and data0 is again used
+         * to set some divider.
+         *
+         * NOTE: There is an old atheros presentation at Stanford
+         * that mentions a method called dual direct conversion
+         * with 1GHz sliding IF for RF5110. Maybe that's what we
+         * have here, or an updated version. */
         } else if ((c % 5) != 2 || c > 5435) {
                 if (!(c % 20) && c >= 5120) {
                         data0 = ath5k_hw_bitswap(((c - 4800) / 20 << 2), 8);
@@ -1219,10 +1377,16 @@ static int ath5k_hw_rf5112_channel(struct ath5k_hw *ah,
         return 0;
 }
 
-/*
- * Set the channel on the RF2425
+/**
+ * ath5k_hw_rf2425_channel() - Set channel frequency on RF2425
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
+ *
+ * AR2425/2417 have a different 2GHz RF so code changes
+ * a little bit from RF5112.
  */
-static int ath5k_hw_rf2425_channel(struct ath5k_hw *ah,
+static int
+ath5k_hw_rf2425_channel(struct ath5k_hw *ah,
                 struct ieee80211_channel *channel)
 {
         u32 data, data0, data2;
@@ -1258,10 +1422,16 @@ static int ath5k_hw_rf2425_channel(struct ath5k_hw *ah,
         return 0;
 }
 
-/*
- * Set a channel on the radio chip
+/**
+ * ath5k_hw_channel() - Set a channel on the radio chip
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
+ *
+ * This is the main function called to set a channel on the
+ * radio chip based on the radio chip version.
  */
-static int ath5k_hw_channel(struct ath5k_hw *ah,
+static int
+ath5k_hw_channel(struct ath5k_hw *ah,
                 struct ieee80211_channel *channel)
 {
         int ret;
@@ -1313,11 +1483,46 @@ static int ath5k_hw_channel(struct ath5k_hw *ah,
         return 0;
 }
 
+
 /*****************\
   PHY calibration
 \*****************/
 
-static s32 ath5k_hw_read_measured_noise_floor(struct ath5k_hw *ah)
+/**
+ * DOC: PHY Calibration routines
+ *
+ * Noise floor calibration: When we tell the hardware to
+ * perform a noise floor calibration by setting the
+ * AR5K_PHY_AGCCTL_NF bit on AR5K_PHY_AGCCTL, it will periodically
+ * sample-and-hold the minimum noise level seen at the antennas.
+ * This value is then stored in a ring buffer of recently measured
+ * noise floor values so we have a moving window of the last few
+ * samples. The median of the values in the history is then loaded
+ * into the hardware for its own use for RSSI and CCA measurements.
+ * This type of calibration doesn't interfere with traffic.
+ *
+ * AGC calibration: When we tell the hardware to perform
+ * an AGC (Automatic Gain Control) calibration by setting the
+ * AR5K_PHY_AGCCTL_CAL, hw disconnects the antennas and does
+ * a calibration on the DC offsets of ADCs. During this period
+ * rx/tx gets disabled so we have to deal with it on the driver
+ * part.
+ *
+ * I/Q calibration: When we tell the hardware to perform
+ * an I/Q calibration, it tries to correct I/Q imbalance and
+ * fix QAM constellation by sampling data from rxed frames.
+ * It doesn't interfere with traffic.
+ *
+ * For more infos on AGC and I/Q calibration check out patent doc
+ * #03/094463.
+ */
+
+/**
+ * ath5k_hw_read_measured_noise_floor() - Read measured NF from hw
+ * @ah: The &struct ath5k_hw
+ */
+static s32
+ath5k_hw_read_measured_noise_floor(struct ath5k_hw *ah)
 {
         s32 val;
 
@@ -1325,7 +1530,12 @@ static s32 ath5k_hw_read_measured_noise_floor(struct ath5k_hw *ah)
         return sign_extend32(AR5K_REG_MS(val, AR5K_PHY_NF_MINCCA_PWR), 8);
 }
 
-void ath5k_hw_init_nfcal_hist(struct ath5k_hw *ah)
+/**
+ * ath5k_hw_init_nfcal_hist() - Initialize NF calibration history buffer
+ * @ah: The &struct ath5k_hw
+ */
+void
+ath5k_hw_init_nfcal_hist(struct ath5k_hw *ah)
 {
         int i;
 
@@ -1334,6 +1544,11 @@ void ath5k_hw_init_nfcal_hist(struct ath5k_hw *ah)
                 ah->ah_nfcal_hist.nfval[i] = AR5K_TUNE_CCA_MAX_GOOD_VALUE;
 }
 
+/**
+ * ath5k_hw_update_nfcal_hist() - Update NF calibration history buffer
+ * @ah: The &struct ath5k_hw
+ * @noise_floor: The NF we got from hw
+ */
 static void ath5k_hw_update_nfcal_hist(struct ath5k_hw *ah, s16 noise_floor)
 {
         struct ath5k_nfcal_hist *hist = &ah->ah_nfcal_hist;
@@ -1341,7 +1556,12 @@ static void ath5k_hw_update_nfcal_hist(struct ath5k_hw *ah, s16 noise_floor)
         hist->nfval[hist->index] = noise_floor;
 }
 
-static s16 ath5k_hw_get_median_noise_floor(struct ath5k_hw *ah)
+/**
+ * ath5k_hw_get_median_noise_floor() - Get median NF from history buffer
+ * @ah: The &struct ath5k_hw
+ */
+static s16
+ath5k_hw_get_median_noise_floor(struct ath5k_hw *ah)
 {
         s16 sort[ATH5K_NF_CAL_HIST_MAX];
         s16 tmp;
@@ -1364,18 +1584,16 @@ static s16 ath5k_hw_get_median_noise_floor(struct ath5k_hw *ah)
         return sort[(ATH5K_NF_CAL_HIST_MAX - 1) / 2];
 }
 
-/*
- * When we tell the hardware to perform a noise floor calibration
- * by setting the AR5K_PHY_AGCCTL_NF bit, it will periodically
- * sample-and-hold the minimum noise level seen at the antennas.
- * This value is then stored in a ring buffer of recently measured
- * noise floor values so we have a moving window of the last few
- * samples.
+/**
+ * ath5k_hw_update_noise_floor() - Update NF on hardware
+ * @ah: The &struct ath5k_hw
  *
- * The median of the values in the history is then loaded into the
- * hardware for its own use for RSSI and CCA measurements.
+ * This is the main function we call to perform a NF calibration,
+ * it reads NF from hardware, calculates the median and updates
+ * NF on hw.
  */
-void ath5k_hw_update_noise_floor(struct ath5k_hw *ah)
+void
+ath5k_hw_update_noise_floor(struct ath5k_hw *ah)
 {
         struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
         u32 val;
@@ -1390,6 +1608,8 @@ void ath5k_hw_update_noise_floor(struct ath5k_hw *ah)
                 return;
         }
 
+        ah->ah_cal_mask |= AR5K_CALIBRATION_NF;
+
         ee_mode = ath5k_eeprom_mode_from_channel(ah->ah_current_channel);
 
         /* completed NF calibration, test threshold */
@@ -1434,20 +1654,29 @@ void ath5k_hw_update_noise_floor(struct ath5k_hw *ah)
 
         ah->ah_noise_floor = nf;
 
+        ah->ah_cal_mask &= ~AR5K_CALIBRATION_NF;
+
         ATH5K_DBG(ah, ATH5K_DEBUG_CALIBRATE,
                 "noise floor calibrated: %d\n", nf);
 }
 
-/*
- * Perform a PHY calibration on RF5110
- * -Fix BPSK/QAM Constellation (I/Q correction)
+/**
+ * ath5k_hw_rf5110_calibrate() - Perform a PHY calibration on RF5110
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
+ *
+ * Do a complete PHY calibration (AGC + NF + I/Q) on RF5110
  */
-static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,
+static int
+ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,
                 struct ieee80211_channel *channel)
 {
         u32 phy_sig, phy_agc, phy_sat, beacon;
         int ret;
 
+        if (!(ah->ah_cal_mask & AR5K_CALIBRATION_FULL))
+                return 0;
+
         /*
          * Disable beacons and RX/TX queues, wait
          */
@@ -1456,7 +1685,7 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,
         beacon = ath5k_hw_reg_read(ah, AR5K_BEACON_5210);
         ath5k_hw_reg_write(ah, beacon & ~AR5K_BEACON_ENABLE, AR5K_BEACON_5210);
 
-        mdelay(2);
+        usleep_range(2000, 2500);
 
         /*
          * Set the channel (with AGC turned off)
@@ -1469,7 +1698,7 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,
          * Activate PHY and wait
          */
         ath5k_hw_reg_write(ah, AR5K_PHY_ACT_ENABLE, AR5K_PHY_ACT);
-        mdelay(1);
+        usleep_range(1000, 1500);
 
         AR5K_REG_DISABLE_BITS(ah, AR5K_PHY_AGC, AR5K_PHY_AGC_DISABLE);
 
@@ -1506,7 +1735,7 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,
         ath5k_hw_reg_write(ah, AR5K_PHY_RFSTG_DISABLE, AR5K_PHY_RFSTG);
         AR5K_REG_DISABLE_BITS(ah, AR5K_PHY_AGC, AR5K_PHY_AGC_DISABLE);
 
-        mdelay(1);
+        usleep_range(1000, 1500);
 
         /*
          * Enable calibration and wait until completion
@@ -1537,8 +1766,9 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,
         return 0;
 }
 
-/*
- * Perform I/Q calibration on RF5111/5112 and newer chips
+/**
+ * ath5k_hw_rf511x_iq_calibrate() - Perform I/Q calibration on RF5111 and newer
+ * @ah: The &struct ath5k_hw
  */
 static int
 ath5k_hw_rf511x_iq_calibrate(struct ath5k_hw *ah)
@@ -1547,12 +1777,19 @@ ath5k_hw_rf511x_iq_calibrate(struct ath5k_hw *ah)
         s32 iq_corr, i_coff, i_coffd, q_coff, q_coffd;
         int i;
 
-        if (!ah->ah_calibration ||
-                ath5k_hw_reg_read(ah, AR5K_PHY_IQ) & AR5K_PHY_IQ_RUN)
-                return 0;
+        /* Skip if I/Q calibration is not needed or if it's still running */
+        if (!ah->ah_iq_cal_needed)
+                return -EINVAL;
+        else if (ath5k_hw_reg_read(ah, AR5K_PHY_IQ) & AR5K_PHY_IQ_RUN) {
+                ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_CALIBRATE,
+                                "I/Q calibration still running");
+                return -EBUSY;
+        }
 
         /* Calibration has finished, get the results and re-run */
-        /* work around empty results which can apparently happen on 5212 */
+
+        /* Work around for empty results which can apparently happen on 5212:
+         * Read registers up to 10 times until we get both i_pr and q_pwr */
         for (i = 0; i <= 10; i++) {
                 iq_corr = ath5k_hw_reg_read(ah, AR5K_PHY_IQRES_CAL_CORR);
                 i_pwr = ath5k_hw_reg_read(ah, AR5K_PHY_IQRES_CAL_PWR_I);
@@ -1570,9 +1807,13 @@ ath5k_hw_rf511x_iq_calibrate(struct ath5k_hw *ah)
         else
                 q_coffd = q_pwr >> 7;
 
-        /* protect against divide by 0 and loss of sign bits */
+        /* In case i_coffd became zero, cancel calibration
+         * not only it's too small, it'll also result a divide
+         * by zero later on. */
         if (i_coffd == 0 || q_coffd < 2)
-                return 0;
+                return -ECANCELED;
+
+        /* Protect against loss of sign bits */
 
         i_coff = (-iq_corr) / i_coffd;
         i_coff = clamp(i_coff, -32, 31); /* signed 6 bit */
@@ -1601,10 +1842,17 @@ ath5k_hw_rf511x_iq_calibrate(struct ath5k_hw *ah)
         return 0;
 }
 
-/*
- * Perform a PHY calibration
+/**
+ * ath5k_hw_phy_calibrate() - Perform a PHY calibration
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
+ *
+ * The main function we call from above to perform
+ * a short or full PHY calibration based on RF chip
+ * and current channel
  */
-int ath5k_hw_phy_calibrate(struct ath5k_hw *ah,
+int
+ath5k_hw_phy_calibrate(struct ath5k_hw *ah,
                 struct ieee80211_channel *channel)
 {
         int ret;
@@ -1613,10 +1861,43 @@ int ath5k_hw_phy_calibrate(struct ath5k_hw *ah,
                 return ath5k_hw_rf5110_calibrate(ah, channel);
 
         ret = ath5k_hw_rf511x_iq_calibrate(ah);
+        if (ret) {
+                ATH5K_DBG_UNLIMIT(ah, ATH5K_DEBUG_CALIBRATE,
+                        "No I/Q correction performed (%uMHz)\n",
+                        channel->center_freq);
+
+                /* Happens all the time if there is not much
+                 * traffic, consider it normal behaviour. */
+                ret = 0;
+        }
+
+        /* On full calibration do an AGC calibration and
+         * request a PAPD probe for gainf calibration if
+         * needed */
+        if (ah->ah_cal_mask & AR5K_CALIBRATION_FULL) {
 
-        if ((ah->ah_radio == AR5K_RF5111 || ah->ah_radio == AR5K_RF5112) &&
-            (channel->hw_value != AR5K_MODE_11B))
-                ath5k_hw_request_rfgain_probe(ah);
+                AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_AGCCTL,
+                                        AR5K_PHY_AGCCTL_CAL);
+
+                ret = ath5k_hw_register_timeout(ah, AR5K_PHY_AGCCTL,
+                        AR5K_PHY_AGCCTL_CAL | AR5K_PHY_AGCCTL_NF,
+                        0, false);
+                if (ret) {
+                        ATH5K_ERR(ah,
+                                "gain calibration timeout (%uMHz)\n",
+                                channel->center_freq);
+                }
+
+                if ((ah->ah_radio == AR5K_RF5111 ||
+                        ah->ah_radio == AR5K_RF5112)
+                        && (channel->hw_value != AR5K_MODE_11B))
+                        ath5k_hw_request_rfgain_probe(ah);
+        }
+
+        /* Update noise floor
+         * XXX: Only do this after AGC calibration */
+        if (!(ah->ah_cal_mask & AR5K_CALIBRATION_NF))
+                ath5k_hw_update_noise_floor(ah);
 
         return ret;
 }
@@ -1626,6 +1907,16 @@ int ath5k_hw_phy_calibrate(struct ath5k_hw *ah,
 * Spur mitigation functions *
 \***************************/
 
+/**
+ * ath5k_hw_set_spur_mitigation_filter() - Configure SPUR filter
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
+ *
+ * This function gets called during PHY initialization to
+ * configure the spur filter for the given channel. Spur is noise
+ * generated due to "reflection" effects, for more information on this
+ * method check out patent US7643810
+ */
 static void
 ath5k_hw_set_spur_mitigation_filter(struct ath5k_hw *ah,
                                 struct ieee80211_channel *channel)
@@ -1865,15 +2156,73 @@ ath5k_hw_set_spur_mitigation_filter(struct ath5k_hw *ah,
 * Antenna control *
 \*****************/
 
-static void /*TODO:Boundary check*/
+/**
+ * DOC: Antenna control
+ *
+ * Hw supports up to 14 antennas ! I haven't found any card that implements
+ * that. The maximum number of antennas I've seen is up to 4 (2 for 2GHz and 2
+ * for 5GHz). Antenna 1 (MAIN) should be omnidirectional, 2 (AUX)
+ * omnidirectional or sectorial and antennas 3-14 sectorial (or directional).
+ *
+ * We can have a single antenna for RX and multiple antennas for TX.
+ * RX antenna is our "default" antenna (usually antenna 1) set on
+ * DEFAULT_ANTENNA register and TX antenna is set on each TX control descriptor
+ * (0 for automatic selection, 1 - 14 antenna number).
+ *
+ * We can let hw do all the work doing fast antenna diversity for both
+ * tx and rx or we can do things manually. Here are the options we have
+ * (all are bits of STA_ID1 register):
+ *
+ * AR5K_STA_ID1_DEFAULT_ANTENNA -> When 0 is set as the TX antenna on TX
+ * control descriptor, use the default antenna to transmit or else use the last
+ * antenna on which we received an ACK.
+ *
+ * AR5K_STA_ID1_DESC_ANTENNA -> Update default antenna after each TX frame to
+ * the antenna on which we got the ACK for that frame.
+ *
+ * AR5K_STA_ID1_RTS_DEF_ANTENNA -> Use default antenna for RTS or else use the
+ * one on the TX descriptor.
+ *
+ * AR5K_STA_ID1_SELFGEN_DEF_ANT -> Use default antenna for self generated frames
+ * (ACKs etc), or else use current antenna (the one we just used for TX).
+ *
+ * Using the above we support the following scenarios:
+ *
+ * AR5K_ANTMODE_DEFAULT -> Hw handles antenna diversity etc automatically
+ *
+ * AR5K_ANTMODE_FIXED_A -> Only antenna A (MAIN) is present
+ *
+ * AR5K_ANTMODE_FIXED_B -> Only antenna B (AUX) is present
+ *
+ * AR5K_ANTMODE_SINGLE_AP -> Sta locked on a single ap
+ *
+ * AR5K_ANTMODE_SECTOR_AP -> AP with tx antenna set on tx desc
+ *
+ * AR5K_ANTMODE_SECTOR_STA -> STA with tx antenna set on tx desc
+ *
+ * AR5K_ANTMODE_DEBUG Debug mode -A -> Rx, B-> Tx-
+ *
+ * Also note that when setting antenna to F on tx descriptor card inverts
+ * current tx antenna.
+ */
+
+/**
+ * ath5k_hw_set_def_antenna() - Set default rx antenna on AR5211/5212 and newer
+ * @ah: The &struct ath5k_hw
+ * @ant: Antenna number
+ */
+static void
 ath5k_hw_set_def_antenna(struct ath5k_hw *ah, u8 ant)
 {
         if (ah->ah_version != AR5K_AR5210)
                 ath5k_hw_reg_write(ah, ant & 0x7, AR5K_DEFAULT_ANTENNA);
 }
 
-/*
- * Enable/disable fast rx antenna diversity
+/**
+ * ath5k_hw_set_fast_div() -  Enable/disable fast rx antenna diversity
+ * @ah: The &struct ath5k_hw
+ * @ee_mode: One of enum ath5k_driver_mode
+ * @enable: True to enable, false to disable
  */
 static void
 ath5k_hw_set_fast_div(struct ath5k_hw *ah, u8 ee_mode, bool enable)
@@ -1913,6 +2262,14 @@ ath5k_hw_set_fast_div(struct ath5k_hw *ah, u8 ee_mode, bool enable)
         }
 }
 
+/**
+ * ath5k_hw_set_antenna_switch() - Set up antenna switch table
+ * @ah: The &struct ath5k_hw
+ * @ee_mode: One of enum ath5k_driver_mode
+ *
+ * Switch table comes from EEPROM and includes information on controlling
+ * the 2 antenna RX attenuators
+ */
 void
 ath5k_hw_set_antenna_switch(struct ath5k_hw *ah, u8 ee_mode)
 {
@@ -1944,8 +2301,10 @@ ath5k_hw_set_antenna_switch(struct ath5k_hw *ah, u8 ee_mode)
                 AR5K_PHY_ANT_SWITCH_TABLE_1);
 }
 
-/*
- * Set antenna operating mode
+/**
+ * ath5k_hw_set_antenna_mode() -  Set antenna operating mode
+ * @ah: The &struct ath5k_hw
+ * @ant_mode: One of enum ath5k_ant_mode
  */
 void
 ath5k_hw_set_antenna_mode(struct ath5k_hw *ah, u8 ant_mode)
@@ -2068,8 +2427,13 @@ ath5k_hw_set_antenna_mode(struct ath5k_hw *ah, u8 ant_mode)
  * Helper functions
  */
 
-/*
- * Do linear interpolation between two given (x, y) points
+/**
+ * ath5k_get_interpolated_value() - Get interpolated Y val between two points
+ * @target: X value of the middle point
+ * @x_left: X value of the left point
+ * @x_right: X value of the right point
+ * @y_left: Y value of the left point
+ * @y_right: Y value of the right point
  */
 static s16
 ath5k_get_interpolated_value(s16 target, s16 x_left, s16 x_right,
@@ -2096,13 +2460,18 @@ ath5k_get_interpolated_value(s16 target, s16 x_left, s16 x_right,
         return result;
 }
 
-/*
- * Find vertical boundary (min pwr) for the linear PCDAC curve.
+/**
+ * ath5k_get_linear_pcdac_min() - Find vertical boundary (min pwr) for the
+ * linear PCDAC curve
+ * @stepL: Left array with y values (pcdac steps)
+ * @stepR: Right array with y values (pcdac steps)
+ * @pwrL: Left array with x values (power steps)
+ * @pwrR: Right array with x values (power steps)
  *
  * Since we have the top of the curve and we draw the line below
  * until we reach 1 (1 pcdac step) we need to know which point
- * (x value) that is so that we don't go below y axis and have negative
- * pcdac values when creating the curve, or fill the table with zeroes.
+ * (x value) that is so that we don't go below x axis and have negative
+ * pcdac values when creating the curve, or fill the table with zeros.
  */
 static s16
 ath5k_get_linear_pcdac_min(const u8 *stepL, const u8 *stepR,
@@ -2148,7 +2517,16 @@ ath5k_get_linear_pcdac_min(const u8 *stepL, const u8 *stepR,
         return max(min_pwrL, min_pwrR);
 }
 
-/*
+/**
+ * ath5k_create_power_curve() - Create a Power to PDADC or PCDAC curve
+ * @pmin: Minimum power value (xmin)
+ * @pmax: Maximum power value (xmax)
+ * @pwr: Array of power steps (x values)
+ * @vpd: Array of matching PCDAC/PDADC steps (y values)
+ * @num_points: Number of provided points
+ * @vpd_table: Array to fill with the full PCDAC/PDADC values (y values)
+ * @type: One of enum ath5k_powertable_type (eeprom.h)
+ *
  * Interpolate (pwr,vpd) points to create a Power to PDADC or a
  * Power to PCDAC curve.
  *
@@ -2206,7 +2584,14 @@ ath5k_create_power_curve(s16 pmin, s16 pmax,
         }
 }
 
-/*
+/**
+ * ath5k_get_chan_pcal_surrounding_piers() - Get surrounding calibration piers
+ * for a given channel.
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
+ * @pcinfo_l: The &struct ath5k_chan_pcal_info to put the left cal. pier
+ * @pcinfo_r: The &struct ath5k_chan_pcal_info to put the right cal. pier
+ *
  * Get the surrounding per-channel power calibration piers
  * for a given frequency so that we can interpolate between
  * them and come up with an appropriate dataset for our current
@@ -2289,11 +2674,17 @@ done:
         *pcinfo_r = &pcinfo[idx_r];
 }
 
-/*
+/**
+ * ath5k_get_rate_pcal_data() - Get the interpolated per-rate power
+ * calibration data
+ * @ah: The &struct ath5k_hw *ah,
+ * @channel: The &struct ieee80211_channel
+ * @rates: The &struct ath5k_rate_pcal_info to fill
+ *
  * Get the surrounding per-rate power calibration data
  * for a given frequency and interpolate between power
  * values to set max target power supported by hw for
- * each rate.
+ * each rate on this frequency.
  */
 static void
 ath5k_get_rate_pcal_data(struct ath5k_hw *ah,
@@ -2381,7 +2772,11 @@ done:
                                         rpinfo[idx_r].target_power_54);
 }
 
-/*
+/**
+ * ath5k_get_max_ctl_power() - Get max edge power for a given frequency
+ * @ah: the &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
+ *
  * Get the max edge power for this channel if
  * we have such data from EEPROM's Conformance Test
  * Limits (CTL), and limit max power if needed.
@@ -2461,8 +2856,39 @@ ath5k_get_max_ctl_power(struct ath5k_hw *ah,
  * Power to PCDAC table functions
  */
 
-/*
- * Fill Power to PCDAC table on RF5111
+/**
+ * DOC: Power to PCDAC table functions
+ *
+ * For RF5111 we have an XPD -eXternal Power Detector- curve
+ * for each calibrated channel. Each curve has 0,5dB Power steps
+ * on x axis and PCDAC steps (offsets) on y axis and looks like an
+ * exponential function. To recreate the curve we read 11 points
+ * from eeprom (eeprom.c) and interpolate here.
+ *
+ * For RF5112 we have 4 XPD -eXternal Power Detector- curves
+ * for each calibrated channel on 0, -6, -12 and -18dBm but we only
+ * use the higher (3) and the lower (0) curves. Each curve again has 0.5dB
+ * power steps on x axis and PCDAC steps on y axis and looks like a
+ * linear function. To recreate the curve and pass the power values
+ * on hw, we get 4 points for xpd 0 (lower gain -> max power)
+ * and 3 points for xpd 3 (higher gain -> lower power) from eeprom (eeprom.c)
+ * and interpolate here.
+ *
+ * For a given channel we get the calibrated points (piers) for it or
+ * -if we don't have calibration data for this specific channel- from the
+ * available surrounding channels we have calibration data for, after we do a
+ * linear interpolation between them. Then since we have our calibrated points
+ * for this channel, we do again a linear interpolation between them to get the
+ * whole curve.
+ *
+ * We finally write the Y values of the curve(s) (the PCDAC values) on hw
+ */
+
+/**
+ * ath5k_fill_pwr_to_pcdac_table() - Fill Power to PCDAC table on RF5111
+ * @ah: The &struct ath5k_hw
+ * @table_min: Minimum power (x min)
+ * @table_max: Maximum power (x max)
  *
  * No further processing is needed for RF5111, the only thing we have to
  * do is fill the values below and above calibration range since eeprom data
@@ -2503,10 +2929,14 @@ ath5k_fill_pwr_to_pcdac_table(struct ath5k_hw *ah, s16* table_min,
 
 }
 
-/*
- * Combine available XPD Curves and fill Linear Power to PCDAC table
- * on RF5112
+/**
+ * ath5k_combine_linear_pcdac_curves() - Combine available PCDAC Curves
+ * @ah: The &struct ath5k_hw
+ * @table_min: Minimum power (x min)
+ * @table_max: Maximum power (x max)
+ * @pdcurves: Number of pd curves
  *
+ * Combine available XPD Curves and fill Linear Power to PCDAC table on RF5112
  * RFX112 can have up to 2 curves (one for low txpower range and one for
  * higher txpower range). We need to put them both on pcdac_out and place
  * them in the correct location. In case we only have one curve available
@@ -2608,7 +3038,10 @@ ath5k_combine_linear_pcdac_curves(struct ath5k_hw *ah, s16* table_min,
         }
 }
 
-/* Write PCDAC values on hw */
+/**
+ * ath5k_write_pcdac_table() - Write the PCDAC values on hw
+ * @ah: The &struct ath5k_hw
+ */
 static void
 ath5k_write_pcdac_table(struct ath5k_hw *ah)
 {
@@ -2631,9 +3064,32 @@ ath5k_write_pcdac_table(struct ath5k_hw *ah)
  * Power to PDADC table functions
  */
 
-/*
- * Set the gain boundaries and create final Power to PDADC table
+/**
+ * DOC: Power to PDADC table functions
+ *
+ * For RF2413 and later we have a Power to PDADC table (Power Detector)
+ * instead of a PCDAC (Power Control) and 4 pd gain curves for each
+ * calibrated channel. Each curve has power on x axis in 0.5 db steps and
+ * PDADC steps on y axis and looks like an exponential function like the
+ * RF5111 curve.
+ *
+ * To recreate the curves we read the points from eeprom (eeprom.c)
+ * and interpolate here. Note that in most cases only 2 (higher and lower)
+ * curves are used (like RF5112) but vendors have the opportunity to include
+ * all 4 curves on eeprom. The final curve (higher power) has an extra
+ * point for better accuracy like RF5112.
  *
+ * The process is similar to what we do above for RF5111/5112
+ */
+
+/**
+ * ath5k_combine_pwr_to_pdadc_curves() - Combine the various PDADC curves
+ * @ah: The &struct ath5k_hw
+ * @pwr_min: Minimum power (x min)
+ * @pwr_max: Maximum power (x max)
+ * @pdcurves: Number of available curves
+ *
+ * Combine the various pd curves and create the final Power to PDADC table
  * We can have up to 4 pd curves, we need to do a similar process
  * as we do for RF5112. This time we don't have an edge_flag but we
  * set the gain boundaries on a separate register.
@@ -2757,7 +3213,11 @@ ath5k_combine_pwr_to_pdadc_curves(struct ath5k_hw *ah,
 
 }
 
-/* Write PDADC values on hw */
+/**
+ * ath5k_write_pwr_to_pdadc_table() - Write the PDADC values on hw
+ * @ah: The &struct ath5k_hw
+ * @ee_mode: One of enum ath5k_driver_mode
+ */
 static void
 ath5k_write_pwr_to_pdadc_table(struct ath5k_hw *ah, u8 ee_mode)
 {
@@ -2814,7 +3274,13 @@ ath5k_write_pwr_to_pdadc_table(struct ath5k_hw *ah, u8 ee_mode)
  * Common code for PCDAC/PDADC tables
  */
 
-/*
+/**
+ * ath5k_setup_channel_powertable() - Set up power table for this channel
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
+ * @ee_mode: One of enum ath5k_driver_mode
+ * @type: One of enum ath5k_powertable_type (eeprom.h)
+ *
  * This is the main function that uses all of the above
  * to set PCDAC/PDADC table on hw for the current channel.
  * This table is used for tx power calibration on the baseband,
@@ -3012,7 +3478,12 @@ ath5k_setup_channel_powertable(struct ath5k_hw *ah,
         return 0;
 }
 
-/* Write power table for current channel to hw */
+/**
+ * ath5k_write_channel_powertable() - Set power table for current channel on hw
+ * @ah: The &struct ath5k_hw
+ * @ee_mode: One of enum ath5k_driver_mode
+ * @type: One of enum ath5k_powertable_type (eeprom.h)
+ */
 static void
 ath5k_write_channel_powertable(struct ath5k_hw *ah, u8 ee_mode, u8 type)
 {
@@ -3022,28 +3493,36 @@ ath5k_write_channel_powertable(struct ath5k_hw *ah, u8 ee_mode, u8 type)
                 ath5k_write_pcdac_table(ah);
 }
 
-/*
- * Per-rate tx power setting
+
+/**
+ * DOC: Per-rate tx power setting
  *
- * This is the code that sets the desired tx power (below
+ * This is the code that sets the desired tx power limit (below
  * maximum) on hw for each rate (we also have TPC that sets
- * power per packet). We do that by providing an index on the
- * PCDAC/PDADC table we set up.
- */
-
-/*
- * Set rate power table
+ * power per packet type). We do that by providing an index on the
+ * PCDAC/PDADC table we set up above, for each rate.
  *
  * For now we only limit txpower based on maximum tx power
- * supported by hw (what's inside rate_info). We need to limit
- * this even more, based on regulatory domain etc.
+ * supported by hw (what's inside rate_info) + conformance test
+ * limits. We need to limit this even more, based on regulatory domain
+ * etc to be safe. Normally this is done from above so we don't care
+ * here, all we care is that the tx power we set will be O.K.
+ * for the hw (e.g. won't create noise on PA etc).
  *
- * Rate power table contains indices to PCDAC/PDADC table (0.5dB steps)
- * and is indexed as follows:
+ * Rate power table contains indices to PCDAC/PDADC table (0.5dB steps -
+ * x values) and is indexed as follows:
  * rates[0] - rates[7] -> OFDM rates
  * rates[8] - rates[14] -> CCK rates
  * rates[15] -> XR rates (they all have the same power)
  */
+
+/**
+ * ath5k_setup_rate_powertable() - Set up rate power table for a given tx power
+ * @ah: The &struct ath5k_hw
+ * @max_pwr: The maximum tx power requested in 0.5dB steps
+ * @rate_info: The &struct ath5k_rate_pcal_info to fill
+ * @ee_mode: One of enum ath5k_driver_mode
+ */
 static void
 ath5k_setup_rate_powertable(struct ath5k_hw *ah, u16 max_pwr,
                         struct ath5k_rate_pcal_info *rate_info,
@@ -3114,8 +3593,14 @@ ath5k_setup_rate_powertable(struct ath5k_hw *ah, u16 max_pwr,
 }
 
 
-/*
- * Set transmission power
+/**
+ * ath5k_hw_txpower() - Set transmission power limit for a given channel
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
+ * @txpower: Requested tx power in 0.5dB steps
+ *
+ * Combines all of the above to set the requested tx power limit
+ * on hw.
  */
 static int
 ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel,
@@ -3233,7 +3718,16 @@ ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel,
         return 0;
 }
 
-int ath5k_hw_set_txpower_limit(struct ath5k_hw *ah, u8 txpower)
+/**
+ * ath5k_hw_set_txpower_limit() - Set txpower limit for the current channel
+ * @ah: The &struct ath5k_hw
+ * @txpower: The requested tx power limit in 0.5dB steps
+ *
+ * This function provides access to ath5k_hw_txpower to the driver in
+ * case user or an application changes it while PHY is running.
+ */
+int
+ath5k_hw_set_txpower_limit(struct ath5k_hw *ah, u8 txpower)
 {
         ATH5K_DBG(ah, ATH5K_DEBUG_TXPOWER,
                 "changing txpower to %d\n", txpower);
@@ -3241,11 +3735,26 @@ int ath5k_hw_set_txpower_limit(struct ath5k_hw *ah, u8 txpower)
         return ath5k_hw_txpower(ah, ah->ah_current_channel, txpower);
 }
 
+
 /*************\
  Init function
 \*************/
 
-int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel,
+/**
+ * ath5k_hw_phy_init() - Initialize PHY
+ * @ah: The &struct ath5k_hw
+ * @channel: The @struct ieee80211_channel
+ * @mode: One of enum ath5k_driver_mode
+ * @fast: Try a fast channel switch instead
+ *
+ * This is the main function used during reset to initialize PHY
+ * or do a fast channel change if possible.
+ *
+ * NOTE: Do not call this one from the driver, it assumes PHY is in a
+ * warm reset state !
+ */
+int
+ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel,
                       u8 mode, bool fast)
 {
         struct ieee80211_channel *curr_channel;
@@ -3355,7 +3864,7 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel,
                 if (ret)
                         return ret;
 
-                mdelay(1);
+                usleep_range(1000, 1500);
 
                 /*
                  * Write RF buffer
@@ -3376,10 +3885,10 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel,
                 }
 
         } else if (ah->ah_version == AR5K_AR5210) {
-                mdelay(1);
+                usleep_range(1000, 1500);
                 /* Disable phy and wait */
                 ath5k_hw_reg_write(ah, AR5K_PHY_ACT_DISABLE, AR5K_PHY_ACT);
-                mdelay(1);
+                usleep_range(1000, 1500);
         }
 
         /* Set channel on PHY */
@@ -3405,7 +3914,7 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel,
         for (i = 0; i <= 20; i++) {
                 if (!(ath5k_hw_reg_read(ah, AR5K_PHY_ADC_TEST) & 0x10))
                         break;
-                udelay(200);
+                usleep_range(200, 250);
         }
         ath5k_hw_reg_write(ah, phy_tst1, AR5K_PHY_TST1);
 
@@ -3433,9 +3942,9 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel,
 
         /* At the same time start I/Q calibration for QAM constellation
          * -no need for CCK- */
-        ah->ah_calibration = false;
+        ah->ah_iq_cal_needed = false;
         if (!(mode == AR5K_MODE_11B)) {
-                ah->ah_calibration = true;
+                ah->ah_iq_cal_needed = true;
                 AR5K_REG_WRITE_BITS(ah, AR5K_PHY_IQ,
                                 AR5K_PHY_IQ_CAL_NUM_LOG_MAX, 15);
                 AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_IQ,
diff --git a/drivers/net/wireless/ath/ath5k/qcu.c b/drivers/net/wireless/ath/ath5k/qcu.c
index 776654228eaa..30b50f934172 100644
--- a/drivers/net/wireless/ath/ath5k/qcu.c
+++ b/drivers/net/wireless/ath/ath5k/qcu.c
@@ -17,23 +17,48 @@
  */
 
 /********************************************\
-Queue Control Unit, DFS Control Unit Functions
+Queue Control Unit, DCF Control Unit Functions
 \********************************************/
 
 #include "ath5k.h"
 #include "reg.h"
 #include "debug.h"
+#include <linux/log2.h>
+
+/**
+ * DOC: Queue Control Unit (QCU)/DCF Control Unit (DCU) functions
+ *
+ * Here we setup parameters for the 12 available TX queues. Note that
+ * on the various registers we can usually only map the first 10 of them so
+ * basically we have 10 queues to play with. Each queue has a matching
+ * QCU that controls when the queue will get triggered and multiple QCUs
+ * can be mapped to a single DCU that controls the various DFS parameters
+ * for the various queues. In our setup we have a 1:1 mapping between QCUs
+ * and DCUs allowing us to have different DFS settings for each queue.
+ *
+ * When a frame goes into a TX queue, QCU decides when it'll trigger a
+ * transmission based on various criteria (such as how many data we have inside
+ * it's buffer or -if it's a beacon queue- if it's time to fire up the queue
+ * based on TSF etc), DCU adds backoff, IFSes etc and then a scheduler
+ * (arbitrator) decides the priority of each QCU based on it's configuration
+ * (e.g. beacons are always transmitted when they leave DCU bypassing all other
+ * frames from other queues waiting to be transmitted). After a frame leaves
+ * the DCU it goes to PCU for further processing and then to PHY for
+ * the actual transmission.
+ */
 
 
 /******************\
 * Helper functions *
 \******************/
 
-/*
- * Get number of pending frames
- * for a specific queue [5211+]
+/**
+ * ath5k_hw_num_tx_pending() - Get number of pending frames for a  given queue
+ * @ah: The &struct ath5k_hw
+ * @queue: One of enum ath5k_tx_queue_id
  */
-u32 ath5k_hw_num_tx_pending(struct ath5k_hw *ah, unsigned int queue)
+u32
+ath5k_hw_num_tx_pending(struct ath5k_hw *ah, unsigned int queue)
 {
         u32 pending;
         AR5K_ASSERT_ENTRY(queue, ah->ah_capabilities.cap_queues.q_tx_num);
@@ -58,10 +83,13 @@ u32 ath5k_hw_num_tx_pending(struct ath5k_hw *ah, unsigned int queue)
         return pending;
 }
 
-/*
- * Set a transmit queue inactive
+/**
+ * ath5k_hw_release_tx_queue() - Set a transmit queue inactive
+ * @ah: The &struct ath5k_hw
+ * @queue: One of enum ath5k_tx_queue_id
  */
-void ath5k_hw_release_tx_queue(struct ath5k_hw *ah, unsigned int queue)
+void
+ath5k_hw_release_tx_queue(struct ath5k_hw *ah, unsigned int queue)
 {
         if (WARN_ON(queue >= ah->ah_capabilities.cap_queues.q_tx_num))
                 return;
@@ -72,34 +100,56 @@ void ath5k_hw_release_tx_queue(struct ath5k_hw *ah, unsigned int queue)
         AR5K_Q_DISABLE_BITS(ah->ah_txq_status, queue);
 }
 
-/*
+/**
+ * ath5k_cw_validate() - Make sure the given cw is valid
+ * @cw_req: The contention window value to check
+ *
  * Make sure cw is a power of 2 minus 1 and smaller than 1024
  */
-static u16 ath5k_cw_validate(u16 cw_req)
+static u16
+ath5k_cw_validate(u16 cw_req)
 {
-        u32 cw = 1;
         cw_req = min(cw_req, (u16)1023);
 
-        while (cw < cw_req)
-                cw = (cw << 1) | 1;
+        /* Check if cw_req + 1 a power of 2 */
+        if (is_power_of_2(cw_req + 1))
+                return cw_req;
 
-        return cw;
+        /* Check if cw_req is a power of 2 */
+        if (is_power_of_2(cw_req))
+                return cw_req - 1;
+
+        /* If none of the above is correct
+         * find the closest power of 2 */
+        cw_req = (u16) roundup_pow_of_two(cw_req) - 1;
+
+        return cw_req;
 }
 
-/*
- * Get properties for a transmit queue
+/**
+ * ath5k_hw_get_tx_queueprops() - Get properties for a transmit queue
+ * @ah: The &struct ath5k_hw
+ * @queue: One of enum ath5k_tx_queue_id
+ * @queue_info: The &struct ath5k_txq_info to fill
  */
-int ath5k_hw_get_tx_queueprops(struct ath5k_hw *ah, int queue,
+int
+ath5k_hw_get_tx_queueprops(struct ath5k_hw *ah, int queue,
                 struct ath5k_txq_info *queue_info)
 {
         memcpy(queue_info, &ah->ah_txq[queue], sizeof(struct ath5k_txq_info));
         return 0;
 }
 
-/*
- * Set properties for a transmit queue
+/**
+ * ath5k_hw_set_tx_queueprops() - Set properties for a transmit queue
+ * @ah: The &struct ath5k_hw
+ * @queue: One of enum ath5k_tx_queue_id
+ * @qinfo: The &struct ath5k_txq_info to use
+ *
+ * Returns 0 on success or -EIO if queue is inactive
  */
-int ath5k_hw_set_tx_queueprops(struct ath5k_hw *ah, int queue,
+int
+ath5k_hw_set_tx_queueprops(struct ath5k_hw *ah, int queue,
                                 const struct ath5k_txq_info *qinfo)
 {
         struct ath5k_txq_info *qi;
@@ -139,10 +189,16 @@ int ath5k_hw_set_tx_queueprops(struct ath5k_hw *ah, int queue,
         return 0;
 }
 
-/*
- * Initialize a transmit queue
+/**
+ * ath5k_hw_setup_tx_queue() - Initialize a transmit queue
+ * @ah: The &struct ath5k_hw
+ * @queue_type: One of enum ath5k_tx_queue
+ * @queue_info: The &struct ath5k_txq_info to use
+ *
+ * Returns 0 on success, -EINVAL on invalid arguments
  */
-int ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type,
+int
+ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type,
                 struct ath5k_txq_info *queue_info)
 {
         unsigned int queue;
@@ -217,10 +273,16 @@ int ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type,
 * Single QCU/DCU initialization *
 \*******************************/
 
-/*
- * Set tx retry limits on DCU
+/**
+ * ath5k_hw_set_tx_retry_limits() - Set tx retry limits on DCU
+ * @ah: The &struct ath5k_hw
+ * @queue: One of enum ath5k_tx_queue_id
+ *
+ * This function is used when initializing a queue, to set
+ * retry limits based on ah->ah_retry_* and the chipset used.
  */
-void ath5k_hw_set_tx_retry_limits(struct ath5k_hw *ah,
+void
+ath5k_hw_set_tx_retry_limits(struct ath5k_hw *ah,
                                   unsigned int queue)
 {
         /* Single data queue on AR5210 */
@@ -255,15 +317,15 @@ void ath5k_hw_set_tx_retry_limits(struct ath5k_hw *ah,
 }
 
 /**
- * ath5k_hw_reset_tx_queue - Initialize a single hw queue
+ * ath5k_hw_reset_tx_queue() - Initialize a single hw queue
+ * @ah: The &struct ath5k_hw
+ * @queue: One of enum ath5k_tx_queue_id
  *
- * @ah The &struct ath5k_hw
- * @queue The hw queue number
- *
- * Set DFS properties for the given transmit queue on DCU
+ * Set DCF properties for the given transmit queue on DCU
  * and configures all queue-specific parameters.
  */
-int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)
+int
+ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)
 {
         struct ath5k_txq_info *tq = &ah->ah_txq[queue];
 
@@ -491,10 +553,9 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)
 \**************************/
 
 /**
- * ath5k_hw_set_ifs_intervals  - Set global inter-frame spaces on DCU
- *
- * @ah The &struct ath5k_hw
- * @slot_time Slot time in us
+ * ath5k_hw_set_ifs_intervals()  - Set global inter-frame spaces on DCU
+ * @ah: The &struct ath5k_hw
+ * @slot_time: Slot time in us
  *
  * Sets the global IFS intervals on DCU (also works on AR5210) for
  * the given slot time and the current bwmode.
@@ -597,7 +658,15 @@ int ath5k_hw_set_ifs_intervals(struct ath5k_hw *ah, unsigned int slot_time)
 }
 
 
-int ath5k_hw_init_queues(struct ath5k_hw *ah)
+/**
+ * ath5k_hw_init_queues() - Initialize tx queues
+ * @ah: The &struct ath5k_hw
+ *
+ * Initializes all tx queues based on information on
+ * ah->ah_txq* set by the driver
+ */
+int
+ath5k_hw_init_queues(struct ath5k_hw *ah)
 {
         int i, ret;
 
diff --git a/drivers/net/wireless/ath/ath5k/reg.h b/drivers/net/wireless/ath/ath5k/reg.h
index f5c1000045d3..0ea1608b47fd 100644
--- a/drivers/net/wireless/ath/ath5k/reg.h
+++ b/drivers/net/wireless/ath/ath5k/reg.h
@@ -280,6 +280,10 @@
  * 5211/5212 we have one primary and 4 secondary registers.
  * So we have AR5K_ISR for 5210 and AR5K_PISR /SISRx for 5211/5212.
  * Most of these bits are common for all chipsets.
+ *
+ * NOTE: On 5211+ TXOK, TXDESC, TXERR, TXEOL and TXURN contain
+ * the logical OR from per-queue interrupt bits found on SISR registers
+ * (see below).
  */
 #define AR5K_ISR                0x001c                  /* Register Address [5210] */
 #define AR5K_PISR               0x0080                  /* Register Address [5211+] */
@@ -292,7 +296,10 @@
 #define AR5K_ISR_TXOK           0x00000040      /* Frame successfully transmitted */
 #define AR5K_ISR_TXDESC         0x00000080      /* TX descriptor request */
 #define AR5K_ISR_TXERR          0x00000100      /* Transmit error */
-#define AR5K_ISR_TXNOFRM        0x00000200      /* No frame transmitted (transmit timeout) */
+#define AR5K_ISR_TXNOFRM        0x00000200      /* No frame transmitted (transmit timeout)
+                                                 * NOTE: We don't have per-queue info for this
+                                                 * one, but we can enable it per-queue through
+                                                 * TXNOFRM_QCU field on TXNOFRM register */
 #define AR5K_ISR_TXEOL          0x00000400      /* Empty TX descriptor */
 #define AR5K_ISR_TXURN          0x00000800      /* Transmit FIFO underrun */
 #define AR5K_ISR_MIB            0x00001000      /* Update MIB counters */
@@ -302,21 +309,29 @@
 #define AR5K_ISR_SWBA           0x00010000      /* Software beacon alert */
 #define AR5K_ISR_BRSSI          0x00020000      /* Beacon rssi below threshold (?) */
 #define AR5K_ISR_BMISS          0x00040000      /* Beacon missed */
-#define AR5K_ISR_HIUERR         0x00080000      /* Host Interface Unit error [5211+] */
+#define AR5K_ISR_HIUERR         0x00080000      /* Host Interface Unit error [5211+]
+                                                 * 'or' of MCABT, SSERR, DPERR from SISR2 */
 #define AR5K_ISR_BNR            0x00100000      /* Beacon not ready [5211+] */
 #define AR5K_ISR_MCABT          0x00100000      /* Master Cycle Abort [5210] */
 #define AR5K_ISR_RXCHIRP        0x00200000      /* CHIRP Received [5212+] */
 #define AR5K_ISR_SSERR          0x00200000      /* Signaled System Error [5210] */
-#define AR5K_ISR_DPERR          0x00400000      /* Det par Error (?) [5210] */
+#define AR5K_ISR_DPERR          0x00400000      /* Bus parity error [5210] */
 #define AR5K_ISR_RXDOPPLER      0x00400000      /* Doppler chirp received [5212+] */
 #define AR5K_ISR_TIM            0x00800000      /* [5211+] */
-#define AR5K_ISR_BCNMISC        0x00800000      /* 'or' of TIM, CAB_END, DTIM_SYNC, BCN_TIMEOUT,
-                                                CAB_TIMEOUT and DTIM bits from SISR2 [5212+] */
+#define AR5K_ISR_BCNMISC        0x00800000      /* Misc beacon related interrupt
+                                                 * 'or' of TIM, CAB_END, DTIM_SYNC, BCN_TIMEOUT,
+                                                 * CAB_TIMEOUT and DTIM bits from SISR2 [5212+] */
 #define AR5K_ISR_GPIO           0x01000000      /* GPIO (rf kill) */
 #define AR5K_ISR_QCBRORN        0x02000000      /* QCU CBR overrun [5211+] */
 #define AR5K_ISR_QCBRURN        0x04000000      /* QCU CBR underrun [5211+] */
 #define AR5K_ISR_QTRIG          0x08000000      /* QCU scheduling trigger [5211+] */
 
+#define AR5K_ISR_BITS_FROM_SISRS        (AR5K_ISR_TXOK | AR5K_ISR_TXDESC |\
+                                        AR5K_ISR_TXERR | AR5K_ISR_TXEOL |\
+                                        AR5K_ISR_TXURN | AR5K_ISR_HIUERR |\
+                                        AR5K_ISR_BCNMISC | AR5K_ISR_QCBRORN |\
+                                        AR5K_ISR_QCBRURN | AR5K_ISR_QTRIG)
+
 /*
  * Secondary status registers [5211+] (0 - 4)
  *
@@ -347,7 +362,7 @@
 #define AR5K_SISR2_BCN_TIMEOUT  0x08000000      /* Beacon Timeout [5212+] */
 #define AR5K_SISR2_CAB_TIMEOUT  0x10000000      /* CAB Timeout [5212+] */
 #define AR5K_SISR2_DTIM         0x20000000      /* [5212+] */
-#define AR5K_SISR2_TSFOOR       0x80000000      /* TSF OOR (?) */
+#define AR5K_SISR2_TSFOOR       0x80000000      /* TSF Out of range */
 
 #define AR5K_SISR3              0x0090                  /* Register Address [5211+] */
 #define AR5K_SISR3_QCBRORN      0x000003ff      /* Mask for QCBRORN */
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
index 2abac257b4b4..4aed3a3ab109 100644
--- a/drivers/net/wireless/ath/ath5k/reset.c
+++ b/drivers/net/wireless/ath/ath5k/reset.c
@@ -19,9 +19,9 @@
  *
  */
 
-/*****************************\
-  Reset functions and helpers
-\*****************************/
+/****************************\
+  Reset function and helpers
+\****************************/
 
 #include <asm/unaligned.h>
 
@@ -33,14 +33,36 @@
 #include "debug.h"
 
 
+/**
+ * DOC: Reset function and helpers
+ *
+ * Here we implement the main reset routine, used to bring the card
+ * to a working state and ready to receive. We also handle routines
+ * that don't fit on other places such as clock, sleep and power control
+ */
+
+
 /******************\
 * Helper functions *
 \******************/
 
-/*
- * Check if a register write has been completed
+/**
+ * ath5k_hw_register_timeout() - Poll a register for a flag/field change
+ * @ah: The &struct ath5k_hw
+ * @reg: The register to read
+ * @flag: The flag/field to check on the register
+ * @val: The field value we expect (if we check a field)
+ * @is_set: Instead of checking if the flag got cleared, check if it got set
+ *
+ * Some registers contain flags that indicate that an operation is
+ * running. We use this function to poll these registers and check
+ * if these flags get cleared. We also use it to poll a register
+ * field (containing multiple flags) until it gets a specific value.
+ *
+ * Returns -EAGAIN if we exceeded AR5K_TUNE_REGISTER_TIMEOUT * 15us or 0
  */
-int ath5k_hw_register_timeout(struct ath5k_hw *ah, u32 reg, u32 flag, u32 val,
+int
+ath5k_hw_register_timeout(struct ath5k_hw *ah, u32 reg, u32 flag, u32 val,
                               bool is_set)
 {
         int i;
@@ -64,35 +86,48 @@ int ath5k_hw_register_timeout(struct ath5k_hw *ah, u32 reg, u32 flag, u32 val,
 \*************************/
 
 /**
- * ath5k_hw_htoclock - Translate usec to hw clock units
- *
+ * ath5k_hw_htoclock() - Translate usec to hw clock units
  * @ah: The &struct ath5k_hw
  * @usec: value in microseconds
+ *
+ * Translate usecs to hw clock units based on the current
+ * hw clock rate.
+ *
+ * Returns number of clock units
  */
-unsigned int ath5k_hw_htoclock(struct ath5k_hw *ah, unsigned int usec)
+unsigned int
+ath5k_hw_htoclock(struct ath5k_hw *ah, unsigned int usec)
 {
         struct ath_common *common = ath5k_hw_common(ah);
         return usec * common->clockrate;
 }
 
 /**
- * ath5k_hw_clocktoh - Translate hw clock units to usec
+ * ath5k_hw_clocktoh() - Translate hw clock units to usec
+ * @ah: The &struct ath5k_hw
  * @clock: value in hw clock units
+ *
+ * Translate hw clock units to usecs based on the current
+ * hw clock rate.
+ *
+ * Returns number of usecs
  */
-unsigned int ath5k_hw_clocktoh(struct ath5k_hw *ah, unsigned int clock)
+unsigned int
+ath5k_hw_clocktoh(struct ath5k_hw *ah, unsigned int clock)
 {
         struct ath_common *common = ath5k_hw_common(ah);
         return clock / common->clockrate;
 }
 
 /**
- * ath5k_hw_init_core_clock - Initialize core clock
- *
- * @ah The &struct ath5k_hw
+ * ath5k_hw_init_core_clock() - Initialize core clock
+ * @ah: The &struct ath5k_hw
  *
- * Initialize core clock parameters (usec, usec32, latencies etc).
+ * Initialize core clock parameters (usec, usec32, latencies etc),
+ * based on current bwmode and chipset properties.
  */
-static void ath5k_hw_init_core_clock(struct ath5k_hw *ah)
+static void
+ath5k_hw_init_core_clock(struct ath5k_hw *ah)
 {
         struct ieee80211_channel *channel = ah->ah_current_channel;
         struct ath_common *common = ath5k_hw_common(ah);
@@ -227,16 +262,21 @@ static void ath5k_hw_init_core_clock(struct ath5k_hw *ah)
         }
 }
 
-/*
+/**
+ * ath5k_hw_set_sleep_clock() - Setup sleep clock operation
+ * @ah: The &struct ath5k_hw
+ * @enable: Enable sleep clock operation (false to disable)
+ *
  * If there is an external 32KHz crystal available, use it
  * as ref. clock instead of 32/40MHz clock and baseband clocks
  * to save power during sleep or restore normal 32/40MHz
  * operation.
  *
- * XXX: When operating on 32KHz certain PHY registers (27 - 31,
- *      123 - 127) require delay on access.
+ * NOTE: When operating on 32KHz certain PHY registers (27 - 31,
+ * 123 - 127) require delay on access.
  */
-static void ath5k_hw_set_sleep_clock(struct ath5k_hw *ah, bool enable)
+static void
+ath5k_hw_set_sleep_clock(struct ath5k_hw *ah, bool enable)
 {
         struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
         u32 scal, spending, sclock;
@@ -340,10 +380,19 @@ static void ath5k_hw_set_sleep_clock(struct ath5k_hw *ah, bool enable)
 * Reset/Sleep control *
 \*********************/
 
-/*
- * Reset chipset
+/**
+ * ath5k_hw_nic_reset() - Reset the various chipset units
+ * @ah: The &struct ath5k_hw
+ * @val: Mask to indicate what units to reset
+ *
+ * To reset the various chipset units we need to write
+ * the mask to AR5K_RESET_CTL and poll the register until
+ * all flags are cleared.
+ *
+ * Returns 0 if we are O.K. or -EAGAIN (from athk5_hw_register_timeout)
  */
-static int ath5k_hw_nic_reset(struct ath5k_hw *ah, u32 val)
+static int
+ath5k_hw_nic_reset(struct ath5k_hw *ah, u32 val)
 {
         int ret;
         u32 mask = val ? val : ~0U;
@@ -357,7 +406,7 @@ static int ath5k_hw_nic_reset(struct ath5k_hw *ah, u32 val)
         ath5k_hw_reg_write(ah, val, AR5K_RESET_CTL);
 
         /* Wait at least 128 PCI clocks */
-        udelay(15);
+        usleep_range(15, 20);
 
         if (ah->ah_version == AR5K_AR5210) {
                 val &= AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_DMA
@@ -382,12 +431,17 @@ static int ath5k_hw_nic_reset(struct ath5k_hw *ah, u32 val)
         return ret;
 }
 
-/*
- * Reset AHB chipset
- * AR5K_RESET_CTL_PCU flag resets WMAC
- * AR5K_RESET_CTL_BASEBAND flag resets WBB
+/**
+ * ath5k_hw_wisoc_reset() -  Reset AHB chipset
+ * @ah: The &struct ath5k_hw
+ * @flags: Mask to indicate what units to reset
+ *
+ * Same as ath5k_hw_nic_reset but for AHB based devices
+ *
+ * Returns 0 if we are O.K. or -EAGAIN (from athk5_hw_register_timeout)
  */
-static int ath5k_hw_wisoc_reset(struct ath5k_hw *ah, u32 flags)
+static int
+ath5k_hw_wisoc_reset(struct ath5k_hw *ah, u32 flags)
 {
         u32 mask = flags ? flags : ~0U;
         u32 __iomem *reg;
@@ -422,7 +476,7 @@ static int ath5k_hw_wisoc_reset(struct ath5k_hw *ah, u32 flags)
         regval = __raw_readl(reg);
         __raw_writel(regval | val, reg);
         regval = __raw_readl(reg);
-        udelay(100);
+        usleep_range(100, 150);
 
         /* Bring BB/MAC out of reset */
         __raw_writel(regval & ~val, reg);
@@ -439,11 +493,23 @@ static int ath5k_hw_wisoc_reset(struct ath5k_hw *ah, u32 flags)
         return 0;
 }
 
-
-/*
- * Sleep control
+/**
+ * ath5k_hw_set_power_mode() - Set power mode
+ * @ah: The &struct ath5k_hw
+ * @mode: One of enum ath5k_power_mode
+ * @set_chip: Set to true to write sleep control register
+ * @sleep_duration: How much time the device is allowed to sleep
+ * when sleep logic is enabled (in 128 microsecond increments).
+ *
+ * This function is used to configure sleep policy and allowed
+ * sleep modes. For more information check out the sleep control
+ * register on reg.h and STA_ID1.
+ *
+ * Returns 0 on success, -EIO if chip didn't wake up or -EINVAL if an invalid
+ * mode is requested.
  */
-static int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,
+static int
+ath5k_hw_set_power_mode(struct ath5k_hw *ah, enum ath5k_power_mode mode,
                               bool set_chip, u16 sleep_duration)
 {
         unsigned int i;
@@ -493,7 +559,7 @@ static int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,
 
                 ath5k_hw_reg_write(ah, data | AR5K_SLEEP_CTL_SLE_WAKE,
                                                         AR5K_SLEEP_CTL);
-                udelay(15);
+                usleep_range(15, 20);
 
                 for (i = 200; i > 0; i--) {
                         /* Check if the chip did wake up */
@@ -502,7 +568,7 @@ static int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,
                                 break;
 
                         /* Wait a bit and retry */
-                        udelay(50);
+                        usleep_range(50, 75);
                         ath5k_hw_reg_write(ah, data | AR5K_SLEEP_CTL_SLE_WAKE,
                                                         AR5K_SLEEP_CTL);
                 }
@@ -523,17 +589,20 @@ commit:
         return 0;
 }
 
-/*
- * Put device on hold
+/**
+ * ath5k_hw_on_hold() - Put device on hold
+ * @ah: The &struct ath5k_hw
  *
- * Put MAC and Baseband on warm reset and
- * keep that state (don't clean sleep control
- * register). After this MAC and Baseband are
- * disabled and a full reset is needed to come
- * back. This way we save as much power as possible
+ * Put MAC and Baseband on warm reset and keep that state
+ * (don't clean sleep control register). After this MAC
+ * and Baseband are disabled and a full reset is needed
+ * to come back. This way we save as much power as possible
  * without putting the card on full sleep.
+ *
+ * Returns 0 on success or -EIO on error
  */
-int ath5k_hw_on_hold(struct ath5k_hw *ah)
+int
+ath5k_hw_on_hold(struct ath5k_hw *ah)
 {
         struct pci_dev *pdev = ah->pdev;
         u32 bus_flags;
@@ -543,7 +612,7 @@ int ath5k_hw_on_hold(struct ath5k_hw *ah)
                 return 0;
 
         /* Make sure device is awake */
-        ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);
+        ret = ath5k_hw_set_power_mode(ah, AR5K_PM_AWAKE, true, 0);
         if (ret) {
                 ATH5K_ERR(ah, "failed to wakeup the MAC Chip\n");
                 return ret;
@@ -563,7 +632,7 @@ int ath5k_hw_on_hold(struct ath5k_hw *ah)
                 ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU |
                         AR5K_RESET_CTL_MAC | AR5K_RESET_CTL_DMA |
                         AR5K_RESET_CTL_PHY | AR5K_RESET_CTL_PCI);
-                        mdelay(2);
+                        usleep_range(2000, 2500);
         } else {
                 ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU |
                         AR5K_RESET_CTL_BASEBAND | bus_flags);
@@ -575,7 +644,7 @@ int ath5k_hw_on_hold(struct ath5k_hw *ah)
         }
 
         /* ...wakeup again!*/
-        ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);
+        ret = ath5k_hw_set_power_mode(ah, AR5K_PM_AWAKE, true, 0);
         if (ret) {
                 ATH5K_ERR(ah, "failed to put device on hold\n");
                 return ret;
@@ -584,11 +653,18 @@ int ath5k_hw_on_hold(struct ath5k_hw *ah)
         return ret;
 }
 
-/*
+/**
+ * ath5k_hw_nic_wakeup() - Force card out of sleep
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
+ *
  * Bring up MAC + PHY Chips and program PLL
- * Channel is NULL for the initial wakeup.
+ * NOTE: Channel is NULL for the initial wakeup.
+ *
+ * Returns 0 on success, -EIO on hw failure or -EINVAL for false channel infos
  */
-int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel)
+int
+ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel)
 {
         struct pci_dev *pdev = ah->pdev;
         u32 turbo, mode, clock, bus_flags;
@@ -600,7 +676,7 @@ int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel)
 
         if ((ath5k_get_bus_type(ah) != ATH_AHB) || channel) {
                 /* Wakeup the device */
-                ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);
+                ret = ath5k_hw_set_power_mode(ah, AR5K_PM_AWAKE, true, 0);
                 if (ret) {
                         ATH5K_ERR(ah, "failed to wakeup the MAC Chip\n");
                         return ret;
@@ -621,7 +697,7 @@ int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel)
                 ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU |
                         AR5K_RESET_CTL_MAC | AR5K_RESET_CTL_DMA |
                         AR5K_RESET_CTL_PHY | AR5K_RESET_CTL_PCI);
-                        mdelay(2);
+                        usleep_range(2000, 2500);
         } else {
                 if (ath5k_get_bus_type(ah) == ATH_AHB)
                         ret = ath5k_hw_wisoc_reset(ah, AR5K_RESET_CTL_PCU |
@@ -637,7 +713,7 @@ int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel)
         }
 
         /* ...wakeup again!...*/
-        ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);
+        ret = ath5k_hw_set_power_mode(ah, AR5K_PM_AWAKE, true, 0);
         if (ret) {
                 ATH5K_ERR(ah, "failed to resume the MAC Chip\n");
                 return ret;
@@ -739,7 +815,7 @@ int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel)
                 /* ...update PLL if needed */
                 if (ath5k_hw_reg_read(ah, AR5K_PHY_PLL) != clock) {
                         ath5k_hw_reg_write(ah, clock, AR5K_PHY_PLL);
-                        udelay(300);
+                        usleep_range(300, 350);
                 }
 
                 /* ...set the PHY operating mode */
@@ -755,8 +831,19 @@ int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel)
 * Post-initvals register modifications *
 \**************************************/
 
-/* TODO: Half/Quarter rate */
-static void ath5k_hw_tweak_initval_settings(struct ath5k_hw *ah,
+/**
+ * ath5k_hw_tweak_initval_settings() - Tweak initial settings
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
+ *
+ * Some settings are not handled on initvals, e.g. bwmode
+ * settings, some phy settings, workarounds etc that in general
+ * don't fit anywhere else or are too small to introduce a separate
+ * function for each one. So we have this function to handle
+ * them all during reset and complete card's initialization.
+ */
+static void
+ath5k_hw_tweak_initval_settings(struct ath5k_hw *ah,
                                 struct ieee80211_channel *channel)
 {
         if (ah->ah_version == AR5K_AR5212 &&
@@ -875,7 +962,16 @@ static void ath5k_hw_tweak_initval_settings(struct ath5k_hw *ah,
         }
 }
 
-static void ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah,
+/**
+ * ath5k_hw_commit_eeprom_settings() - Commit settings from EEPROM
+ * @ah: The &struct ath5k_hw
+ * @channel: The &struct ieee80211_channel
+ *
+ * Use settings stored on EEPROM to properly initialize the card
+ * based on various infos and per-mode calibration data.
+ */
+static void
+ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah,
                 struct ieee80211_channel *channel)
 {
         struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
@@ -1029,7 +1125,23 @@ static void ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah,
 * Main reset function *
 \*********************/
 
-int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
+/**
+ * ath5k_hw_reset() - The main reset function
+ * @ah: The &struct ath5k_hw
+ * @op_mode: One of enum nl80211_iftype
+ * @channel: The &struct ieee80211_channel
+ * @fast: Enable fast channel switching
+ * @skip_pcu: Skip pcu initialization
+ *
+ * This is the function we call each time we want to (re)initialize the
+ * card and pass new settings to hw. We also call it when hw runs into
+ * trouble to make it come back to a working state.
+ *
+ * Returns 0 on success, -EINVAL on false op_mode or channel infos, or -EIO
+ * on failure.
+ */
+int
+ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
                 struct ieee80211_channel *channel, bool fast, bool skip_pcu)
 {
         u32 s_seq[10], s_led[3], tsf_up, tsf_lo;
@@ -1242,7 +1354,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
         /*
          * Initialize PCU
          */
-        ath5k_hw_pcu_init(ah, op_mode, mode);
+        ath5k_hw_pcu_init(ah, op_mode);
 
         /*
          * Initialize PHY
diff --git a/drivers/net/wireless/ath/ath5k/rfbuffer.h b/drivers/net/wireless/ath/ath5k/rfbuffer.h
index 5d11c23b4297..aed34d9954c0 100644
--- a/drivers/net/wireless/ath/ath5k/rfbuffer.h
+++ b/drivers/net/wireless/ath/ath5k/rfbuffer.h
@@ -18,7 +18,9 @@
  */
 
 
-/*
+/**
+ * DOC: RF Buffer registers
+ *
  * There are some special registers on the RF chip
  * that control various operation settings related mostly to
  * the analog parts (channel, gain adjustment etc).
@@ -44,40 +46,63 @@
  */
 
 
-/*
+/**
+ * struct ath5k_ini_rfbuffer - Initial RF Buffer settings
+ * @rfb_bank: RF Bank number
+ * @rfb_ctrl_register: RF Buffer control register
+ * @rfb_mode_data: RF Buffer data for each mode
+ *
  * Struct to hold default mode specific RF
- * register values (RF Banks)
+ * register values (RF Banks) for each chip.
  */
 struct ath5k_ini_rfbuffer {
-        u8      rfb_bank;               /* RF Bank number */
-        u16     rfb_ctrl_register;      /* RF Buffer control register */
-        u32     rfb_mode_data[3];       /* RF Buffer data for each mode */
+        u8      rfb_bank;
+        u16     rfb_ctrl_register;
+        u32     rfb_mode_data[3];
 };
 
-/*
+/**
+ * struct ath5k_rfb_field - An RF Buffer field (register/value)
+ * @len: Field length
+ * @pos: Offset on the raw packet
+ * @col: Used for shifting
+ *
  * Struct to hold RF Buffer field
  * infos used to access certain RF
  * analog registers
  */
 struct ath5k_rfb_field {
-        u8      len;    /* Field length */
-        u16     pos;    /* Offset on the raw packet */
-        u8      col;    /* Column -used for shifting */
+        u8      len;
+        u16     pos;
+        u8      col;
 };
 
-/*
- * RF analog register definition
+/**
+ * struct ath5k_rf_reg - RF analog register definition
+ * @bank: RF Buffer Bank number
+ * @index: Register's index on ath5k_rf_regx_idx
+ * @field: The &struct ath5k_rfb_field
+ *
+ * We use this struct to define the set of RF registers
+ * on each chip that we want to tweak. Some RF registers
+ * are common between different chip versions so this saves
+ * us space and complexity because we can refer to an rf
+ * register by it's index no matter what chip we work with
+ * as long as it has that register.
  */
 struct ath5k_rf_reg {
-        u8                      bank;   /* RF Buffer Bank number */
-        u8                      index;  /* Register's index on rf_regs_idx */
-        struct ath5k_rfb_field  field;  /* RF Buffer field for this register */
+        u8                      bank;
+        u8                      index;
+        struct ath5k_rfb_field  field;
 };
 
-/* Map RF registers to indexes
+/**
+ * enum ath5k_rf_regs_idx - Map RF registers to indexes
+ *
  * We do this to handle common bits and make our
  * life easier by using an index for each register
- * instead of a full rfb_field */
+ * instead of a full rfb_field
+ */
 enum ath5k_rf_regs_idx {
         /* BANK 2 */
         AR5K_RF_TURBO = 0,
diff --git a/drivers/net/wireless/ath/ath5k/rfgain.h b/drivers/net/wireless/ath/ath5k/rfgain.h
index ebfae052d89e..4d21df0e5975 100644
--- a/drivers/net/wireless/ath/ath5k/rfgain.h
+++ b/drivers/net/wireless/ath/ath5k/rfgain.h
@@ -18,13 +18,17 @@
  *
  */
 
-/*
+/**
+ * struct ath5k_ini_rfgain - RF Gain table
+ * @rfg_register: RF Gain register address
+ * @rfg_value: Register value for 5 and 2GHz
+ *
  * Mode-specific RF Gain table (64bytes) for RF5111/5112
  * (RF5110 only comes with AR5210 and only supports a/turbo a mode so initial
  * RF Gain values are included in AR5K_AR5210_INI)
  */
 struct ath5k_ini_rfgain {
-        u16     rfg_register;   /* RF Gain register address */
+        u16     rfg_register;
         u32     rfg_value[2];   /* [freq (see below)] */
 };
 
@@ -455,18 +459,31 @@ static const struct ath5k_ini_rfgain rfgain_2425[] = {
 #define AR5K_GAIN_CHECK_ADJUST(_g)              \
         ((_g)->g_current <= (_g)->g_low || (_g)->g_current >= (_g)->g_high)
 
+/**
+ * struct ath5k_gain_opt_step - An RF gain optimization step
+ * @gos_param: Set of parameters
+ * @gos_gain: Gain
+ */
 struct ath5k_gain_opt_step {
         s8                              gos_param[AR5K_GAIN_CRN_MAX_FIX_BITS];
         s8                              gos_gain;
 };
 
+/**
+ * struct ath5k_gain_opt - RF Gain optimization ladder
+ * @go_default: The default step
+ * @go_steps_count: How many optimization steps
+ * @go_step: Array of &struct ath5k_gain_opt_step
+ */
 struct ath5k_gain_opt {
         u8                              go_default;
         u8                              go_steps_count;
         const struct ath5k_gain_opt_step        go_step[AR5K_GAIN_STEP_COUNT];
 };
 
+
 /*
+ * RF5111
  * Parameters on gos_param:
  * 1) Tx clip PHY register
  * 2) PWD 90 RF register
@@ -490,6 +507,7 @@ static const struct ath5k_gain_opt rfgain_opt_5111 = {
 };
 
 /*
+ * RF5112
  * Parameters on gos_param:
  * 1) Mixgain ovr RF register
  * 2) PWD 138 RF register
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index abe3af3c6188..6c59a217b1a1 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/moduleparam.h>
+
 #include "core.h"
 #include "cfg80211.h"
 #include "debug.h"
diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c
index cf513a80b061..eb808b46f94c 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.c
+++ b/drivers/net/wireless/ath/ath6kl/debug.c
@@ -19,6 +19,7 @@
 #include <linux/circ_buf.h>
 #include <linux/fs.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 
 #include "debug.h"
 #include "target.h"
diff --git a/drivers/net/wireless/ath/ath6kl/debug.h b/drivers/net/wireless/ath/ath6kl/debug.h
index 9b779aac83e7..e569c652e35c 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.h
+++ b/drivers/net/wireless/ath/ath6kl/debug.h
@@ -46,8 +46,8 @@ enum ATH6K_DEBUG_MASK {
 };
 
 extern unsigned int debug_mask;
-extern int ath6kl_printk(const char *level, const char *fmt, ...)
-        __attribute__ ((format (printf, 2, 3)));
+extern __printf(2, 3)
+int ath6kl_printk(const char *level, const char *fmt, ...);
 
 #define ath6kl_info(fmt, ...)                           \
         ath6kl_printk(KERN_INFO, fmt, ##__VA_ARGS__)
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index c614049d7b2e..368ecbd172a3 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -1663,6 +1663,7 @@ int ath6kl_core_init(struct ath6kl *ar)
 
         ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM |
                             WIPHY_FLAG_HAVE_AP_SME |
+                            WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |
                             WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD;
 
         if (test_bit(ATH6KL_FW_CAPABILITY_SCHED_SCAN, ar->fw_capabilities))
diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c
index 07903e6114d8..15c3f56caf4f 100644
--- a/drivers/net/wireless/ath/ath6kl/sdio.c
+++ b/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -14,6 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/module.h>
 #include <linux/mmc/card.h>
 #include <linux/mmc/mmc.h>
 #include <linux/mmc/host.h>
diff --git a/drivers/net/wireless/ath/ath9k/Kconfig b/drivers/net/wireless/ath/ath9k/Kconfig
index 7b4c074e12fa..1b4786ae00ac 100644
--- a/drivers/net/wireless/ath/ath9k/Kconfig
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
@@ -2,6 +2,9 @@ config ATH9K_HW
         tristate
 config ATH9K_COMMON
         tristate
+config ATH9K_DFS_DEBUGFS
+        def_bool y
+        depends on ATH9K_DEBUGFS && ATH9K_DFS_CERTIFIED
 
 config ATH9K
         tristate "Atheros 802.11n wireless cards support"
@@ -51,6 +54,25 @@ config ATH9K_DEBUGFS
 
           Also required for changing debug message flags at run time.
 
+config ATH9K_DFS_CERTIFIED
+        bool "Atheros DFS support for certified platforms"
+        depends on ATH9K && EXPERT
+        default n
+        ---help---
+          This option enables DFS support for initiating radiation on
+          ath9k. There is no way to dynamically detect if a card was DFS
+          certified and as such this is left as a build time option. This
+          option should only be enabled by system integrators that can
+          guarantee that all the platforms that their kernel will run on
+          have obtained appropriate regulatory body certification for a
+          respective Atheros card by using ath9k on the target shipping
+          platforms.
+
+          This is currently only a placeholder for future DFS support,
+          as DFS support requires more components that still need to be
+          developed. At this point enabling this option won't do anything
+          except increase code size.
+
 config ATH9K_RATE_CONTROL
         bool "Atheros ath9k rate control"
         depends on ATH9K
diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile
index 49d3f25f509d..da02242499af 100644
--- a/drivers/net/wireless/ath/ath9k/Makefile
+++ b/drivers/net/wireless/ath/ath9k/Makefile
@@ -10,6 +10,8 @@ ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o
 ath9k-$(CONFIG_ATH9K_PCI) += pci.o
 ath9k-$(CONFIG_ATH9K_AHB) += ahb.o
 ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o
+ath9k-$(CONFIG_ATH9K_DFS_DEBUGFS) += dfs_debug.o
+ath9k-$(CONFIG_ATH9K_DFS_CERTIFIED) += dfs.o
 
 obj-$(CONFIG_ATH9K) += ath9k.o
 
@@ -34,7 +36,8 @@ ath9k_hw-y:=	\
                 ar9002_mac.o \
                 ar9003_mac.o \
                 ar9003_eeprom.o \
-                ar9003_paprd.o
+                ar9003_paprd.o \
+                ar9003_mci.o
 
 obj-$(CONFIG_ATH9K_HW) += ath9k_hw.o
 
diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index 85a54cd2b083..5e47ca6d16a8 100644
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -19,6 +19,7 @@
 #include <linux/nl80211.h>
 #include <linux/platform_device.h>
 #include <linux/ath9k_platform.h>
+#include <linux/module.h>
 #include "ath9k.h"
 
 static const struct platform_device_id ath9k_platform_id_table[] = {
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index 2776c3c1f506..a639b94f7643 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -15,6 +15,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include "hw.h"
 #include "hw-ops.h"
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
index 88279e325dca..157337febc2b 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
@@ -203,7 +203,7 @@ static void ar9002_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)
                         i);
 
                 ath_dbg(common, ATH_DBG_CALIBRATE,
-                        "Orignal: Chn %diq_corr_meas = 0x%08x\n",
+                        "Original: Chn %d iq_corr_meas = 0x%08x\n",
                         i, ah->totalIqCorrMeas[i]);
 
                 iqCorrNeg = 0;
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_hw.c b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
index 626d547d2f06..11f192a1ceb7 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
@@ -14,6 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/moduleparam.h>
 #include "hw.h"
 #include "ar5008_initvals.h"
 #include "ar9001_initvals.h"
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
index f7d8e516a2a9..b5920168606d 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
@@ -15,6 +15,7 @@
  */
 
 #include "hw.h"
+#include <linux/export.h>
 
 #define AR_BufLen           0x00000fff
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index 12a730dcb500..23b3a6c57800 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -18,6 +18,7 @@
 #include "hw-ops.h"
 #include "ar9003_phy.h"
 #include "ar9003_rtt.h"
+#include "ar9003_mci.h"
 
 #define MAX_MEASUREMENT MAX_IQCAL_MEASUREMENT
 #define MAX_MAG_DELTA   11
@@ -225,7 +226,7 @@ static void ar9003_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)
                         i);
 
                 ath_dbg(common, ATH_DBG_CALIBRATE,
-                        "Orignal: Chn %diq_corr_meas = 0x%08x\n",
+                        "Original: Chn %d iq_corr_meas = 0x%08x\n",
                         i, ah->totalIqCorrMeas[i]);
 
                 iqCorrNeg = 0;
@@ -824,7 +825,7 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah, bool is_reusable)
                                                 chan_info_tab[i] + offset);
 
                                 ath_dbg(common, ATH_DBG_CALIBRATE,
-                                        "IQ RES[%d]=0x%x"
+                                        "IQ_RES[%d]=0x%x "
                                         "IQ_RES[%d]=0x%x\n",
                                         idx, iq_res[idx], idx + 1,
                                         iq_res[idx + 1]);
@@ -934,10 +935,12 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
 {
         struct ath_common *common = ath9k_hw_common(ah);
         struct ath9k_hw_cal_data *caldata = ah->caldata;
+        struct ath9k_hw_mci *mci_hw = &ah->btcoex_hw.mci;
         bool txiqcal_done = false, txclcal_done = false;
         bool is_reusable = true, status = true;
         bool run_rtt_cal = false, run_agc_cal;
         bool rtt = !!(ah->caps.hw_caps & ATH9K_HW_CAP_RTT);
+        bool mci = !!(ah->caps.hw_caps & ATH9K_HW_CAP_MCI);
         u32 agc_ctrl = 0, agc_supp_cals = AR_PHY_AGC_CONTROL_OFFSET_CAL |
                                           AR_PHY_AGC_CONTROL_FLTR_CAL   |
                                           AR_PHY_AGC_CONTROL_PKDET_CAL;
@@ -1005,6 +1008,31 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
         } else if (caldata && !caldata->done_txiqcal_once)
                 run_agc_cal = true;
 
+        if (mci && IS_CHAN_2GHZ(chan) &&
+            (mci_hw->bt_state  == MCI_BT_AWAKE) &&
+            run_agc_cal &&
+            !(mci_hw->config & ATH_MCI_CONFIG_DISABLE_MCI_CAL)) {
+
+                u32 pld[4] = {0, 0, 0, 0};
+
+                /* send CAL_REQ only when BT is AWAKE. */
+                ath_dbg(common, ATH_DBG_MCI, "MCI send WLAN_CAL_REQ 0x%x\n",
+                        mci_hw->wlan_cal_seq);
+                MCI_GPM_SET_CAL_TYPE(pld, MCI_GPM_WLAN_CAL_REQ);
+                pld[MCI_GPM_WLAN_CAL_W_SEQUENCE] = mci_hw->wlan_cal_seq++;
+                ar9003_mci_send_message(ah, MCI_GPM, 0, pld, 16, true, false);
+
+                /* Wait BT_CAL_GRANT for 50ms */
+                ath_dbg(common, ATH_DBG_MCI, "MCI wait for BT_CAL_GRANT");
+
+                if (ar9003_mci_wait_for_gpm(ah, MCI_GPM_BT_CAL_GRANT, 0, 50000))
+                        ath_dbg(common, ATH_DBG_MCI, "MCI got BT_CAL_GRANT");
+                else {
+                        is_reusable = false;
+                        ath_dbg(common, ATH_DBG_MCI, "\nMCI BT is not responding");
+                }
+        }
+
         txiqcal_done = ar9003_hw_tx_iq_cal_run(ah);
         REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
         udelay(5);
@@ -1022,6 +1050,21 @@ skip_tx_iqcal:
                                        AR_PHY_AGC_CONTROL_CAL,
                                        0, AH_WAIT_TIMEOUT);
         }
+
+        if (mci && IS_CHAN_2GHZ(chan) &&
+            (mci_hw->bt_state  == MCI_BT_AWAKE) &&
+            run_agc_cal &&
+            !(mci_hw->config & ATH_MCI_CONFIG_DISABLE_MCI_CAL)) {
+
+                u32 pld[4] = {0, 0, 0, 0};
+
+                ath_dbg(common, ATH_DBG_MCI, "MCI Send WLAN_CAL_DONE 0x%x\n",
+                        mci_hw->wlan_cal_done);
+                MCI_GPM_SET_CAL_TYPE(pld, MCI_GPM_WLAN_CAL_DONE);
+                pld[MCI_GPM_WLAN_CAL_W_SEQUENCE] = mci_hw->wlan_cal_done++;
+                ar9003_mci_send_message(ah, MCI_GPM, 0, pld, 16, true, false);
+        }
+
         if (rtt && !run_rtt_cal) {
                 agc_ctrl |= agc_supp_cals;
                 REG_WRITE(ah, AR_PHY_AGC_CONTROL, agc_ctrl);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index a93bd63ad23b..4ba6f52943a8 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -4779,7 +4779,7 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,
 {
         struct ath_common *common = ath9k_hw_common(ah);
         struct ar9300_eeprom *pEepData = &ah->eeprom.ar9300_eep;
-        u16 twiceMaxEdgePower = MAX_RATE_POWER;
+        u16 twiceMaxEdgePower;
         int i;
         u16 scaledPower = 0, minCtlPower;
         static const u16 ctlModesFor11a[] = {
@@ -4880,6 +4880,7 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,
                         ctlNum = AR9300_NUM_CTLS_5G;
                 }
 
+                twiceMaxEdgePower = MAX_RATE_POWER;
                 for (i = 0; (i < ctlNum) && ctlIndex[i]; i++) {
                         ath_dbg(common, ATH_DBG_REGULATORY,
                                 "LOOP-Ctlidx %d: cfgCtl 0x%2.2x pCtlMode 0x%2.2x ctlIndex 0x%2.2x chan %d\n",
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
index b363cc06cfd9..631fe4f2e495 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -13,6 +13,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include <linux/export.h>
 #include "hw.h"
 #include "ar9003_mac.h"
 
@@ -174,20 +175,24 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)
         u32 isr = 0;
         u32 mask2 = 0;
         struct ath9k_hw_capabilities *pCap = &ah->caps;
-        u32 sync_cause = 0;
         struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u32 sync_cause = 0, async_cause;
 
-        if (REG_READ(ah, AR_INTR_ASYNC_CAUSE) & AR_INTR_MAC_IRQ) {
+        async_cause = REG_READ(ah, AR_INTR_ASYNC_CAUSE);
+
+        if (async_cause & (AR_INTR_MAC_IRQ | AR_INTR_ASYNC_MASK_MCI)) {
                 if ((REG_READ(ah, AR_RTC_STATUS) & AR_RTC_STATUS_M)
                                 == AR_RTC_STATUS_ON)
                         isr = REG_READ(ah, AR_ISR);
         }
 
+
         sync_cause = REG_READ(ah, AR_INTR_SYNC_CAUSE) & AR_INTR_SYNC_DEFAULT;
 
         *masked = 0;
 
-        if (!isr && !sync_cause)
+        if (!isr && !sync_cause && !async_cause)
                 return false;
 
         if (isr) {
@@ -293,6 +298,35 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)
                         ar9003_hw_bb_watchdog_read(ah);
         }
 
+        if (async_cause & AR_INTR_ASYNC_MASK_MCI) {
+                u32 raw_intr, rx_msg_intr;
+
+                rx_msg_intr = REG_READ(ah, AR_MCI_INTERRUPT_RX_MSG_RAW);
+                raw_intr = REG_READ(ah, AR_MCI_INTERRUPT_RAW);
+
+                if ((raw_intr == 0xdeadbeef) || (rx_msg_intr == 0xdeadbeef))
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI gets 0xdeadbeef during MCI int processing"
+                                "new raw_intr=0x%08x, new rx_msg_raw=0x%08x, "
+                                "raw_intr=0x%08x, rx_msg_raw=0x%08x\n",
+                                raw_intr, rx_msg_intr, mci->raw_intr,
+                                mci->rx_msg_intr);
+                else {
+                        mci->rx_msg_intr |= rx_msg_intr;
+                        mci->raw_intr |= raw_intr;
+                        *masked |= ATH9K_INT_MCI;
+
+                        if (rx_msg_intr & AR_MCI_INTERRUPT_RX_MSG_CONT_INFO)
+                                mci->cont_status =
+                                        REG_READ(ah, AR_MCI_CONT_STATUS);
+
+                        REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW, rx_msg_intr);
+                        REG_WRITE(ah, AR_MCI_INTERRUPT_RAW, raw_intr);
+                        ath_dbg(common, ATH_DBG_MCI, "AR_INTR_SYNC_MCI\n");
+
+                }
+        }
+
         if (sync_cause) {
                 if (sync_cause & AR_INTR_SYNC_RADM_CPL_TIMEOUT) {
                         REG_WRITE(ah, AR_RC, AR_RC_HOSTIF);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.c b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
new file mode 100644
index 000000000000..8599822dc83f
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
@@ -0,0 +1,1464 @@
+/*
+ * Copyright (c) 2008-2011 Atheros Communications Inc.
+ *
+ * Permission to use, copy, modify, and/or 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.
+ */
+
+#include <linux/export.h>
+#include "hw.h"
+#include "ar9003_phy.h"
+#include "ar9003_mci.h"
+
+static void ar9003_mci_reset_req_wakeup(struct ath_hw *ah)
+{
+        if (!AR_SREV_9462_20(ah))
+                return;
+
+        REG_RMW_FIELD(ah, AR_MCI_COMMAND2,
+                      AR_MCI_COMMAND2_RESET_REQ_WAKEUP, 1);
+        udelay(1);
+        REG_RMW_FIELD(ah, AR_MCI_COMMAND2,
+                      AR_MCI_COMMAND2_RESET_REQ_WAKEUP, 0);
+}
+
+static int ar9003_mci_wait_for_interrupt(struct ath_hw *ah, u32 address,
+                                        u32 bit_position, int time_out)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+
+        while (time_out) {
+
+                if (REG_READ(ah, address) & bit_position) {
+
+                        REG_WRITE(ah, address, bit_position);
+
+                        if (address == AR_MCI_INTERRUPT_RX_MSG_RAW) {
+
+                                if (bit_position &
+                                    AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE)
+                                        ar9003_mci_reset_req_wakeup(ah);
+
+                                if (bit_position &
+                                    (AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING |
+                                     AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING))
+                                        REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,
+                                        AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE);
+
+                                REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,
+                                          AR_MCI_INTERRUPT_RX_MSG);
+                        }
+                        break;
+                }
+
+                udelay(10);
+                time_out -= 10;
+
+                if (time_out < 0)
+                        break;
+        }
+
+        if (time_out <= 0) {
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI Wait for Reg 0x%08x = 0x%08x timeout.\n",
+                        address, bit_position);
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI INT_RAW = 0x%08x, RX_MSG_RAW = 0x%08x",
+                        REG_READ(ah, AR_MCI_INTERRUPT_RAW),
+                        REG_READ(ah, AR_MCI_INTERRUPT_RX_MSG_RAW));
+                time_out = 0;
+        }
+
+        return time_out;
+}
+
+void ar9003_mci_remote_reset(struct ath_hw *ah, bool wait_done)
+{
+        u32 payload[4] = { 0xffffffff, 0xffffffff, 0xffffffff, 0xffffff00};
+
+        ar9003_mci_send_message(ah, MCI_REMOTE_RESET, 0, payload, 16,
+                                wait_done, false);
+        udelay(5);
+}
+
+void ar9003_mci_send_lna_transfer(struct ath_hw *ah, bool wait_done)
+{
+        u32 payload = 0x00000000;
+
+        ar9003_mci_send_message(ah, MCI_LNA_TRANS, 0, &payload, 1,
+                                wait_done, false);
+}
+
+static void ar9003_mci_send_req_wake(struct ath_hw *ah, bool wait_done)
+{
+        ar9003_mci_send_message(ah, MCI_REQ_WAKE, MCI_FLAG_DISABLE_TIMESTAMP,
+                                NULL, 0, wait_done, false);
+        udelay(5);
+}
+
+void ar9003_mci_send_sys_waking(struct ath_hw *ah, bool wait_done)
+{
+        ar9003_mci_send_message(ah, MCI_SYS_WAKING, MCI_FLAG_DISABLE_TIMESTAMP,
+                                NULL, 0, wait_done, false);
+}
+
+static void ar9003_mci_send_lna_take(struct ath_hw *ah, bool wait_done)
+{
+        u32 payload = 0x70000000;
+
+        ar9003_mci_send_message(ah, MCI_LNA_TAKE, 0, &payload, 1,
+                                wait_done, false);
+}
+
+static void ar9003_mci_send_sys_sleeping(struct ath_hw *ah, bool wait_done)
+{
+        ar9003_mci_send_message(ah, MCI_SYS_SLEEPING,
+                                MCI_FLAG_DISABLE_TIMESTAMP,
+                                NULL, 0, wait_done, false);
+}
+
+static void ar9003_mci_send_coex_version_query(struct ath_hw *ah,
+                                               bool wait_done)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u32 payload[4] = {0, 0, 0, 0};
+
+        if (!mci->bt_version_known &&
+                        (mci->bt_state != MCI_BT_SLEEP)) {
+                ath_dbg(common, ATH_DBG_MCI, "MCI Send Coex version query\n");
+                MCI_GPM_SET_TYPE_OPCODE(payload,
+                                MCI_GPM_COEX_AGENT, MCI_GPM_COEX_VERSION_QUERY);
+                ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16,
+                                wait_done, true);
+        }
+}
+
+static void ar9003_mci_send_coex_version_response(struct ath_hw *ah,
+                                                     bool wait_done)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u32 payload[4] = {0, 0, 0, 0};
+
+        ath_dbg(common, ATH_DBG_MCI, "MCI Send Coex version response\n");
+        MCI_GPM_SET_TYPE_OPCODE(payload, MCI_GPM_COEX_AGENT,
+                        MCI_GPM_COEX_VERSION_RESPONSE);
+        *(((u8 *)payload) + MCI_GPM_COEX_B_MAJOR_VERSION) =
+                mci->wlan_ver_major;
+        *(((u8 *)payload) + MCI_GPM_COEX_B_MINOR_VERSION) =
+                mci->wlan_ver_minor;
+        ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16, wait_done, true);
+}
+
+static void ar9003_mci_send_coex_wlan_channels(struct ath_hw *ah,
+                                                  bool wait_done)
+{
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u32 *payload = &mci->wlan_channels[0];
+
+        if ((mci->wlan_channels_update == true) &&
+                        (mci->bt_state != MCI_BT_SLEEP)) {
+                MCI_GPM_SET_TYPE_OPCODE(payload,
+                MCI_GPM_COEX_AGENT, MCI_GPM_COEX_WLAN_CHANNELS);
+                ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16,
+                                        wait_done, true);
+                MCI_GPM_SET_TYPE_OPCODE(payload, 0xff, 0xff);
+        }
+}
+
+static void ar9003_mci_send_coex_bt_status_query(struct ath_hw *ah,
+                                                bool wait_done, u8 query_type)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u32 payload[4] = {0, 0, 0, 0};
+        bool query_btinfo = !!(query_type & (MCI_GPM_COEX_QUERY_BT_ALL_INFO |
+                                             MCI_GPM_COEX_QUERY_BT_TOPOLOGY));
+
+        if (mci->bt_state != MCI_BT_SLEEP) {
+
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI Send Coex BT Status Query 0x%02X\n", query_type);
+
+                MCI_GPM_SET_TYPE_OPCODE(payload,
+                                MCI_GPM_COEX_AGENT, MCI_GPM_COEX_STATUS_QUERY);
+
+                *(((u8 *)payload) + MCI_GPM_COEX_B_BT_BITMAP) = query_type;
+                /*
+                 * If bt_status_query message is  not sent successfully,
+                 * then need_flush_btinfo should be set again.
+                 */
+                if (!ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16,
+                                             wait_done, true)) {
+                        if (query_btinfo) {
+                                mci->need_flush_btinfo = true;
+
+                                ath_dbg(common, ATH_DBG_MCI,
+                                        "MCI send bt_status_query fail, "
+                                        "set flush flag again\n");
+                        }
+                }
+
+                if (query_btinfo)
+                        mci->query_bt = false;
+        }
+}
+
+void ar9003_mci_send_coex_halt_bt_gpm(struct ath_hw *ah, bool halt,
+                                      bool wait_done)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u32 payload[4] = {0, 0, 0, 0};
+
+        ath_dbg(common, ATH_DBG_MCI, "MCI Send Coex %s BT GPM.\n",
+                (halt) ? "halt" : "unhalt");
+
+        MCI_GPM_SET_TYPE_OPCODE(payload,
+                                MCI_GPM_COEX_AGENT, MCI_GPM_COEX_HALT_BT_GPM);
+
+        if (halt) {
+                mci->query_bt = true;
+                /* Send next unhalt no matter halt sent or not */
+                mci->unhalt_bt_gpm = true;
+                mci->need_flush_btinfo = true;
+                *(((u8 *)payload) + MCI_GPM_COEX_B_HALT_STATE) =
+                        MCI_GPM_COEX_BT_GPM_HALT;
+        } else
+                *(((u8 *)payload) + MCI_GPM_COEX_B_HALT_STATE) =
+                        MCI_GPM_COEX_BT_GPM_UNHALT;
+
+        ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16, wait_done, true);
+}
+
+
+static void ar9003_mci_prep_interface(struct ath_hw *ah)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u32 saved_mci_int_en;
+        u32 mci_timeout = 150;
+
+        mci->bt_state = MCI_BT_SLEEP;
+        saved_mci_int_en = REG_READ(ah, AR_MCI_INTERRUPT_EN);
+
+        REG_WRITE(ah, AR_MCI_INTERRUPT_EN, 0);
+        REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                  REG_READ(ah, AR_MCI_INTERRUPT_RX_MSG_RAW));
+        REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,
+                  REG_READ(ah, AR_MCI_INTERRUPT_RAW));
+
+        /* Remote Reset */
+        ath_dbg(common, ATH_DBG_MCI, "MCI Reset sequence start\n");
+        ath_dbg(common, ATH_DBG_MCI, "MCI send REMOTE_RESET\n");
+        ar9003_mci_remote_reset(ah, true);
+
+        /*
+         * This delay is required for the reset delay worst case value 255 in
+         * MCI_COMMAND2 register
+         */
+
+        if (AR_SREV_9462_10(ah))
+                udelay(252);
+
+        ath_dbg(common, ATH_DBG_MCI, "MCI Send REQ_WAKE to remoter(BT)\n");
+        ar9003_mci_send_req_wake(ah, true);
+
+        if (ar9003_mci_wait_for_interrupt(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                                AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING, 500)) {
+
+                ath_dbg(common, ATH_DBG_MCI,
+                                "MCI SYS_WAKING from remote(BT)\n");
+                mci->bt_state = MCI_BT_AWAKE;
+
+                if (AR_SREV_9462_10(ah))
+                        udelay(10);
+                /*
+                 * we don't need to send more remote_reset at this moment.
+                 * If BT receive first remote_reset, then BT HW will
+                 * be cleaned up and will be able to receive req_wake
+                 * and BT HW will respond sys_waking.
+                 * In this case, WLAN will receive BT's HW sys_waking.
+                 * Otherwise, if BT SW missed initial remote_reset,
+                 * that remote_reset will still clean up BT MCI RX,
+                 * and the req_wake will wake BT up,
+                 * and BT SW will respond this req_wake with a remote_reset and
+                 * sys_waking. In this case, WLAN will receive BT's SW
+                 * sys_waking. In either case, BT's RX is cleaned up. So we
+                 * don't need to reply BT's remote_reset now, if any.
+                 * Similarly, if in any case, WLAN can receive BT's sys_waking,
+                 * that means WLAN's RX is also fine.
+                 */
+
+                /* Send SYS_WAKING to BT */
+
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI send SW SYS_WAKING to remote BT\n");
+
+                ar9003_mci_send_sys_waking(ah, true);
+                udelay(10);
+
+                /*
+                 * Set BT priority interrupt value to be 0xff to
+                 * avoid having too many BT PRIORITY interrupts.
+                 */
+
+                REG_WRITE(ah, AR_MCI_BT_PRI0, 0xFFFFFFFF);
+                REG_WRITE(ah, AR_MCI_BT_PRI1, 0xFFFFFFFF);
+                REG_WRITE(ah, AR_MCI_BT_PRI2, 0xFFFFFFFF);
+                REG_WRITE(ah, AR_MCI_BT_PRI3, 0xFFFFFFFF);
+                REG_WRITE(ah, AR_MCI_BT_PRI, 0X000000FF);
+
+                /*
+                 * A contention reset will be received after send out
+                 * sys_waking. Also BT priority interrupt bits will be set.
+                 * Clear those bits before the next step.
+                 */
+
+                REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                          AR_MCI_INTERRUPT_RX_MSG_CONT_RST);
+                REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,
+                          AR_MCI_INTERRUPT_BT_PRI);
+
+                if (AR_SREV_9462_10(ah) || mci->is_2g) {
+                        /* Send LNA_TRANS */
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI send LNA_TRANS to BT\n");
+                        ar9003_mci_send_lna_transfer(ah, true);
+                        udelay(5);
+                }
+
+                if (AR_SREV_9462_10(ah) || (mci->is_2g &&
+                                            !mci->update_2g5g)) {
+                        if (ar9003_mci_wait_for_interrupt(ah,
+                                AR_MCI_INTERRUPT_RX_MSG_RAW,
+                                AR_MCI_INTERRUPT_RX_MSG_LNA_INFO,
+                                mci_timeout))
+                                ath_dbg(common, ATH_DBG_MCI,
+                                        "MCI WLAN has control over the LNA & "
+                                        "BT obeys it\n");
+                        else
+                                ath_dbg(common, ATH_DBG_MCI,
+                                        "MCI BT didn't respond to"
+                                        "LNA_TRANS\n");
+                }
+
+                if (AR_SREV_9462_10(ah)) {
+                        /* Send another remote_reset to deassert BT clk_req. */
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI another remote_reset to "
+                                "deassert clk_req\n");
+                        ar9003_mci_remote_reset(ah, true);
+                        udelay(252);
+                }
+        }
+
+        /* Clear the extra redundant SYS_WAKING from BT */
+        if ((mci->bt_state == MCI_BT_AWAKE) &&
+                (REG_READ_FIELD(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                                AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING)) &&
+                (REG_READ_FIELD(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                                AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING) == 0)) {
+
+                        REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                                  AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING);
+                        REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,
+                                  AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE);
+        }
+
+        REG_WRITE(ah, AR_MCI_INTERRUPT_EN, saved_mci_int_en);
+}
+
+void ar9003_mci_disable_interrupt(struct ath_hw *ah)
+{
+        REG_WRITE(ah, AR_MCI_INTERRUPT_EN, 0);
+        REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_EN, 0);
+}
+
+void ar9003_mci_enable_interrupt(struct ath_hw *ah)
+{
+
+        REG_WRITE(ah, AR_MCI_INTERRUPT_EN, AR_MCI_INTERRUPT_DEFAULT);
+        REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_EN,
+                  AR_MCI_INTERRUPT_RX_MSG_DEFAULT);
+}
+
+bool ar9003_mci_check_int(struct ath_hw *ah, u32 ints)
+{
+        u32 intr;
+
+        intr = REG_READ(ah, AR_MCI_INTERRUPT_RX_MSG_RAW);
+        return ((intr & ints) == ints);
+}
+
+void ar9003_mci_get_interrupt(struct ath_hw *ah, u32 *raw_intr,
+                              u32 *rx_msg_intr)
+{
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        *raw_intr = mci->raw_intr;
+        *rx_msg_intr = mci->rx_msg_intr;
+
+        /* Clean int bits after the values are read. */
+        mci->raw_intr = 0;
+        mci->rx_msg_intr = 0;
+}
+EXPORT_SYMBOL(ar9003_mci_get_interrupt);
+
+void ar9003_mci_2g5g_changed(struct ath_hw *ah, bool is_2g)
+{
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+
+        if (!mci->update_2g5g &&
+            (mci->is_2g != is_2g))
+                mci->update_2g5g = true;
+
+        mci->is_2g = is_2g;
+}
+
+static bool ar9003_mci_is_gpm_valid(struct ath_hw *ah, u32 msg_index)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u32 *payload;
+        u32 recv_type, offset;
+
+        if (msg_index == MCI_GPM_INVALID)
+                return false;
+
+        offset = msg_index << 4;
+
+        payload = (u32 *)(mci->gpm_buf + offset);
+        recv_type = MCI_GPM_TYPE(payload);
+
+        if (recv_type == MCI_GPM_RSVD_PATTERN) {
+                ath_dbg(common, ATH_DBG_MCI, "MCI Skip RSVD GPM\n");
+                return false;
+        }
+
+        return true;
+}
+
+static void ar9003_mci_observation_set_up(struct ath_hw *ah)
+{
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        if (mci->config & ATH_MCI_CONFIG_MCI_OBS_MCI) {
+
+                ath9k_hw_cfg_output(ah, 3,
+                                        AR_GPIO_OUTPUT_MUX_AS_MCI_WLAN_DATA);
+                ath9k_hw_cfg_output(ah, 2, AR_GPIO_OUTPUT_MUX_AS_MCI_WLAN_CLK);
+                ath9k_hw_cfg_output(ah, 1, AR_GPIO_OUTPUT_MUX_AS_MCI_BT_DATA);
+                ath9k_hw_cfg_output(ah, 0, AR_GPIO_OUTPUT_MUX_AS_MCI_BT_CLK);
+
+        } else if (mci->config & ATH_MCI_CONFIG_MCI_OBS_TXRX) {
+
+                ath9k_hw_cfg_output(ah, 3, AR_GPIO_OUTPUT_MUX_AS_WL_IN_TX);
+                ath9k_hw_cfg_output(ah, 2, AR_GPIO_OUTPUT_MUX_AS_WL_IN_RX);
+                ath9k_hw_cfg_output(ah, 1, AR_GPIO_OUTPUT_MUX_AS_BT_IN_TX);
+                ath9k_hw_cfg_output(ah, 0, AR_GPIO_OUTPUT_MUX_AS_BT_IN_RX);
+                ath9k_hw_cfg_output(ah, 5, AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
+
+        } else if (mci->config & ATH_MCI_CONFIG_MCI_OBS_BT) {
+
+                ath9k_hw_cfg_output(ah, 3, AR_GPIO_OUTPUT_MUX_AS_BT_IN_TX);
+                ath9k_hw_cfg_output(ah, 2, AR_GPIO_OUTPUT_MUX_AS_BT_IN_RX);
+                ath9k_hw_cfg_output(ah, 1, AR_GPIO_OUTPUT_MUX_AS_MCI_BT_DATA);
+                ath9k_hw_cfg_output(ah, 0, AR_GPIO_OUTPUT_MUX_AS_MCI_BT_CLK);
+
+        } else
+                return;
+
+        REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, AR_GPIO_JTAG_DISABLE);
+
+        if (AR_SREV_9462_20_OR_LATER(ah)) {
+                REG_RMW_FIELD(ah, AR_PHY_GLB_CONTROL,
+                              AR_GLB_DS_JTAG_DISABLE, 1);
+                REG_RMW_FIELD(ah, AR_PHY_GLB_CONTROL,
+                              AR_GLB_WLAN_UART_INTF_EN, 0);
+                REG_SET_BIT(ah, AR_GLB_GPIO_CONTROL,
+                            ATH_MCI_CONFIG_MCI_OBS_GPIO);
+        }
+
+        REG_RMW_FIELD(ah, AR_BTCOEX_CTRL2, AR_BTCOEX_CTRL2_GPIO_OBS_SEL, 0);
+        REG_RMW_FIELD(ah, AR_BTCOEX_CTRL2, AR_BTCOEX_CTRL2_MAC_BB_OBS_SEL, 1);
+        REG_WRITE(ah, AR_OBS, 0x4b);
+        REG_RMW_FIELD(ah, AR_DIAG_SW, AR_DIAG_OBS_PT_SEL1, 0x03);
+        REG_RMW_FIELD(ah, AR_DIAG_SW, AR_DIAG_OBS_PT_SEL2, 0x01);
+        REG_RMW_FIELD(ah, AR_MACMISC, AR_MACMISC_MISC_OBS_BUS_LSB, 0x02);
+        REG_RMW_FIELD(ah, AR_MACMISC, AR_MACMISC_MISC_OBS_BUS_MSB, 0x03);
+        REG_RMW_FIELD(ah, AR_PHY_TEST_CTL_STATUS,
+                      AR_PHY_TEST_CTL_DEBUGPORT_SEL, 0x07);
+}
+
+static bool ar9003_mci_send_coex_bt_flags(struct ath_hw *ah, bool wait_done,
+                                                u8 opcode, u32 bt_flags)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        u32 pld[4] = {0, 0, 0, 0};
+
+        MCI_GPM_SET_TYPE_OPCODE(pld,
+                        MCI_GPM_COEX_AGENT, MCI_GPM_COEX_BT_UPDATE_FLAGS);
+
+        *(((u8 *)pld) + MCI_GPM_COEX_B_BT_FLAGS_OP)  = opcode;
+        *(((u8 *)pld) + MCI_GPM_COEX_W_BT_FLAGS + 0) = bt_flags & 0xFF;
+        *(((u8 *)pld) + MCI_GPM_COEX_W_BT_FLAGS + 1) = (bt_flags >> 8) & 0xFF;
+        *(((u8 *)pld) + MCI_GPM_COEX_W_BT_FLAGS + 2) = (bt_flags >> 16) & 0xFF;
+        *(((u8 *)pld) + MCI_GPM_COEX_W_BT_FLAGS + 3) = (bt_flags >> 24) & 0xFF;
+
+        ath_dbg(common, ATH_DBG_MCI,
+                "MCI BT_MCI_FLAGS: Send Coex BT Update Flags %s 0x%08x\n",
+                (opcode == MCI_GPM_COEX_BT_FLAGS_READ) ? "READ" :
+                ((opcode == MCI_GPM_COEX_BT_FLAGS_SET) ? "SET" : "CLEAR"),
+                                                                bt_flags);
+
+        return ar9003_mci_send_message(ah, MCI_GPM, 0, pld, 16,
+                                                        wait_done, true);
+}
+
+void ar9003_mci_reset(struct ath_hw *ah, bool en_int, bool is_2g,
+                      bool is_full_sleep)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u32 regval, thresh;
+
+        ath_dbg(common, ATH_DBG_MCI, "MCI full_sleep = %d, is_2g = %d\n",
+                is_full_sleep, is_2g);
+
+        /*
+         * GPM buffer and scheduling message buffer are not allocated
+         */
+
+        if (!mci->gpm_addr && !mci->sched_addr) {
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI GPM and schedule buffers are not allocated");
+                return;
+        }
+
+        if (REG_READ(ah, AR_BTCOEX_CTRL) == 0xdeadbeef) {
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI it's deadbeef, quit mci_reset\n");
+                return;
+        }
+
+        /* Program MCI DMA related registers */
+        REG_WRITE(ah, AR_MCI_GPM_0, mci->gpm_addr);
+        REG_WRITE(ah, AR_MCI_GPM_1, mci->gpm_len);
+        REG_WRITE(ah, AR_MCI_SCHD_TABLE_0, mci->sched_addr);
+
+        /*
+        * To avoid MCI state machine be affected by incoming remote MCI msgs,
+        * MCI mode will be enabled later, right before reset the MCI TX and RX.
+        */
+
+        regval = SM(1, AR_BTCOEX_CTRL_AR9462_MODE) |
+                 SM(1, AR_BTCOEX_CTRL_WBTIMER_EN) |
+                 SM(1, AR_BTCOEX_CTRL_PA_SHARED) |
+                 SM(1, AR_BTCOEX_CTRL_LNA_SHARED) |
+                 SM(2, AR_BTCOEX_CTRL_NUM_ANTENNAS) |
+                 SM(3, AR_BTCOEX_CTRL_RX_CHAIN_MASK) |
+                 SM(0, AR_BTCOEX_CTRL_1_CHAIN_ACK) |
+                 SM(0, AR_BTCOEX_CTRL_1_CHAIN_BCN) |
+                 SM(0, AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);
+
+        if (is_2g && (AR_SREV_9462_20(ah)) &&
+                !(mci->config & ATH_MCI_CONFIG_DISABLE_OSLA)) {
+
+                regval |= SM(1, AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);
+                ath_dbg(common, ATH_DBG_MCI,
+                                "MCI sched one step look ahead\n");
+
+                if (!(mci->config &
+                      ATH_MCI_CONFIG_DISABLE_AGGR_THRESH)) {
+
+                        thresh = MS(mci->config,
+                                    ATH_MCI_CONFIG_AGGR_THRESH);
+                        thresh &= 7;
+                        regval |= SM(1,
+                                     AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN);
+                        regval |= SM(thresh, AR_BTCOEX_CTRL_AGGR_THRESH);
+
+                        REG_RMW_FIELD(ah, AR_MCI_SCHD_TABLE_2,
+                                      AR_MCI_SCHD_TABLE_2_HW_BASED, 1);
+                        REG_RMW_FIELD(ah, AR_MCI_SCHD_TABLE_2,
+                                      AR_MCI_SCHD_TABLE_2_MEM_BASED, 1);
+
+                } else
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI sched aggr thresh: off\n");
+        } else
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI SCHED one step look ahead off\n");
+
+        if (AR_SREV_9462_10(ah))
+                regval |= SM(1, AR_BTCOEX_CTRL_SPDT_ENABLE_10);
+
+        REG_WRITE(ah, AR_BTCOEX_CTRL, regval);
+
+        if (AR_SREV_9462_20(ah)) {
+                REG_SET_BIT(ah, AR_PHY_GLB_CONTROL,
+                            AR_BTCOEX_CTRL_SPDT_ENABLE);
+                REG_RMW_FIELD(ah, AR_BTCOEX_CTRL3,
+                              AR_BTCOEX_CTRL3_CONT_INFO_TIMEOUT, 20);
+        }
+
+        REG_RMW_FIELD(ah, AR_BTCOEX_CTRL2, AR_BTCOEX_CTRL2_RX_DEWEIGHT, 1);
+        REG_RMW_FIELD(ah, AR_PCU_MISC, AR_PCU_BT_ANT_PREVENT_RX, 0);
+
+        thresh = MS(mci->config, ATH_MCI_CONFIG_CLK_DIV);
+        REG_RMW_FIELD(ah, AR_MCI_TX_CTRL, AR_MCI_TX_CTRL_CLK_DIV, thresh);
+        REG_SET_BIT(ah, AR_BTCOEX_CTRL, AR_BTCOEX_CTRL_MCI_MODE_EN);
+
+        /* Resetting the Rx and Tx paths of MCI */
+        regval = REG_READ(ah, AR_MCI_COMMAND2);
+        regval |= SM(1, AR_MCI_COMMAND2_RESET_TX);
+        REG_WRITE(ah, AR_MCI_COMMAND2, regval);
+
+        udelay(1);
+
+        regval &= ~SM(1, AR_MCI_COMMAND2_RESET_TX);
+        REG_WRITE(ah, AR_MCI_COMMAND2, regval);
+
+        if (is_full_sleep) {
+                ar9003_mci_mute_bt(ah);
+                udelay(100);
+        }
+
+        regval |= SM(1, AR_MCI_COMMAND2_RESET_RX);
+        REG_WRITE(ah, AR_MCI_COMMAND2, regval);
+        udelay(1);
+        regval &= ~SM(1, AR_MCI_COMMAND2_RESET_RX);
+        REG_WRITE(ah, AR_MCI_COMMAND2, regval);
+
+        ar9003_mci_state(ah, MCI_STATE_INIT_GPM_OFFSET, NULL);
+        REG_WRITE(ah, AR_MCI_MSG_ATTRIBUTES_TABLE,
+                  (SM(0xe801, AR_MCI_MSG_ATTRIBUTES_TABLE_INVALID_HDR) |
+                   SM(0x0000, AR_MCI_MSG_ATTRIBUTES_TABLE_CHECKSUM)));
+
+        REG_CLR_BIT(ah, AR_MCI_TX_CTRL,
+                        AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
+
+        if (AR_SREV_9462_20_OR_LATER(ah))
+                ar9003_mci_observation_set_up(ah);
+
+        mci->ready = true;
+        ar9003_mci_prep_interface(ah);
+
+        if (en_int)
+                ar9003_mci_enable_interrupt(ah);
+}
+
+void ar9003_mci_mute_bt(struct ath_hw *ah)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+
+        /* disable all MCI messages */
+        REG_WRITE(ah, AR_MCI_MSG_ATTRIBUTES_TABLE, 0xffff0000);
+        REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS0, 0xffffffff);
+        REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS1, 0xffffffff);
+        REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS2, 0xffffffff);
+        REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS3, 0xffffffff);
+        REG_SET_BIT(ah, AR_MCI_TX_CTRL, AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
+
+        /* wait pending HW messages to flush out */
+        udelay(10);
+
+        /*
+         * Send LNA_TAKE and SYS_SLEEPING when
+         * 1. reset not after resuming from full sleep
+         * 2. before reset MCI RX, to quiet BT and avoid MCI RX misalignment
+         */
+
+        ath_dbg(common, ATH_DBG_MCI, "MCI Send LNA take\n");
+        ar9003_mci_send_lna_take(ah, true);
+
+        udelay(5);
+
+        ath_dbg(common, ATH_DBG_MCI, "MCI Send sys sleeping\n");
+        ar9003_mci_send_sys_sleeping(ah, true);
+}
+
+void ar9003_mci_sync_bt_state(struct ath_hw *ah)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u32 cur_bt_state;
+
+        cur_bt_state = ar9003_mci_state(ah, MCI_STATE_REMOTE_SLEEP, NULL);
+
+        if (mci->bt_state != cur_bt_state) {
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI BT state mismatches. old: %d, new: %d\n",
+                        mci->bt_state, cur_bt_state);
+                mci->bt_state = cur_bt_state;
+        }
+
+        if (mci->bt_state != MCI_BT_SLEEP) {
+
+                ar9003_mci_send_coex_version_query(ah, true);
+                ar9003_mci_send_coex_wlan_channels(ah, true);
+
+                if (mci->unhalt_bt_gpm == true) {
+                        ath_dbg(common, ATH_DBG_MCI, "MCI unhalt BT GPM");
+                        ar9003_mci_send_coex_halt_bt_gpm(ah, false, true);
+                }
+        }
+}
+
+static void ar9003_mci_send_2g5g_status(struct ath_hw *ah, bool wait_done)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u32 new_flags, to_set, to_clear;
+
+        if (AR_SREV_9462_20(ah) &&
+            mci->update_2g5g &&
+            (mci->bt_state != MCI_BT_SLEEP)) {
+
+                if (mci->is_2g) {
+                        new_flags = MCI_2G_FLAGS;
+                        to_clear = MCI_2G_FLAGS_CLEAR_MASK;
+                        to_set = MCI_2G_FLAGS_SET_MASK;
+                } else {
+                        new_flags = MCI_5G_FLAGS;
+                        to_clear = MCI_5G_FLAGS_CLEAR_MASK;
+                        to_set = MCI_5G_FLAGS_SET_MASK;
+                }
+
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI BT_MCI_FLAGS: %s 0x%08x clr=0x%08x, set=0x%08x\n",
+                mci->is_2g ? "2G" : "5G", new_flags, to_clear, to_set);
+
+                if (to_clear)
+                        ar9003_mci_send_coex_bt_flags(ah, wait_done,
+                                        MCI_GPM_COEX_BT_FLAGS_CLEAR, to_clear);
+
+                if (to_set)
+                        ar9003_mci_send_coex_bt_flags(ah, wait_done,
+                                        MCI_GPM_COEX_BT_FLAGS_SET, to_set);
+        }
+
+        if (AR_SREV_9462_10(ah) && (mci->bt_state != MCI_BT_SLEEP))
+                mci->update_2g5g = false;
+}
+
+static void ar9003_mci_queue_unsent_gpm(struct ath_hw *ah, u8 header,
+                                        u32 *payload, bool queue)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u8 type, opcode;
+
+        if (queue) {
+
+                if (payload)
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI ERROR: Send fail: %02x: %02x %02x %02x\n",
+                                header,
+                                *(((u8 *)payload) + 4),
+                                *(((u8 *)payload) + 5),
+                                *(((u8 *)payload) + 6));
+                else
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI ERROR: Send fail: %02x\n", header);
+        }
+
+        /* check if the message is to be queued */
+        if (header != MCI_GPM)
+                return;
+
+        type = MCI_GPM_TYPE(payload);
+        opcode = MCI_GPM_OPCODE(payload);
+
+        if (type != MCI_GPM_COEX_AGENT)
+                return;
+
+        switch (opcode) {
+        case MCI_GPM_COEX_BT_UPDATE_FLAGS:
+
+                if (AR_SREV_9462_10(ah))
+                        break;
+
+                if (*(((u8 *)payload) + MCI_GPM_COEX_B_BT_FLAGS_OP) ==
+                                MCI_GPM_COEX_BT_FLAGS_READ)
+                        break;
+
+                mci->update_2g5g = queue;
+
+                if (queue)
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI BT_MCI_FLAGS: 2G5G status <queued> %s.\n",
+                                mci->is_2g ? "2G" : "5G");
+                else
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI BT_MCI_FLAGS: 2G5G status <sent> %s.\n",
+                                mci->is_2g ? "2G" : "5G");
+
+                break;
+
+        case MCI_GPM_COEX_WLAN_CHANNELS:
+
+                mci->wlan_channels_update = queue;
+                if (queue)
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI WLAN channel map <queued>\n");
+                else
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI WLAN channel map <sent>\n");
+                break;
+
+        case MCI_GPM_COEX_HALT_BT_GPM:
+
+                if (*(((u8 *)payload) + MCI_GPM_COEX_B_HALT_STATE) ==
+                                MCI_GPM_COEX_BT_GPM_UNHALT) {
+
+                        mci->unhalt_bt_gpm = queue;
+
+                        if (queue)
+                                ath_dbg(common, ATH_DBG_MCI,
+                                        "MCI UNHALT BT GPM <queued>\n");
+                        else {
+                                mci->halted_bt_gpm = false;
+                                ath_dbg(common, ATH_DBG_MCI,
+                                        "MCI UNHALT BT GPM <sent>\n");
+                        }
+                }
+
+                if (*(((u8 *)payload) + MCI_GPM_COEX_B_HALT_STATE) ==
+                                MCI_GPM_COEX_BT_GPM_HALT) {
+
+                        mci->halted_bt_gpm = !queue;
+
+                        if (queue)
+                                ath_dbg(common, ATH_DBG_MCI,
+                                        "MCI HALT BT GPM <not sent>\n");
+                        else
+                                ath_dbg(common, ATH_DBG_MCI,
+                                        "MCI UNHALT BT GPM <sent>\n");
+                }
+
+                break;
+        default:
+                break;
+        }
+}
+
+void ar9003_mci_2g5g_switch(struct ath_hw *ah, bool wait_done)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+
+        if (mci->update_2g5g) {
+                if (mci->is_2g) {
+
+                        ar9003_mci_send_2g5g_status(ah, true);
+                        ath_dbg(common, ATH_DBG_MCI, "MCI Send LNA trans\n");
+                        ar9003_mci_send_lna_transfer(ah, true);
+                        udelay(5);
+
+                        REG_CLR_BIT(ah, AR_MCI_TX_CTRL,
+                                    AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
+
+                        if (AR_SREV_9462_20(ah)) {
+                                REG_CLR_BIT(ah, AR_PHY_GLB_CONTROL,
+                                            AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);
+                                if (!(mci->config &
+                                      ATH_MCI_CONFIG_DISABLE_OSLA)) {
+                                        REG_SET_BIT(ah, AR_BTCOEX_CTRL,
+                                        AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);
+                                }
+                        }
+                } else {
+                        ath_dbg(common, ATH_DBG_MCI, "MCI Send LNA take\n");
+                        ar9003_mci_send_lna_take(ah, true);
+                        udelay(5);
+
+                        REG_SET_BIT(ah, AR_MCI_TX_CTRL,
+                                    AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
+
+                        if (AR_SREV_9462_20(ah)) {
+                                REG_SET_BIT(ah, AR_PHY_GLB_CONTROL,
+                                            AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);
+                                REG_CLR_BIT(ah, AR_BTCOEX_CTRL,
+                                        AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);
+                        }
+
+                        ar9003_mci_send_2g5g_status(ah, true);
+                }
+        }
+}
+
+bool ar9003_mci_send_message(struct ath_hw *ah, u8 header, u32 flag,
+                             u32 *payload, u8 len, bool wait_done,
+                             bool check_bt)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        bool msg_sent = false;
+        u32 regval;
+        u32 saved_mci_int_en;
+        int i;
+
+        saved_mci_int_en = REG_READ(ah, AR_MCI_INTERRUPT_EN);
+        regval = REG_READ(ah, AR_BTCOEX_CTRL);
+
+        if ((regval == 0xdeadbeef) || !(regval & AR_BTCOEX_CTRL_MCI_MODE_EN)) {
+
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI Not sending 0x%x. MCI is not enabled. "
+                        "full_sleep = %d\n", header,
+                        (ah->power_mode == ATH9K_PM_FULL_SLEEP) ? 1 : 0);
+
+                ar9003_mci_queue_unsent_gpm(ah, header, payload, true);
+                return false;
+
+        } else if (check_bt && (mci->bt_state == MCI_BT_SLEEP)) {
+
+                ath_dbg(common, ATH_DBG_MCI,
+                "MCI Don't send message 0x%x. BT is in sleep state\n", header);
+
+                ar9003_mci_queue_unsent_gpm(ah, header, payload, true);
+                return false;
+        }
+
+        if (wait_done)
+                REG_WRITE(ah, AR_MCI_INTERRUPT_EN, 0);
+
+        /* Need to clear SW_MSG_DONE raw bit before wait */
+
+        REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,
+                  (AR_MCI_INTERRUPT_SW_MSG_DONE |
+                   AR_MCI_INTERRUPT_MSG_FAIL_MASK));
+
+        if (payload) {
+                for (i = 0; (i * 4) < len; i++)
+                        REG_WRITE(ah, (AR_MCI_TX_PAYLOAD0 + i * 4),
+                                  *(payload + i));
+        }
+
+        REG_WRITE(ah, AR_MCI_COMMAND0,
+                  (SM((flag & MCI_FLAG_DISABLE_TIMESTAMP),
+                      AR_MCI_COMMAND0_DISABLE_TIMESTAMP) |
+                   SM(len, AR_MCI_COMMAND0_LEN) |
+                   SM(header, AR_MCI_COMMAND0_HEADER)));
+
+        if (wait_done &&
+            !(ar9003_mci_wait_for_interrupt(ah, AR_MCI_INTERRUPT_RAW,
+                                        AR_MCI_INTERRUPT_SW_MSG_DONE, 500)))
+                ar9003_mci_queue_unsent_gpm(ah, header, payload, true);
+        else {
+                ar9003_mci_queue_unsent_gpm(ah, header, payload, false);
+                msg_sent = true;
+        }
+
+        if (wait_done)
+                REG_WRITE(ah, AR_MCI_INTERRUPT_EN, saved_mci_int_en);
+
+        return msg_sent;
+}
+EXPORT_SYMBOL(ar9003_mci_send_message);
+
+void ar9003_mci_setup(struct ath_hw *ah, u32 gpm_addr, void *gpm_buf,
+                      u16 len, u32 sched_addr)
+{
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        void *sched_buf = (void *)((char *) gpm_buf + (sched_addr - gpm_addr));
+
+        mci->gpm_addr = gpm_addr;
+        mci->gpm_buf = gpm_buf;
+        mci->gpm_len = len;
+        mci->sched_addr = sched_addr;
+        mci->sched_buf = sched_buf;
+
+        ar9003_mci_reset(ah, true, true, true);
+}
+EXPORT_SYMBOL(ar9003_mci_setup);
+
+void ar9003_mci_cleanup(struct ath_hw *ah)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+
+        /* Turn off MCI and Jupiter mode. */
+        REG_WRITE(ah, AR_BTCOEX_CTRL, 0x00);
+        ath_dbg(common, ATH_DBG_MCI, "MCI ar9003_mci_cleanup\n");
+        ar9003_mci_disable_interrupt(ah);
+}
+EXPORT_SYMBOL(ar9003_mci_cleanup);
+
+static void ar9003_mci_process_gpm_extra(struct ath_hw *ah, u8 gpm_type,
+                                         u8 gpm_opcode, u32 *p_gpm)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u8 *p_data = (u8 *) p_gpm;
+
+        if (gpm_type != MCI_GPM_COEX_AGENT)
+                return;
+
+        switch (gpm_opcode) {
+        case MCI_GPM_COEX_VERSION_QUERY:
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI Recv GPM COEX Version Query\n");
+                ar9003_mci_send_coex_version_response(ah, true);
+                break;
+        case MCI_GPM_COEX_VERSION_RESPONSE:
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI Recv GPM COEX Version Response\n");
+                mci->bt_ver_major =
+                        *(p_data + MCI_GPM_COEX_B_MAJOR_VERSION);
+                mci->bt_ver_minor =
+                        *(p_data + MCI_GPM_COEX_B_MINOR_VERSION);
+                mci->bt_version_known = true;
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI BT Coex version: %d.%d\n",
+                        mci->bt_ver_major,
+                        mci->bt_ver_minor);
+                break;
+        case MCI_GPM_COEX_STATUS_QUERY:
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI Recv GPM COEX Status Query = 0x%02X.\n",
+                        *(p_data + MCI_GPM_COEX_B_WLAN_BITMAP));
+                mci->wlan_channels_update = true;
+                ar9003_mci_send_coex_wlan_channels(ah, true);
+                break;
+        case MCI_GPM_COEX_BT_PROFILE_INFO:
+                mci->query_bt = true;
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI Recv GPM COEX BT_Profile_Info\n");
+                break;
+        case MCI_GPM_COEX_BT_STATUS_UPDATE:
+                mci->query_bt = true;
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI Recv GPM COEX BT_Status_Update "
+                        "SEQ=%d (drop&query)\n", *(p_gpm + 3));
+                break;
+        default:
+                break;
+        }
+}
+
+u32 ar9003_mci_wait_for_gpm(struct ath_hw *ah, u8 gpm_type,
+                            u8 gpm_opcode, int time_out)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u32 *p_gpm = NULL, mismatch = 0, more_data;
+        u32 offset;
+        u8 recv_type = 0, recv_opcode = 0;
+        bool b_is_bt_cal_done = (gpm_type == MCI_GPM_BT_CAL_DONE);
+
+        more_data = time_out ? MCI_GPM_NOMORE : MCI_GPM_MORE;
+
+        while (time_out > 0) {
+                if (p_gpm) {
+                        MCI_GPM_RECYCLE(p_gpm);
+                        p_gpm = NULL;
+                }
+
+                if (more_data != MCI_GPM_MORE)
+                        time_out = ar9003_mci_wait_for_interrupt(ah,
+                                        AR_MCI_INTERRUPT_RX_MSG_RAW,
+                                        AR_MCI_INTERRUPT_RX_MSG_GPM,
+                                        time_out);
+
+                if (!time_out)
+                        break;
+
+                offset = ar9003_mci_state(ah,
+                                MCI_STATE_NEXT_GPM_OFFSET, &more_data);
+
+                if (offset == MCI_GPM_INVALID)
+                        continue;
+
+                p_gpm = (u32 *) (mci->gpm_buf + offset);
+                recv_type = MCI_GPM_TYPE(p_gpm);
+                recv_opcode = MCI_GPM_OPCODE(p_gpm);
+
+                if (MCI_GPM_IS_CAL_TYPE(recv_type)) {
+
+                        if (recv_type == gpm_type) {
+
+                                if ((gpm_type == MCI_GPM_BT_CAL_DONE) &&
+                                    !b_is_bt_cal_done) {
+                                        gpm_type = MCI_GPM_BT_CAL_GRANT;
+                                        ath_dbg(common, ATH_DBG_MCI,
+                                                "MCI Recv BT_CAL_DONE"
+                                                "wait BT_CAL_GRANT\n");
+                                        continue;
+                                }
+
+                                break;
+                        }
+                } else if ((recv_type == gpm_type) &&
+                           (recv_opcode == gpm_opcode))
+                        break;
+
+                /* not expected message */
+
+                /*
+                 * check if it's cal_grant
+                 *
+                 * When we're waiting for cal_grant in reset routine,
+                 * it's possible that BT sends out cal_request at the
+                 * same time. Since BT's calibration doesn't happen
+                 * that often, we'll let BT completes calibration then
+                 * we continue to wait for cal_grant from BT.
+                 * Orginal: Wait BT_CAL_GRANT.
+                 * New: Receive BT_CAL_REQ -> send WLAN_CAL_GRANT->wait
+                 * BT_CAL_DONE -> Wait BT_CAL_GRANT.
+                 */
+
+                if ((gpm_type == MCI_GPM_BT_CAL_GRANT) &&
+                    (recv_type == MCI_GPM_BT_CAL_REQ)) {
+
+                        u32 payload[4] = {0, 0, 0, 0};
+
+                        gpm_type = MCI_GPM_BT_CAL_DONE;
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI Rcv BT_CAL_REQ, send WLAN_CAL_GRANT\n");
+
+                        MCI_GPM_SET_CAL_TYPE(payload,
+                                        MCI_GPM_WLAN_CAL_GRANT);
+
+                        ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16,
+                                                false, false);
+
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI now wait for BT_CAL_DONE\n");
+
+                        continue;
+                } else {
+                        ath_dbg(common, ATH_DBG_MCI, "MCI GPM subtype"
+                                        "not match 0x%x\n", *(p_gpm + 1));
+                        mismatch++;
+                        ar9003_mci_process_gpm_extra(ah, recv_type,
+                                        recv_opcode, p_gpm);
+                }
+        }
+        if (p_gpm) {
+                MCI_GPM_RECYCLE(p_gpm);
+                p_gpm = NULL;
+        }
+
+        if (time_out <= 0) {
+                time_out = 0;
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI GPM received timeout, mismatch = %d\n", mismatch);
+        } else
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI Receive GPM type=0x%x, code=0x%x\n",
+                        gpm_type, gpm_opcode);
+
+        while (more_data == MCI_GPM_MORE) {
+
+                ath_dbg(common, ATH_DBG_MCI, "MCI discard remaining GPM\n");
+                offset = ar9003_mci_state(ah, MCI_STATE_NEXT_GPM_OFFSET,
+                                          &more_data);
+
+                if (offset == MCI_GPM_INVALID)
+                        break;
+
+                p_gpm = (u32 *) (mci->gpm_buf + offset);
+                recv_type = MCI_GPM_TYPE(p_gpm);
+                recv_opcode = MCI_GPM_OPCODE(p_gpm);
+
+                if (!MCI_GPM_IS_CAL_TYPE(recv_type))
+                        ar9003_mci_process_gpm_extra(ah, recv_type,
+                                                     recv_opcode, p_gpm);
+
+                MCI_GPM_RECYCLE(p_gpm);
+        }
+
+        return time_out;
+}
+
+u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type, u32 *p_data)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+        u32 value = 0, more_gpm = 0, gpm_ptr;
+        u8 query_type;
+
+        switch (state_type) {
+        case MCI_STATE_ENABLE:
+                if (mci->ready) {
+
+                        value = REG_READ(ah, AR_BTCOEX_CTRL);
+
+                        if ((value == 0xdeadbeef) || (value == 0xffffffff))
+                                value = 0;
+                }
+                value &= AR_BTCOEX_CTRL_MCI_MODE_EN;
+                break;
+        case MCI_STATE_INIT_GPM_OFFSET:
+                value = MS(REG_READ(ah, AR_MCI_GPM_1), AR_MCI_GPM_WRITE_PTR);
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI GPM initial WRITE_PTR=%d\n", value);
+                mci->gpm_idx = value;
+                break;
+        case MCI_STATE_NEXT_GPM_OFFSET:
+        case MCI_STATE_LAST_GPM_OFFSET:
+                /*
+                * This could be useful to avoid new GPM message interrupt which
+                * may lead to spurious interrupt after power sleep, or multiple
+                * entry of ath_mci_intr().
+                * Adding empty GPM check by returning HAL_MCI_GPM_INVALID can
+                * alleviate this effect, but clearing GPM RX interrupt bit is
+                * safe, because whether this is called from hw or driver code
+                * there must be an interrupt bit set/triggered initially
+                */
+                REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                          AR_MCI_INTERRUPT_RX_MSG_GPM);
+
+                gpm_ptr = MS(REG_READ(ah, AR_MCI_GPM_1), AR_MCI_GPM_WRITE_PTR);
+                value = gpm_ptr;
+
+                if (value == 0)
+                        value = mci->gpm_len - 1;
+                else if (value >= mci->gpm_len) {
+                        if (value != 0xFFFF) {
+                                value = 0;
+                                ath_dbg(common, ATH_DBG_MCI, "MCI GPM offset"
+                                        "out of range\n");
+                        }
+                } else
+                        value--;
+
+                if (value == 0xFFFF) {
+                        value = MCI_GPM_INVALID;
+                        more_gpm = MCI_GPM_NOMORE;
+                        ath_dbg(common, ATH_DBG_MCI, "MCI GPM ptr invalid"
+                                "@ptr=%d, offset=%d, more=GPM_NOMORE\n",
+                                gpm_ptr, value);
+                } else if (state_type == MCI_STATE_NEXT_GPM_OFFSET) {
+
+                        if (gpm_ptr == mci->gpm_idx) {
+                                value = MCI_GPM_INVALID;
+                                more_gpm = MCI_GPM_NOMORE;
+
+                                ath_dbg(common, ATH_DBG_MCI, "MCI GPM message"
+                                        "not available @ptr=%d, @offset=%d,"
+                                        "more=GPM_NOMORE\n", gpm_ptr, value);
+                        } else {
+                                for (;;) {
+
+                                        u32 temp_index;
+
+                                        /* skip reserved GPM if any */
+
+                                        if (value != mci->gpm_idx)
+                                                more_gpm = MCI_GPM_MORE;
+                                        else
+                                                more_gpm = MCI_GPM_NOMORE;
+
+                                        temp_index = mci->gpm_idx;
+                                        mci->gpm_idx++;
+
+                                        if (mci->gpm_idx >=
+                                            mci->gpm_len)
+                                                mci->gpm_idx = 0;
+
+                                        ath_dbg(common, ATH_DBG_MCI,
+                                                "MCI GPM message got ptr=%d,"
+                                                "@offset=%d, more=%d\n",
+                                                gpm_ptr, temp_index,
+                                                (more_gpm == MCI_GPM_MORE));
+
+                                        if (ar9003_mci_is_gpm_valid(ah,
+                                                                temp_index)) {
+                                                value = temp_index;
+                                                break;
+                                        }
+
+                                        if (more_gpm == MCI_GPM_NOMORE) {
+                                                value = MCI_GPM_INVALID;
+                                                break;
+                                        }
+                                }
+                        }
+                        if (p_data)
+                                *p_data = more_gpm;
+                        }
+
+                        if (value != MCI_GPM_INVALID)
+                                value <<= 4;
+
+                        break;
+        case MCI_STATE_LAST_SCHD_MSG_OFFSET:
+                value = MS(REG_READ(ah, AR_MCI_RX_STATUS),
+                                    AR_MCI_RX_LAST_SCHD_MSG_INDEX);
+                /* Make it in bytes */
+                value <<= 4;
+                break;
+
+        case MCI_STATE_REMOTE_SLEEP:
+                value = MS(REG_READ(ah, AR_MCI_RX_STATUS),
+                           AR_MCI_RX_REMOTE_SLEEP) ?
+                        MCI_BT_SLEEP : MCI_BT_AWAKE;
+                break;
+
+        case MCI_STATE_CONT_RSSI_POWER:
+                value = MS(mci->cont_status, AR_MCI_CONT_RSSI_POWER);
+                        break;
+
+        case MCI_STATE_CONT_PRIORITY:
+                value = MS(mci->cont_status, AR_MCI_CONT_RRIORITY);
+                break;
+
+        case MCI_STATE_CONT_TXRX:
+                value = MS(mci->cont_status, AR_MCI_CONT_TXRX);
+                break;
+
+        case MCI_STATE_BT:
+                value = mci->bt_state;
+                break;
+
+        case MCI_STATE_SET_BT_SLEEP:
+                mci->bt_state = MCI_BT_SLEEP;
+                break;
+
+        case MCI_STATE_SET_BT_AWAKE:
+                mci->bt_state = MCI_BT_AWAKE;
+                ar9003_mci_send_coex_version_query(ah, true);
+                ar9003_mci_send_coex_wlan_channels(ah, true);
+
+                if (mci->unhalt_bt_gpm) {
+
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI unhalt BT GPM\n");
+                        ar9003_mci_send_coex_halt_bt_gpm(ah, false, true);
+                }
+
+                ar9003_mci_2g5g_switch(ah, true);
+                break;
+
+        case MCI_STATE_SET_BT_CAL_START:
+                mci->bt_state = MCI_BT_CAL_START;
+                break;
+
+        case MCI_STATE_SET_BT_CAL:
+                mci->bt_state = MCI_BT_CAL;
+                break;
+
+        case MCI_STATE_RESET_REQ_WAKE:
+                ar9003_mci_reset_req_wakeup(ah);
+                mci->update_2g5g = true;
+
+                if ((AR_SREV_9462_20_OR_LATER(ah)) &&
+                    (mci->config & ATH_MCI_CONFIG_MCI_OBS_MASK)) {
+                        /* Check if we still have control of the GPIOs */
+                        if ((REG_READ(ah, AR_GLB_GPIO_CONTROL) &
+                                      ATH_MCI_CONFIG_MCI_OBS_GPIO) !=
+                                        ATH_MCI_CONFIG_MCI_OBS_GPIO) {
+
+                                ath_dbg(common, ATH_DBG_MCI,
+                                        "MCI reconfigure observation");
+                                ar9003_mci_observation_set_up(ah);
+                        }
+                }
+                break;
+
+        case MCI_STATE_SEND_WLAN_COEX_VERSION:
+                ar9003_mci_send_coex_version_response(ah, true);
+                break;
+
+        case MCI_STATE_SET_BT_COEX_VERSION:
+
+                if (!p_data)
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI Set BT Coex version with NULL data!!\n");
+                else {
+                        mci->bt_ver_major = (*p_data >> 8) & 0xff;
+                        mci->bt_ver_minor = (*p_data) & 0xff;
+                        mci->bt_version_known = true;
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI BT version set: %d.%d\n",
+                                mci->bt_ver_major,
+                                mci->bt_ver_minor);
+                }
+                break;
+
+        case MCI_STATE_SEND_WLAN_CHANNELS:
+                if (p_data) {
+                        if (((mci->wlan_channels[1] & 0xffff0000) ==
+                             (*(p_data + 1) & 0xffff0000)) &&
+                            (mci->wlan_channels[2] == *(p_data + 2)) &&
+                            (mci->wlan_channels[3] == *(p_data + 3)))
+                                break;
+
+                        mci->wlan_channels[0] = *p_data++;
+                        mci->wlan_channels[1] = *p_data++;
+                        mci->wlan_channels[2] = *p_data++;
+                        mci->wlan_channels[3] = *p_data++;
+                }
+                mci->wlan_channels_update = true;
+                ar9003_mci_send_coex_wlan_channels(ah, true);
+                break;
+
+        case MCI_STATE_SEND_VERSION_QUERY:
+                ar9003_mci_send_coex_version_query(ah, true);
+                break;
+
+        case MCI_STATE_SEND_STATUS_QUERY:
+                query_type = (AR_SREV_9462_10(ah)) ?
+                                MCI_GPM_COEX_QUERY_BT_ALL_INFO :
+                                MCI_GPM_COEX_QUERY_BT_TOPOLOGY;
+
+                ar9003_mci_send_coex_bt_status_query(ah, true, query_type);
+                break;
+
+        case MCI_STATE_NEED_FLUSH_BT_INFO:
+                        /*
+                         * btcoex_hw.mci.unhalt_bt_gpm means whether it's
+                         * needed to send UNHALT message. It's set whenever
+                         * there's a request to send HALT message.
+                         * mci_halted_bt_gpm means whether HALT message is sent
+                         * out successfully.
+                         *
+                         * Checking (mci_unhalt_bt_gpm == false) instead of
+                         * checking (ah->mci_halted_bt_gpm == false) will make
+                         * sure currently is in UNHALT-ed mode and BT can
+                         * respond to status query.
+                         */
+                        value = (!mci->unhalt_bt_gpm &&
+                                 mci->need_flush_btinfo) ? 1 : 0;
+                        if (p_data)
+                                mci->need_flush_btinfo =
+                                        (*p_data != 0) ? true : false;
+                        break;
+
+        case MCI_STATE_RECOVER_RX:
+
+                ath_dbg(common, ATH_DBG_MCI, "MCI hw RECOVER_RX\n");
+                ar9003_mci_prep_interface(ah);
+                mci->query_bt = true;
+                mci->need_flush_btinfo = true;
+                ar9003_mci_send_coex_wlan_channels(ah, true);
+                ar9003_mci_2g5g_switch(ah, true);
+                break;
+
+        case MCI_STATE_NEED_FTP_STOMP:
+                value = !(mci->config & ATH_MCI_CONFIG_DISABLE_FTP_STOMP);
+                break;
+
+        case MCI_STATE_NEED_TUNING:
+                value = !(mci->config & ATH_MCI_CONFIG_DISABLE_TUNING);
+                break;
+
+        default:
+                break;
+
+        }
+
+        return value;
+}
+EXPORT_SYMBOL(ar9003_mci_state);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.h b/drivers/net/wireless/ath/ath9k/ar9003_mci.h
new file mode 100644
index 000000000000..798da116a44c
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2010-2011 Atheros Communications Inc.
+ *
+ * Permission to use, copy, modify, and/or 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 AR9003_MCI_H
+#define AR9003_MCI_H
+
+#define MCI_FLAG_DISABLE_TIMESTAMP      0x00000001      /* Disable time stamp */
+
+/* Default remote BT device MCI COEX version */
+#define MCI_GPM_COEX_MAJOR_VERSION_DEFAULT  3
+#define MCI_GPM_COEX_MINOR_VERSION_DEFAULT  0
+
+/* Local WLAN MCI COEX version */
+#define MCI_GPM_COEX_MAJOR_VERSION_WLAN     3
+#define MCI_GPM_COEX_MINOR_VERSION_WLAN     0
+
+enum mci_gpm_coex_query_type {
+        MCI_GPM_COEX_QUERY_BT_ALL_INFO      = BIT(0),
+        MCI_GPM_COEX_QUERY_BT_TOPOLOGY      = BIT(1),
+        MCI_GPM_COEX_QUERY_BT_DEBUG         = BIT(2),
+};
+
+enum mci_gpm_coex_halt_bt_gpm {
+        MCI_GPM_COEX_BT_GPM_UNHALT,
+        MCI_GPM_COEX_BT_GPM_HALT
+};
+
+enum mci_gpm_coex_bt_update_flags_op {
+        MCI_GPM_COEX_BT_FLAGS_READ,
+        MCI_GPM_COEX_BT_FLAGS_SET,
+        MCI_GPM_COEX_BT_FLAGS_CLEAR
+};
+
+#define MCI_NUM_BT_CHANNELS     79
+
+#define MCI_BT_MCI_FLAGS_UPDATE_CORR          0x00000002
+#define MCI_BT_MCI_FLAGS_UPDATE_HDR           0x00000004
+#define MCI_BT_MCI_FLAGS_UPDATE_PLD           0x00000008
+#define MCI_BT_MCI_FLAGS_LNA_CTRL             0x00000010
+#define MCI_BT_MCI_FLAGS_DEBUG                0x00000020
+#define MCI_BT_MCI_FLAGS_SCHED_MSG            0x00000040
+#define MCI_BT_MCI_FLAGS_CONT_MSG             0x00000080
+#define MCI_BT_MCI_FLAGS_COEX_GPM             0x00000100
+#define MCI_BT_MCI_FLAGS_CPU_INT_MSG          0x00000200
+#define MCI_BT_MCI_FLAGS_MCI_MODE             0x00000400
+#define MCI_BT_MCI_FLAGS_AR9462_MODE          0x00001000
+#define MCI_BT_MCI_FLAGS_OTHER                0x00010000
+
+#define MCI_DEFAULT_BT_MCI_FLAGS              0x00011dde
+
+#define MCI_TOGGLE_BT_MCI_FLAGS  (MCI_BT_MCI_FLAGS_UPDATE_CORR | \
+                                  MCI_BT_MCI_FLAGS_UPDATE_HDR  | \
+                                  MCI_BT_MCI_FLAGS_UPDATE_PLD  | \
+                                  MCI_BT_MCI_FLAGS_MCI_MODE)
+
+#define MCI_2G_FLAGS_CLEAR_MASK   0x00000000
+#define MCI_2G_FLAGS_SET_MASK     MCI_TOGGLE_BT_MCI_FLAGS
+#define MCI_2G_FLAGS              MCI_DEFAULT_BT_MCI_FLAGS
+
+#define MCI_5G_FLAGS_CLEAR_MASK   MCI_TOGGLE_BT_MCI_FLAGS
+#define MCI_5G_FLAGS_SET_MASK     0x00000000
+#define MCI_5G_FLAGS              (MCI_DEFAULT_BT_MCI_FLAGS & \
+                                   ~MCI_TOGGLE_BT_MCI_FLAGS)
+
+/*
+ * Default value for AR9462 is 0x00002201
+ */
+#define ATH_MCI_CONFIG_CONCUR_TX            0x00000003
+#define ATH_MCI_CONFIG_MCI_OBS_MCI          0x00000004
+#define ATH_MCI_CONFIG_MCI_OBS_TXRX         0x00000008
+#define ATH_MCI_CONFIG_MCI_OBS_BT           0x00000010
+#define ATH_MCI_CONFIG_DISABLE_MCI_CAL      0x00000020
+#define ATH_MCI_CONFIG_DISABLE_OSLA         0x00000040
+#define ATH_MCI_CONFIG_DISABLE_FTP_STOMP    0x00000080
+#define ATH_MCI_CONFIG_AGGR_THRESH          0x00000700
+#define ATH_MCI_CONFIG_AGGR_THRESH_S        8
+#define ATH_MCI_CONFIG_DISABLE_AGGR_THRESH  0x00000800
+#define ATH_MCI_CONFIG_CLK_DIV              0x00003000
+#define ATH_MCI_CONFIG_CLK_DIV_S            12
+#define ATH_MCI_CONFIG_DISABLE_TUNING       0x00004000
+#define ATH_MCI_CONFIG_MCI_WEIGHT_DBG       0x40000000
+#define ATH_MCI_CONFIG_DISABLE_MCI          0x80000000
+
+#define ATH_MCI_CONFIG_MCI_OBS_MASK     (ATH_MCI_CONFIG_MCI_OBS_MCI  | \
+                                         ATH_MCI_CONFIG_MCI_OBS_TXRX | \
+                                         ATH_MCI_CONFIG_MCI_OBS_BT)
+#define ATH_MCI_CONFIG_MCI_OBS_GPIO     0x0000002F
+
+#endif
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
index 0c462c904cbe..a4450cba0653 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
@@ -14,6 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/export.h>
 #include "hw.h"
 #include "ar9003_phy.h"
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 04b060af5087..e41d26939ab8 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -14,6 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/export.h>
 #include "hw.h"
 #include "ar9003_phy.h"
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
index 497d7461838a..ed64114571fc 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
@@ -490,6 +490,8 @@
 #define AR_PHY_TEST_CTL_TSTADC_EN_S       8
 #define AR_PHY_TEST_CTL_RX_OBS_SEL        0x3C00
 #define AR_PHY_TEST_CTL_RX_OBS_SEL_S      10
+#define AR_PHY_TEST_CTL_DEBUGPORT_SEL     0xe0000000
+#define AR_PHY_TEST_CTL_DEBUGPORT_SEL_S   29
 
 
 #define AR_PHY_TSTDAC            (AR_SM_BASE + 0x168)
@@ -1001,6 +1003,7 @@
 
 /* GLB Registers */
 #define AR_GLB_BASE     0x20000
+#define AR_GLB_GPIO_CONTROL     (AR_GLB_BASE)
 #define AR_PHY_GLB_CONTROL      (AR_GLB_BASE + 0x44)
 #define AR_GLB_SCRATCH(_ah)     (AR_GLB_BASE + \
                                         (AR_SREV_9462_20(_ah) ? 0x4c : 0x50))
diff --git a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
index 259a6f312afb..dc2054f0378e 100644
--- a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
@@ -41,24 +41,24 @@ static const u32 ar9462_pciephy_clkreq_enable_L1_2p0[][2] = {
 
 static const u32 ar9462_2p0_baseband_postamble[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a8011},
-        {0x00009820, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a012e},
-        {0x00009824, 0x5ac640de, 0x5ac640d0, 0x5ac640d0, 0x5ac640de},
-        {0x00009828, 0x0796be89, 0x0696b081, 0x0696b881, 0x0796be89},
+        {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a800d},
+        {0x00009820, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a01ae},
+        {0x00009824, 0x5ac640de, 0x5ac640d0, 0x5ac640d0, 0x63c640da},
+        {0x00009828, 0x0796be89, 0x0696b081, 0x0696b881, 0x09143e81},
         {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
         {0x00009830, 0x0000059c, 0x0000059c, 0x0000119c, 0x0000119c},
         {0x00009c00, 0x000000c4, 0x000000c4, 0x000000c4, 0x000000c4},
         {0x00009e00, 0x0372111a, 0x0372111a, 0x037216a0, 0x037216a0},
         {0x00009e04, 0x001c2020, 0x001c2020, 0x001c2020, 0x001c2020},
-        {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
-        {0x00009e10, 0x92c88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x92c84d2e},
-        {0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3379605e, 0x33795d5e},
+        {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000d8},
+        {0x00009e10, 0x92c88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x7ec86d2e},
+        {0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3376605e, 0x33795d5e},
         {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
         {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
         {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
-        {0x00009e3c, 0xcf946220, 0xcf946220, 0xcfd5c782, 0xcfd5c782},
-        {0x00009e44, 0xfe321e27, 0xfe321e27, 0xfe291e27, 0xfe291e27},
+        {0x00009e3c, 0xcf946220, 0xcf946220, 0xcfd5c782, 0xcfd5c282},
+        {0x00009e44, 0x62321e27, 0x62321e27, 0xfe291e27, 0xfe291e27},
         {0x00009e48, 0x5030201a, 0x5030201a, 0x50302012, 0x50302012},
         {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
         {0x0000a204, 0x013187c0, 0x013187c4, 0x013187c4, 0x013187c0},
@@ -81,6 +81,15 @@ static const u32 ar9462_2p0_baseband_postamble[][5] = {
         {0x0000a2d0, 0x00041981, 0x00041981, 0x00041981, 0x00041982},
         {0x0000a2d8, 0x7999a83b, 0x7999a83b, 0x7999a83b, 0x7999a83b},
         {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a3a4, 0x00000010, 0x00000010, 0x00000000, 0x00000000},
+        {0x0000a3a8, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa},
+        {0x0000a3ac, 0xaaaaaa00, 0xaaaaaa30, 0xaaaaaa00, 0xaaaaaa00},
+        {0x0000a41c, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce},
+        {0x0000a420, 0x000001ce, 0x000001ce, 0x000001ce, 0x000001ce},
+        {0x0000a424, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce},
+        {0x0000a428, 0x000001ce, 0x000001ce, 0x000001ce, 0x000001ce},
+        {0x0000a42c, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce},
+        {0x0000a430, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce, 0x1ce739ce},
         {0x0000a830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
         {0x0000ae04, 0x001c0000, 0x001c0000, 0x001c0000, 0x00100000},
         {0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
@@ -1107,11 +1116,11 @@ static const u32 ar9462_2p0_baseband_core[][2] = {
         {0x00009e30, 0x06336f77},
         {0x00009e34, 0x6af6532f},
         {0x00009e38, 0x0cc80c00},
-        {0x00009e40, 0x0d261820},
+        {0x00009e40, 0x15262820},
         {0x00009e4c, 0x00001004},
         {0x00009e50, 0x00ff03f1},
-        {0x00009e54, 0xe4c355c7},
-        {0x00009e58, 0xfd897735},
+        {0x00009e54, 0xe4c555c2},
+        {0x00009e58, 0xfd857722},
         {0x00009e5c, 0xe9198724},
         {0x00009fc0, 0x803e4788},
         {0x00009fc4, 0x0001efb5},
@@ -1142,9 +1151,6 @@ static const u32 ar9462_2p0_baseband_core[][2] = {
         {0x0000a398, 0x001f0e0f},
         {0x0000a39c, 0x0075393f},
         {0x0000a3a0, 0xb79f6427},
-        {0x0000a3a4, 0x00000000},
-        {0x0000a3a8, 0xaaaaaaaa},
-        {0x0000a3ac, 0x3c466478},
         {0x0000a3c0, 0x20202020},
         {0x0000a3c4, 0x22222220},
         {0x0000a3c8, 0x20200020},
@@ -1167,12 +1173,6 @@ static const u32 ar9462_2p0_baseband_core[][2] = {
         {0x0000a40c, 0x00820820},
         {0x0000a414, 0x1ce739ce},
         {0x0000a418, 0x2d001dce},
-        {0x0000a41c, 0x1ce739ce},
-        {0x0000a420, 0x000001ce},
-        {0x0000a424, 0x1ce739ce},
-        {0x0000a428, 0x000001ce},
-        {0x0000a42c, 0x1ce739ce},
-        {0x0000a430, 0x1ce739ce},
         {0x0000a434, 0x00000000},
         {0x0000a438, 0x00001801},
         {0x0000a43c, 0x00100000},
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 93b45b4b3033..130e5dba9555 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -159,6 +159,9 @@ void ath_descdma_cleanup(struct ath_softc *sc, struct ath_descdma *dd,
 /* return block-ack bitmap index given sequence and starting sequence */
 #define ATH_BA_INDEX(_st, _seq) (((_seq) - (_st)) & (IEEE80211_SEQ_MAX - 1))
 
+/* return the seqno for _start + _offset */
+#define ATH_BA_INDEX2SEQ(_seq, _offset) (((_seq) + (_offset)) & (IEEE80211_SEQ_MAX - 1))
+
 /* returns delimiter padding required given the packet length */
 #define ATH_AGGR_GET_NDELIM(_len)                                       \
        (((_len) >= ATH_AGGR_MINPLEN) ? 0 :                             \
@@ -238,6 +241,7 @@ struct ath_atx_tid {
         struct ath_node *an;
         struct ath_atx_ac *ac;
         unsigned long tx_buf[BITS_TO_LONGS(ATH_TID_MAX_BUFS)];
+        int bar_index;
         u16 seq_start;
         u16 seq_next;
         u16 baw_size;
@@ -252,9 +256,9 @@ struct ath_atx_tid {
 struct ath_node {
 #ifdef CONFIG_ATH9K_DEBUGFS
         struct list_head list; /* for sc->nodes */
+#endif
         struct ieee80211_sta *sta; /* station struct we're part of */
         struct ieee80211_vif *vif; /* interface with which we're associated */
-#endif
         struct ath_atx_tid tid[WME_NUM_TID];
         struct ath_atx_ac ac[WME_NUM_AC];
         int ps_key;
@@ -276,7 +280,6 @@ struct ath_tx_control {
 };
 
 #define ATH_TX_ERROR        0x01
-#define ATH_TX_BAR          0x02
 
 /**
  * @txq_map:  Index is mac80211 queue number.  This is
@@ -462,7 +465,7 @@ void ath9k_btcoex_timer_pause(struct ath_softc *sc);
 #define ATH_LED_PIN_9287                8
 #define ATH_LED_PIN_9300                10
 #define ATH_LED_PIN_9485                6
-#define ATH_LED_PIN_9462                0
+#define ATH_LED_PIN_9462                4
 
 #ifdef CONFIG_MAC80211_LEDS
 void ath_init_leds(struct ath_softc *sc);
@@ -542,7 +545,7 @@ struct ath_ant_comb {
 #define DEFAULT_CACHELINE       32
 #define ATH_REGCLASSIDS_MAX     10
 #define ATH_CABQ_READY_TIME     80      /* % of beacon interval */
-#define ATH_MAX_SW_RETRIES      10
+#define ATH_MAX_SW_RETRIES      30
 #define ATH_CHAN_MAX            255
 
 #define ATH_TXPOWER_MAX         100     /* .5 dBm units */
@@ -647,6 +650,7 @@ struct ath_softc {
         struct delayed_work tx_complete_work;
         struct delayed_work hw_pll_work;
         struct ath_btcoex btcoex;
+        struct ath_mci_coex mci_coex;
 
         struct ath_descdma txsdma;
 
diff --git a/drivers/net/wireless/ath/ath9k/btcoex.c b/drivers/net/wireless/ath/ath9k/btcoex.c
index 5a6361da9818..bbb20810ec10 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.c
+++ b/drivers/net/wireless/ath/ath9k/btcoex.c
@@ -14,13 +14,14 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/export.h>
 #include "hw.h"
 
 enum ath_bt_mode {
         ATH_BT_COEX_MODE_LEGACY,        /* legacy rx_clear mode */
         ATH_BT_COEX_MODE_UNSLOTTED,     /* untimed/unslotted mode */
         ATH_BT_COEX_MODE_SLOTTED,       /* slotted mode */
-        ATH_BT_COEX_MODE_DISALBED,      /* coexistence disabled */
+        ATH_BT_COEX_MODE_DISABLED,      /* coexistence disabled */
 };
 
 struct ath_btcoex_config {
diff --git a/drivers/net/wireless/ath/ath9k/btcoex.h b/drivers/net/wireless/ath/ath9k/btcoex.h
index d5e5db1faad9..278361c867ca 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.h
+++ b/drivers/net/wireless/ath/ath9k/btcoex.h
@@ -54,8 +54,39 @@ enum ath_btcoex_scheme {
         ATH_BTCOEX_CFG_MCI,
 };
 
+struct ath9k_hw_mci {
+        u32 raw_intr;
+        u32 rx_msg_intr;
+        u32 cont_status;
+        u32 gpm_addr;
+        u32 gpm_len;
+        u32 gpm_idx;
+        u32 sched_addr;
+        u32 wlan_channels[4];
+        u32 wlan_cal_seq;
+        u32 wlan_cal_done;
+        u32 config;
+        u8 *gpm_buf;
+        u8 *sched_buf;
+        bool ready;
+        bool update_2g5g;
+        bool is_2g;
+        bool query_bt;
+        bool unhalt_bt_gpm; /* need send UNHALT */
+        bool halted_bt_gpm; /* HALT sent */
+        bool need_flush_btinfo;
+        bool bt_version_known;
+        bool wlan_channels_update;
+        u8 wlan_ver_major;
+        u8 wlan_ver_minor;
+        u8 bt_ver_major;
+        u8 bt_ver_minor;
+        u8 bt_state;
+};
+
 struct ath_btcoex_hw {
         enum ath_btcoex_scheme scheme;
+        struct ath9k_hw_mci mci;
         bool enabled;
         u8 wlanactive_gpio;
         u8 btactive_gpio;
diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
index ebaf304f464b..99538810a312 100644
--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -16,6 +16,7 @@
 
 #include "hw.h"
 #include "hw-ops.h"
+#include <linux/export.h>
 
 /* Common calibration code */
 
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 8e7e57ccbe9a..68d972bf232d 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -16,6 +16,7 @@
 
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 #include <asm/unaligned.h>
 
 #include "ath9k.h"
@@ -855,7 +856,7 @@ void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,
         sc->debug.stats.txstats[qnum].tx_bytes_all += bf->bf_mpdu->len;
 
         if (bf_isampdu(bf)) {
-                if (flags & ATH_TX_BAR)
+                if (flags & ATH_TX_ERROR)
                         TX_STAT_INC(qnum, a_xretries);
                 else
                         TX_STAT_INC(qnum, a_completed);
@@ -1629,6 +1630,9 @@ int ath9k_init_debug(struct ath_hw *ah)
         debugfs_create_file("debug", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
                             sc, &fops_debug);
 #endif
+
+        ath9k_dfs_init_debug(sc);
+
         debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
                             &fops_dma);
         debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc,
diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h
index 356352ac2d6e..776a24ada600 100644
--- a/drivers/net/wireless/ath/ath9k/debug.h
+++ b/drivers/net/wireless/ath/ath9k/debug.h
@@ -19,6 +19,7 @@
 
 #include "hw.h"
 #include "rc.h"
+#include "dfs_debug.h"
 
 struct ath_txq;
 struct ath_buf;
@@ -187,6 +188,7 @@ struct ath_stats {
         struct ath_interrupt_stats istats;
         struct ath_tx_stats txstats[ATH9K_NUM_TX_QUEUES];
         struct ath_rx_stats rxstats;
+        struct ath_dfs_stats dfs_stats;
         u32 reset[__RESET_TYPE_MAX];
 };
 
diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c
new file mode 100644
index 000000000000..e4e84a9e6273
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/dfs.c
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2008-2011 Atheros Communications Inc.
+ * Copyright (c) 2011 Neratec Solutions AG
+ *
+ * Permission to use, copy, modify, and/or 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.
+ */
+
+#include "hw.h"
+#include "hw-ops.h"
+#include "ath9k.h"
+#include "dfs.h"
+#include "dfs_debug.h"
+
+/*
+ * TODO: move into or synchronize this with generic header
+ *       as soon as IF is defined
+ */
+struct dfs_radar_pulse {
+        u16 freq;
+        u64 ts;
+        u32 width;
+        u8 rssi;
+};
+
+/* internal struct to pass radar data */
+struct ath_radar_data {
+        u8 pulse_bw_info;
+        u8 rssi;
+        u8 ext_rssi;
+        u8 pulse_length_ext;
+        u8 pulse_length_pri;
+};
+
+/* convert pulse duration to usecs, considering clock mode */
+static u32 dur_to_usecs(struct ath_hw *ah, u32 dur)
+{
+        const u32 AR93X_NSECS_PER_DUR = 800;
+        const u32 AR93X_NSECS_PER_DUR_FAST = (8000 / 11);
+        u32 nsecs;
+
+        if (IS_CHAN_A_FAST_CLOCK(ah, ah->curchan))
+                nsecs = dur * AR93X_NSECS_PER_DUR_FAST;
+        else
+                nsecs = dur * AR93X_NSECS_PER_DUR;
+
+        return (nsecs + 500) / 1000;
+}
+
+#define PRI_CH_RADAR_FOUND 0x01
+#define EXT_CH_RADAR_FOUND 0x02
+static bool
+ath9k_postprocess_radar_event(struct ath_softc *sc,
+                              struct ath_radar_data *are,
+                              struct dfs_radar_pulse *drp)
+{
+        u8 rssi;
+        u16 dur;
+
+        ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_DFS,
+                "pulse_bw_info=0x%x, pri,ext len/rssi=(%u/%u, %u/%u)\n",
+                are->pulse_bw_info,
+                are->pulse_length_pri, are->rssi,
+                are->pulse_length_ext, are->ext_rssi);
+
+        /*
+         * Only the last 2 bits of the BW info are relevant, they indicate
+         * which channel the radar was detected in.
+         */
+        are->pulse_bw_info &= 0x03;
+
+        switch (are->pulse_bw_info) {
+        case PRI_CH_RADAR_FOUND:
+                /* radar in ctrl channel */
+                dur = are->pulse_length_pri;
+                DFS_STAT_INC(sc, pri_phy_errors);
+                /*
+                 * cannot use ctrl channel RSSI
+                 * if extension channel is stronger
+                 */
+                rssi = (are->ext_rssi >= (are->rssi + 3)) ? 0 : are->rssi;
+                break;
+        case EXT_CH_RADAR_FOUND:
+                /* radar in extension channel */
+                dur = are->pulse_length_ext;
+                DFS_STAT_INC(sc, ext_phy_errors);
+                /*
+                 * cannot use extension channel RSSI
+                 * if control channel is stronger
+                 */
+                rssi = (are->rssi >= (are->ext_rssi + 12)) ? 0 : are->ext_rssi;
+                break;
+        case (PRI_CH_RADAR_FOUND | EXT_CH_RADAR_FOUND):
+                /*
+                 * Conducted testing, when pulse is on DC, both pri and ext
+                 * durations are reported to be same
+                 *
+                 * Radiated testing, when pulse is on DC, different pri and
+                 * ext durations are reported, so take the larger of the two
+                 */
+                if (are->pulse_length_ext >= are->pulse_length_pri)
+                        dur = are->pulse_length_ext;
+                else
+                        dur = are->pulse_length_pri;
+                DFS_STAT_INC(sc, dc_phy_errors);
+
+                /* when both are present use stronger one */
+                rssi = (are->rssi < are->ext_rssi) ? are->ext_rssi : are->rssi;
+                break;
+        default:
+                /*
+                 * Bogus bandwidth info was received in descriptor,
+                 * so ignore this PHY error
+                 */
+                DFS_STAT_INC(sc, bwinfo_discards);
+                return false;
+        }
+
+        if (rssi == 0) {
+                DFS_STAT_INC(sc, rssi_discards);
+                return false;
+        }
+
+        /*
+         * TODO: check chirping pulses
+         *       checks for chirping are dependent on the DFS regulatory domain
+         *       used, which is yet TBD
+         */
+
+        /* convert duration to usecs */
+        drp->width = dur_to_usecs(sc->sc_ah, dur);
+        drp->rssi = rssi;
+
+        DFS_STAT_INC(sc, pulses_detected);
+        return true;
+}
+#undef PRI_CH_RADAR_FOUND
+#undef EXT_CH_RADAR_FOUND
+
+/*
+ * DFS: check PHY-error for radar pulse and feed the detector
+ */
+void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,
+                              struct ath_rx_status *rs, u64 mactime)
+{
+        struct ath_radar_data ard;
+        u16 datalen;
+        char *vdata_end;
+        struct dfs_radar_pulse drp;
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(ah);
+
+        if ((!(rs->rs_phyerr != ATH9K_PHYERR_RADAR)) &&
+            (!(rs->rs_phyerr != ATH9K_PHYERR_FALSE_RADAR_EXT))) {
+                ath_dbg(common, ATH_DBG_DFS,
+                        "Error: rs_phyer=0x%x not a radar error\n",
+                        rs->rs_phyerr);
+                return;
+        }
+
+        datalen = rs->rs_datalen;
+        if (datalen == 0) {
+                DFS_STAT_INC(sc, datalen_discards);
+                return;
+        }
+
+        ard.rssi = rs->rs_rssi_ctl0;
+        ard.ext_rssi = rs->rs_rssi_ext0;
+
+        /*
+         * hardware stores this as 8 bit signed value.
+         * we will cap it at 0 if it is a negative number
+         */
+        if (ard.rssi & 0x80)
+                ard.rssi = 0;
+        if (ard.ext_rssi & 0x80)
+                ard.ext_rssi = 0;
+
+        vdata_end = (char *)data + datalen;
+        ard.pulse_bw_info = vdata_end[-1];
+        ard.pulse_length_ext = vdata_end[-2];
+        ard.pulse_length_pri = vdata_end[-3];
+
+        ath_dbg(common, ATH_DBG_DFS,
+                "bw_info=%d, length_pri=%d, length_ext=%d, "
+                "rssi_pri=%d, rssi_ext=%d\n",
+                ard.pulse_bw_info, ard.pulse_length_pri, ard.pulse_length_ext,
+                ard.rssi, ard.ext_rssi);
+
+        drp.freq = ah->curchan->channel;
+        drp.ts = mactime;
+        if (ath9k_postprocess_radar_event(sc, &ard, &drp)) {
+                static u64 last_ts;
+                ath_dbg(common, ATH_DBG_DFS,
+                        "ath9k_dfs_process_phyerr: channel=%d, ts=%llu, "
+                        "width=%d, rssi=%d, delta_ts=%llu\n",
+                        drp.freq, drp.ts, drp.width, drp.rssi, drp.ts-last_ts);
+                last_ts = drp.ts;
+                /*
+                 * TODO: forward pulse to pattern detector
+                 *
+                 * ieee80211_add_radar_pulse(drp.freq, drp.ts,
+                 *                           drp.width, drp.rssi);
+                 */
+        }
+}
diff --git a/drivers/net/wireless/ath/ath9k/dfs.h b/drivers/net/wireless/ath/ath9k/dfs.h
new file mode 100644
index 000000000000..c2412857f122
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/dfs.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2008-2011 Atheros Communications Inc.
+ * Copyright (c) 2011 Neratec Solutions AG
+ *
+ * Permission to use, copy, modify, and/or 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 ATH9K_DFS_H
+#define ATH9K_DFS_H
+
+#if defined(CONFIG_ATH9K_DFS_CERTIFIED)
+/**
+ * ath9k_dfs_process_phyerr - process radar PHY error
+ * @sc: ath_softc
+ * @data: RX payload data
+ * @rs: RX status after processing descriptor
+ * @mactime: receive time
+ *
+ * This function is called whenever the HW DFS module detects a radar
+ * pulse and reports it as a PHY error.
+ *
+ * The radar information provided as raw payload data is validated and
+ * filtered for false pulses. Events passing all tests are forwarded to
+ * the upper layer for pattern detection.
+ */
+void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,
+                              struct ath_rx_status *rs, u64 mactime);
+#else
+static inline void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data,
+                                            struct ath_rx_status *rs, u64 mactime) { }
+#endif
+
+#endif /* ATH9K_DFS_H */
diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c
new file mode 100644
index 000000000000..106d031d834a
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/dfs_debug.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2008-2011 Atheros Communications Inc.
+ * Copyright (c) 2011 Neratec Solutions AG
+ *
+ * Permission to use, copy, modify, and/or 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.
+ */
+
+#include <linux/debugfs.h>
+#include <linux/export.h>
+
+#include "ath9k.h"
+#include "dfs_debug.h"
+
+#define ATH9K_DFS_STAT(s, p) \
+        len += snprintf(buf + len, size - len, "%28s : %10u\n", s, \
+                        sc->debug.stats.dfs_stats.p);
+
+static ssize_t read_file_dfs(struct file *file, char __user *user_buf,
+                             size_t count, loff_t *ppos)
+{
+        struct ath_softc *sc = file->private_data;
+        struct ath9k_hw_version *hw_ver = &sc->sc_ah->hw_version;
+        char *buf;
+        unsigned int len = 0, size = 8000;
+        ssize_t retval = 0;
+
+        buf = kzalloc(size, GFP_KERNEL);
+        if (buf == NULL)
+                return -ENOMEM;
+
+        len += snprintf(buf + len, size - len, "DFS support for "
+                        "macVersion = 0x%x, macRev = 0x%x: %s\n",
+                        hw_ver->macVersion, hw_ver->macRev,
+                        (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_DFS) ?
+                                        "enabled" : "disabled");
+        ATH9K_DFS_STAT("DFS pulses detected     ", pulses_detected);
+        ATH9K_DFS_STAT("Datalen discards        ", datalen_discards);
+        ATH9K_DFS_STAT("RSSI discards           ", rssi_discards);
+        ATH9K_DFS_STAT("BW info discards        ", bwinfo_discards);
+        ATH9K_DFS_STAT("Primary channel pulses  ", pri_phy_errors);
+        ATH9K_DFS_STAT("Secondary channel pulses", ext_phy_errors);
+        ATH9K_DFS_STAT("Dual channel pulses     ", dc_phy_errors);
+
+        if (len > size)
+                len = size;
+
+        retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
+        kfree(buf);
+
+        return retval;
+}
+
+static int ath9k_dfs_debugfs_open(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->i_private;
+
+        return 0;
+}
+
+static const struct file_operations fops_dfs_stats = {
+        .read = read_file_dfs,
+        .open = ath9k_dfs_debugfs_open,
+        .owner = THIS_MODULE,
+        .llseek = default_llseek,
+};
+
+void ath9k_dfs_init_debug(struct ath_softc *sc)
+{
+        debugfs_create_file("dfs_stats", S_IRUSR,
+                            sc->debug.debugfs_phy, sc, &fops_dfs_stats);
+}
diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.h b/drivers/net/wireless/ath/ath9k/dfs_debug.h
new file mode 100644
index 000000000000..6e1e2a71659e
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/dfs_debug.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2008-2011 Atheros Communications Inc.
+ * Copyright (c) 2011 Neratec Solutions AG
+ *
+ * Permission to use, copy, modify, and/or 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 DFS_DEBUG_H
+#define DFS_DEBUG_H
+
+#include "hw.h"
+
+/**
+ * struct ath_dfs_stats - DFS Statistics
+ *
+ * @pulses_detected:  No. of pulses detected so far
+ * @datalen_discards: No. of pulses discarded due to invalid datalen
+ * @rssi_discards:    No. of pulses discarded due to invalid RSSI
+ * @bwinfo_discards:  No. of pulses discarded due to invalid BW info
+ * @pri_phy_errors:   No. of pulses reported for primary channel
+ * @ext_phy_errors:   No. of pulses reported for extension channel
+ * @dc_phy_errors:    No. of pulses reported for primary + extension channel
+ */
+struct ath_dfs_stats {
+        u32 pulses_detected;
+        u32 datalen_discards;
+        u32 rssi_discards;
+        u32 bwinfo_discards;
+        u32 pri_phy_errors;
+        u32 ext_phy_errors;
+        u32 dc_phy_errors;
+};
+
+#if defined(CONFIG_ATH9K_DFS_DEBUGFS)
+
+#define DFS_STAT_INC(sc, c) (sc->debug.stats.dfs_stats.c++)
+void ath9k_dfs_init_debug(struct ath_softc *sc);
+
+#else
+
+#define DFS_STAT_INC(sc, c) do { } while (0)
+static inline void ath9k_dfs_init_debug(struct ath_softc *sc) { }
+
+#endif /* CONFIG_ATH9K_DFS_DEBUGFS */
+
+#endif /* DFS_DEBUG_H */
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
index 9a7520f987f0..61fcab0e2d76 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
@@ -473,7 +473,7 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah,
 
         int i;
         u16 twiceMinEdgePower;
-        u16 twiceMaxEdgePower = MAX_RATE_POWER;
+        u16 twiceMaxEdgePower;
         u16 scaledPower = 0, minCtlPower;
         u16 numCtlModes;
         const u16 *pCtlMode;
@@ -542,9 +542,7 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah,
                 else
                         freq = centers.ctl_center;
 
-                if (ah->eep_ops->get_eeprom_ver(ah) == 14 &&
-                    ah->eep_ops->get_eeprom_rev(ah) <= 2)
-                        twiceMaxEdgePower = MAX_RATE_POWER;
+                twiceMaxEdgePower = MAX_RATE_POWER;
 
                 for (i = 0; (i < AR5416_EEP4K_NUM_CTLS) &&
                              pEepData->ctlIndex[i]; i++) {
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
index 4f5c50a87ce3..0981c073471d 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
@@ -569,7 +569,7 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah,
 #define REDUCE_SCALED_POWER_BY_TWO_CHAIN     6
 #define REDUCE_SCALED_POWER_BY_THREE_CHAIN   10
 
-        u16 twiceMaxEdgePower = MAX_RATE_POWER;
+        u16 twiceMaxEdgePower;
         int i;
         struct cal_ctl_data_ar9287 *rep;
         struct cal_target_power_leg targetPowerOfdm = {0, {0, 0, 0, 0} },
@@ -669,6 +669,7 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah,
                 else
                         freq = centers.ctl_center;
 
+                twiceMaxEdgePower = MAX_RATE_POWER;
                 /* Walk through the CTL indices stored in EEPROM */
                 for (i = 0; (i < AR9287_NUM_CTLS) && pEepData->ctlIndex[i]; i++) {
                         struct cal_ctl_edges *pRdEdgesPower;
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
index 81e629671679..55a21d39167c 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
@@ -1000,7 +1000,7 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah,
 #define REDUCE_SCALED_POWER_BY_THREE_CHAIN   9 /* 10*log10(3)*2 */
 
         struct ar5416_eeprom_def *pEepData = &ah->eeprom.def;
-        u16 twiceMaxEdgePower = MAX_RATE_POWER;
+        u16 twiceMaxEdgePower;
         int i;
         struct cal_ctl_data *rep;
         struct cal_target_power_leg targetPowerOfdm, targetPowerCck = {
@@ -1121,9 +1121,7 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah,
                 else
                         freq = centers.ctl_center;
 
-                if (ah->eep_ops->get_eeprom_ver(ah) == 14 &&
-                    ah->eep_ops->get_eeprom_rev(ah) <= 2)
-                        twiceMaxEdgePower = MAX_RATE_POWER;
+                twiceMaxEdgePower = MAX_RATE_POWER;
 
                 for (i = 0; (i < AR5416_NUM_CTLS) && pEepData->ctlIndex[i]; i++) {
                         if ((((cfgCtl & ~CTL_MODE_M) |
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 0b9a0e8a4958..f8ce4ea6f65c 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -808,7 +808,8 @@ void ath9k_htc_ani_work(struct work_struct *work)
         }
 
         /* Verify whether we must check ANI */
-        if ((timestamp - common->ani.checkani_timer) >= ATH_ANI_POLLINTERVAL) {
+        if (ah->config.enable_ani &&
+            (timestamp - common->ani.checkani_timer) >= ATH_ANI_POLLINTERVAL) {
                 aniflag = true;
                 common->ani.checkani_timer = timestamp;
         }
@@ -838,7 +839,7 @@ set_timer:
         * short calibration and long calibration.
         */
         cal_interval = ATH_LONG_CALINTERVAL;
-        if (priv->ah->config.enable_ani)
+        if (ah->config.enable_ani)
                 cal_interval = min(cal_interval, (u32)ATH_ANI_POLLINTERVAL);
         if (!common->ani.caldone)
                 cal_interval = min(cal_interval, (u32)short_cal_interval);
diff --git a/drivers/net/wireless/ath/ath9k/hw-ops.h b/drivers/net/wireless/ath/ath9k/hw-ops.h
index e74c233757a2..c4ad0b06bdbc 100644
--- a/drivers/net/wireless/ath/ath9k/hw-ops.h
+++ b/drivers/net/wireless/ath/ath9k/hw-ops.h
@@ -212,4 +212,13 @@ static inline int ath9k_hw_fast_chan_change(struct ath_hw *ah,
         return ath9k_hw_private_ops(ah)->fast_chan_change(ah, chan,
                                                           ini_reloaded);
 }
+
+static inline void ath9k_hw_set_radar_params(struct ath_hw *ah)
+{
+        if (!ath9k_hw_private_ops(ah)->set_radar_params)
+                return;
+
+        ath9k_hw_private_ops(ah)->set_radar_params(ah, &ah->radar_conf);
+}
+
 #endif /* ATH9K_HW_OPS_H */
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 27471f80d8b2..8cda9a1513a7 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -16,6 +16,7 @@
 
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <asm/unaligned.h>
 
 #include "hw.h"
@@ -503,7 +504,7 @@ static int ath9k_hw_post_init(struct ath_hw *ah)
                 return ecode;
         }
 
-        if (!AR_SREV_9100(ah) && !AR_SREV_9340(ah)) {
+        if (ah->config.enable_ani) {
                 ath9k_hw_ani_setup(ah);
                 ath9k_hw_ani_init(ah);
         }
@@ -609,6 +610,10 @@ static int __ath9k_hw_init(struct ath_hw *ah)
         if (!AR_SREV_9300_20_OR_LATER(ah))
                 ah->ani_function &= ~ATH9K_ANI_MRC_CCK;
 
+        /* disable ANI for 9340 */
+        if (AR_SREV_9340(ah))
+                ah->config.enable_ani = false;
+
         ath9k_hw_init_mode_regs(ah);
 
         if (!ah->is_pciexpress)
@@ -1349,6 +1354,7 @@ static bool ath9k_hw_set_reset_power_on(struct ath_hw *ah)
 
 static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type)
 {
+        bool ret = false;
 
         if (AR_SREV_9300_20_OR_LATER(ah)) {
                 REG_WRITE(ah, AR_WA, ah->WARegVal);
@@ -1360,13 +1366,20 @@ static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type)
 
         switch (type) {
         case ATH9K_RESET_POWER_ON:
-                return ath9k_hw_set_reset_power_on(ah);
+                ret = ath9k_hw_set_reset_power_on(ah);
+                break;
         case ATH9K_RESET_WARM:
         case ATH9K_RESET_COLD:
-                return ath9k_hw_set_reset(ah, type);
+                ret = ath9k_hw_set_reset(ah, type);
+                break;
         default:
-                return false;
+                break;
         }
+
+        if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
+                REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
+
+        return ret;
 }
 
 static bool ath9k_hw_chip_reset(struct ath_hw *ah,
@@ -1505,6 +1518,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
                    struct ath9k_hw_cal_data *caldata, bool bChannelChange)
 {
         struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci_hw = &ah->btcoex_hw.mci;
         u32 saveLedState;
         struct ath9k_channel *curchan = ah->curchan;
         u32 saveDefAntenna;
@@ -1512,6 +1526,53 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         u64 tsf = 0;
         int i, r;
         bool allow_fbs = false;
+        bool mci = !!(ah->caps.hw_caps & ATH9K_HW_CAP_MCI);
+        bool save_fullsleep = ah->chip_fullsleep;
+
+        if (mci) {
+
+                ar9003_mci_2g5g_changed(ah, IS_CHAN_2GHZ(chan));
+
+                if (mci_hw->bt_state == MCI_BT_CAL_START) {
+                        u32 payload[4] = {0, 0, 0, 0};
+
+                        ath_dbg(common, ATH_DBG_MCI, "MCI stop rx for BT CAL");
+
+                        mci_hw->bt_state = MCI_BT_CAL;
+
+                        /*
+                         * MCI FIX: disable mci interrupt here. This is to avoid
+                         * SW_MSG_DONE or RX_MSG bits to trigger MCI_INT and
+                         * lead to mci_intr reentry.
+                         */
+
+                        ar9003_mci_disable_interrupt(ah);
+
+                        ath_dbg(common, ATH_DBG_MCI, "send WLAN_CAL_GRANT");
+                        MCI_GPM_SET_CAL_TYPE(payload, MCI_GPM_WLAN_CAL_GRANT);
+                        ar9003_mci_send_message(ah, MCI_GPM, 0, payload,
+                                                16, true, false);
+
+                        ath_dbg(common, ATH_DBG_MCI, "\nMCI BT is calibrating");
+
+                        /* Wait BT calibration to be completed for 25ms */
+
+                        if (ar9003_mci_wait_for_gpm(ah, MCI_GPM_BT_CAL_DONE,
+                                                                  0, 25000))
+                                ath_dbg(common, ATH_DBG_MCI,
+                                        "MCI got BT_CAL_DONE\n");
+                        else
+                                ath_dbg(common, ATH_DBG_MCI,
+                                        "MCI ### BT cal takes to long, force"
+                                        "bt_state to be bt_awake\n");
+                        mci_hw->bt_state = MCI_BT_AWAKE;
+                        /* MCI FIX: enable mci interrupt here */
+                        ar9003_mci_enable_interrupt(ah);
+
+                        return true;
+                }
+        }
+
 
         if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
                 return -EIO;
@@ -1549,12 +1610,29 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
                 if (ath9k_hw_channel_change(ah, chan)) {
                         ath9k_hw_loadnf(ah, ah->curchan);
                         ath9k_hw_start_nfcal(ah, true);
+                        if (mci && mci_hw->ready)
+                                ar9003_mci_2g5g_switch(ah, true);
+
                         if (AR_SREV_9271(ah))
                                 ar9002_hw_load_ani_reg(ah, chan);
                         return 0;
                 }
         }
 
+        if (mci) {
+                ar9003_mci_disable_interrupt(ah);
+
+                if (mci_hw->ready && !save_fullsleep) {
+                        ar9003_mci_mute_bt(ah);
+                        udelay(20);
+                        REG_WRITE(ah, AR_BTCOEX_CTRL, 0);
+                }
+
+                mci_hw->bt_state = MCI_BT_SLEEP;
+                mci_hw->ready = false;
+        }
+
+
         saveDefAntenna = REG_READ(ah, AR_DEF_ANTENNA);
         if (saveDefAntenna == 0)
                 saveDefAntenna = 1;
@@ -1610,6 +1688,9 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         if (r)
                 return r;
 
+        if (mci)
+                ar9003_mci_reset(ah, false, IS_CHAN_2GHZ(chan), save_fullsleep);
+
         /*
          * Some AR91xx SoC devices frequently fail to accept TSF writes
          * right after the chip reset. When that happens, write a new
@@ -1727,6 +1808,55 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         ath9k_hw_loadnf(ah, chan);
         ath9k_hw_start_nfcal(ah, true);
 
+        if (mci && mci_hw->ready) {
+
+                if (IS_CHAN_2GHZ(chan) &&
+                    (mci_hw->bt_state == MCI_BT_SLEEP)) {
+
+                        if (ar9003_mci_check_int(ah,
+                            AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET) ||
+                            ar9003_mci_check_int(ah,
+                            AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE)) {
+
+                                /*
+                                 * BT is sleeping. Check if BT wakes up during
+                                 * WLAN calibration. If BT wakes up during
+                                 * WLAN calibration, need to go through all
+                                 * message exchanges again and recal.
+                                 */
+
+                                ath_dbg(common, ATH_DBG_MCI, "MCI BT wakes up"
+                                        "during WLAN calibration\n");
+
+                                REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                                          AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET |
+                                          AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE);
+                                ath_dbg(common, ATH_DBG_MCI, "MCI send"
+                                        "REMOTE_RESET\n");
+                                ar9003_mci_remote_reset(ah, true);
+                                ar9003_mci_send_sys_waking(ah, true);
+                                udelay(1);
+                                if (IS_CHAN_2GHZ(chan))
+                                        ar9003_mci_send_lna_transfer(ah, true);
+
+                                mci_hw->bt_state = MCI_BT_AWAKE;
+
+                                ath_dbg(common, ATH_DBG_MCI, "MCI re-cal\n");
+
+                                if (caldata) {
+                                        caldata->done_txiqcal_once = false;
+                                        caldata->done_txclcal_once = false;
+                                        caldata->rtt_hist.num_readings = 0;
+                                }
+
+                                if (!ath9k_hw_init_cal(ah, chan))
+                                        return -EIO;
+
+                        }
+                }
+                ar9003_mci_enable_interrupt(ah);
+        }
+
         ENABLE_REGWRITE_BUFFER(ah);
 
         ath9k_hw_restore_chainmask(ah);
@@ -1769,6 +1899,21 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         if (ah->btcoex_hw.enabled)
                 ath9k_hw_btcoex_enable(ah);
 
+        if (mci && mci_hw->ready) {
+                /*
+                 * check BT state again to make
+                 * sure it's not changed.
+                 */
+
+                ar9003_mci_sync_bt_state(ah);
+                ar9003_mci_2g5g_switch(ah, true);
+
+                if ((mci_hw->bt_state == MCI_BT_AWAKE) &&
+                                (mci_hw->query_bt == true)) {
+                        mci_hw->need_flush_btinfo = true;
+                }
+        }
+
         if (AR_SREV_9300_20_OR_LATER(ah)) {
                 ar9003_hw_bb_watchdog_config(ah);
 
@@ -1826,7 +1971,8 @@ static void ath9k_set_power_sleep(struct ath_hw *ah, int setChip)
         }
 
         /* Clear Bit 14 of AR_WA after putting chip into Full Sleep mode. */
-        REG_WRITE(ah, AR_WA, ah->WARegVal & ~AR_WA_D3_L1_DISABLE);
+        if (AR_SREV_9300_20_OR_LATER(ah))
+                REG_WRITE(ah, AR_WA, ah->WARegVal & ~AR_WA_D3_L1_DISABLE);
 }
 
 /*
@@ -1932,6 +2078,7 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah, int setChip)
 bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)
 {
         struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
         int status = true, setChip = true;
         static const char *modes[] = {
                 "AWAKE",
@@ -1949,12 +2096,35 @@ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)
         switch (mode) {
         case ATH9K_PM_AWAKE:
                 status = ath9k_hw_set_power_awake(ah, setChip);
+
+                if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
+                        REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
+
                 break;
         case ATH9K_PM_FULL_SLEEP:
+
+                if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI) {
+                        if (ar9003_mci_state(ah, MCI_STATE_ENABLE, NULL) &&
+                                (mci->bt_state != MCI_BT_SLEEP) &&
+                                !mci->halted_bt_gpm) {
+                                ath_dbg(common, ATH_DBG_MCI, "MCI halt BT GPM"
+                                                "(full_sleep)");
+                                ar9003_mci_send_coex_halt_bt_gpm(ah,
+                                                                 true, true);
+                        }
+
+                        mci->ready = false;
+                        REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
+                }
+
                 ath9k_set_power_sleep(ah, setChip);
                 ah->chip_fullsleep = true;
                 break;
         case ATH9K_PM_NETWORK_SLEEP:
+
+                if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
+                        REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
+
                 ath9k_set_power_network_sleep(ah, setChip);
                 break;
         default:
@@ -2107,6 +2277,30 @@ static u8 fixup_chainmask(u8 chip_chainmask, u8 eeprom_chainmask)
                 return chip_chainmask;
 }
 
+/**
+ * ath9k_hw_dfs_tested - checks if DFS has been tested with used chipset
+ * @ah: the atheros hardware data structure
+ *
+ * We enable DFS support upstream on chipsets which have passed a series
+ * of tests. The testing requirements are going to be documented. Desired
+ * test requirements are documented at:
+ *
+ * http://wireless.kernel.org/en/users/Drivers/ath9k/dfs
+ *
+ * Once a new chipset gets properly tested an individual commit can be used
+ * to document the testing for DFS for that chipset.
+ */
+static bool ath9k_hw_dfs_tested(struct ath_hw *ah)
+{
+
+        switch (ah->hw_version.macVersion) {
+        /* AR9580 will likely be our first target to get testing on */
+        case AR_SREV_VERSION_9580:
+        default:
+                return false;
+        }
+}
+
 int ath9k_hw_fill_cap_info(struct ath_hw *ah)
 {
         struct ath9k_hw_capabilities *pCap = &ah->caps;
@@ -2147,6 +2341,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
 
         if (AR_SREV_9485(ah) || AR_SREV_9285(ah) || AR_SREV_9330(ah))
                 chip_chainmask = 1;
+        else if (AR_SREV_9462(ah))
+                chip_chainmask = 3;
         else if (!AR_SREV_9280_20_OR_LATER(ah))
                 chip_chainmask = 7;
         else if (!AR_SREV_9300_20_OR_LATER(ah) || AR_SREV_9340(ah))
@@ -2203,12 +2399,10 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
         else
                 pCap->num_gpio_pins = AR_NUM_GPIO;
 
-        if (AR_SREV_9160_10_OR_LATER(ah) || AR_SREV_9100(ah)) {
-                pCap->hw_caps |= ATH9K_HW_CAP_CST;
+        if (AR_SREV_9160_10_OR_LATER(ah) || AR_SREV_9100(ah))
                 pCap->rts_aggr_limit = ATH_AMPDU_LIMIT_MAX;
-        } else {
+        else
                 pCap->rts_aggr_limit = (8 * 1024);
-        }
 
 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
         ah->rfsilent = ah->eep_ops->get_eeprom(ah, EEP_RF_SILENT);
@@ -2232,7 +2426,9 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
                 pCap->hw_caps |= ATH9K_HW_CAP_4KB_SPLITTRANS;
 
         if (common->btcoex_enabled) {
-                if (AR_SREV_9300_20_OR_LATER(ah)) {
+                if (AR_SREV_9462(ah))
+                        btcoex_hw->scheme = ATH_BTCOEX_CFG_MCI;
+                else if (AR_SREV_9300_20_OR_LATER(ah)) {
                         btcoex_hw->scheme = ATH_BTCOEX_CFG_3WIRE;
                         btcoex_hw->btactive_gpio = ATH_BTACTIVE_GPIO_9300;
                         btcoex_hw->wlanactive_gpio = ATH_WLANACTIVE_GPIO_9300;
@@ -2316,6 +2512,9 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
                 pCap->pcie_lcr_offset = 0x80;
         }
 
+        if (ath9k_hw_dfs_tested(ah))
+                pCap->hw_caps |= ATH9K_HW_CAP_DFS;
+
         tx_chainmask = pCap->tx_chainmask;
         rx_chainmask = pCap->rx_chainmask;
         while (tx_chainmask || rx_chainmask) {
@@ -2330,7 +2529,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
 
         if (AR_SREV_9300_20_OR_LATER(ah)) {
                 ah->enabled_cals |= TX_IQ_CAL;
-                if (!AR_SREV_9330(ah))
+                if (AR_SREV_9485_OR_LATER(ah))
                         ah->enabled_cals |= TX_IQ_ON_AGC_CAL;
         }
         if (AR_SREV_9462(ah))
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 3cb878c28ccf..615cc839f0de 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -126,6 +126,16 @@
 #define AR_GPIO_OUTPUT_MUX_AS_RX_CLEAR_EXTERNAL  4
 #define AR_GPIO_OUTPUT_MUX_AS_MAC_NETWORK_LED    5
 #define AR_GPIO_OUTPUT_MUX_AS_MAC_POWER_LED      6
+#define AR_GPIO_OUTPUT_MUX_AS_MCI_WLAN_DATA      0x16
+#define AR_GPIO_OUTPUT_MUX_AS_MCI_WLAN_CLK       0x17
+#define AR_GPIO_OUTPUT_MUX_AS_MCI_BT_DATA        0x18
+#define AR_GPIO_OUTPUT_MUX_AS_MCI_BT_CLK         0x19
+#define AR_GPIO_OUTPUT_MUX_AS_WL_IN_TX           0x14
+#define AR_GPIO_OUTPUT_MUX_AS_WL_IN_RX           0x13
+#define AR_GPIO_OUTPUT_MUX_AS_BT_IN_TX           9
+#define AR_GPIO_OUTPUT_MUX_AS_BT_IN_RX           8
+#define AR_GPIO_OUTPUT_MUX_AS_RUCKUS_STROBE      0x1d
+#define AR_GPIO_OUTPUT_MUX_AS_RUCKUS_DATA        0x1e
 
 #define AR_GPIOD_MASK               0x00001FFF
 #define AR_GPIO_BIT(_gpio)          (1 << (_gpio))
@@ -186,21 +196,21 @@ enum ath_ini_subsys {
 enum ath9k_hw_caps {
         ATH9K_HW_CAP_HT                         = BIT(0),
         ATH9K_HW_CAP_RFSILENT                   = BIT(1),
-        ATH9K_HW_CAP_CST                        = BIT(2),
-        ATH9K_HW_CAP_AUTOSLEEP                  = BIT(4),
-        ATH9K_HW_CAP_4KB_SPLITTRANS             = BIT(5),
-        ATH9K_HW_CAP_EDMA                       = BIT(6),
-        ATH9K_HW_CAP_RAC_SUPPORTED              = BIT(7),
-        ATH9K_HW_CAP_LDPC                       = BIT(8),
-        ATH9K_HW_CAP_FASTCLOCK                  = BIT(9),
-        ATH9K_HW_CAP_SGI_20                     = BIT(10),
-        ATH9K_HW_CAP_PAPRD                      = BIT(11),
-        ATH9K_HW_CAP_ANT_DIV_COMB               = BIT(12),
-        ATH9K_HW_CAP_2GHZ                       = BIT(13),
-        ATH9K_HW_CAP_5GHZ                       = BIT(14),
-        ATH9K_HW_CAP_APM                        = BIT(15),
-        ATH9K_HW_CAP_RTT                        = BIT(16),
-        ATH9K_HW_CAP_MCI                        = BIT(17),
+        ATH9K_HW_CAP_AUTOSLEEP                  = BIT(2),
+        ATH9K_HW_CAP_4KB_SPLITTRANS             = BIT(3),
+        ATH9K_HW_CAP_EDMA                       = BIT(4),
+        ATH9K_HW_CAP_RAC_SUPPORTED              = BIT(5),
+        ATH9K_HW_CAP_LDPC                       = BIT(6),
+        ATH9K_HW_CAP_FASTCLOCK                  = BIT(7),
+        ATH9K_HW_CAP_SGI_20                     = BIT(8),
+        ATH9K_HW_CAP_PAPRD                      = BIT(9),
+        ATH9K_HW_CAP_ANT_DIV_COMB               = BIT(10),
+        ATH9K_HW_CAP_2GHZ                       = BIT(11),
+        ATH9K_HW_CAP_5GHZ                       = BIT(12),
+        ATH9K_HW_CAP_APM                        = BIT(13),
+        ATH9K_HW_CAP_RTT                        = BIT(14),
+        ATH9K_HW_CAP_MCI                        = BIT(15),
+        ATH9K_HW_CAP_DFS                        = BIT(16),
 };
 
 struct ath9k_hw_capabilities {
@@ -266,6 +276,7 @@ enum ath9k_int {
         ATH9K_INT_TX = 0x00000040,
         ATH9K_INT_TXDESC = 0x00000080,
         ATH9K_INT_TIM_TIMER = 0x00000100,
+        ATH9K_INT_MCI = 0x00000200,
         ATH9K_INT_BB_WATCHDOG = 0x00000400,
         ATH9K_INT_TXURN = 0x00000800,
         ATH9K_INT_MIB = 0x00001000,
@@ -417,6 +428,25 @@ enum ath9k_rx_qtype {
         ATH9K_RX_QUEUE_MAX,
 };
 
+enum mci_message_header {               /* length of payload */
+        MCI_LNA_CTRL     = 0x10,        /* len = 0 */
+        MCI_CONT_NACK    = 0x20,        /* len = 0 */
+        MCI_CONT_INFO    = 0x30,        /* len = 4 */
+        MCI_CONT_RST     = 0x40,        /* len = 0 */
+        MCI_SCHD_INFO    = 0x50,        /* len = 16 */
+        MCI_CPU_INT      = 0x60,        /* len = 4 */
+        MCI_SYS_WAKING   = 0x70,        /* len = 0 */
+        MCI_GPM          = 0x80,        /* len = 16 */
+        MCI_LNA_INFO     = 0x90,        /* len = 1 */
+        MCI_LNA_STATE    = 0x94,
+        MCI_LNA_TAKE     = 0x98,
+        MCI_LNA_TRANS    = 0x9c,
+        MCI_SYS_SLEEPING = 0xa0,        /* len = 0 */
+        MCI_REQ_WAKE     = 0xc0,        /* len = 0 */
+        MCI_DEBUG_16     = 0xfe,        /* len = 2 */
+        MCI_REMOTE_RESET = 0xff         /* len = 16 */
+};
+
 enum ath_mci_gpm_coex_profile_type {
         MCI_GPM_COEX_PROFILE_UNKNOWN,
         MCI_GPM_COEX_PROFILE_RFCOMM,
@@ -427,6 +457,132 @@ enum ath_mci_gpm_coex_profile_type {
         MCI_GPM_COEX_PROFILE_MAX
 };
 
+/* MCI GPM/Coex opcode/type definitions */
+enum {
+        MCI_GPM_COEX_W_GPM_PAYLOAD      = 1,
+        MCI_GPM_COEX_B_GPM_TYPE         = 4,
+        MCI_GPM_COEX_B_GPM_OPCODE       = 5,
+        /* MCI_GPM_WLAN_CAL_REQ, MCI_GPM_WLAN_CAL_DONE */
+        MCI_GPM_WLAN_CAL_W_SEQUENCE     = 2,
+
+        /* MCI_GPM_COEX_VERSION_QUERY */
+        /* MCI_GPM_COEX_VERSION_RESPONSE */
+        MCI_GPM_COEX_B_MAJOR_VERSION    = 6,
+        MCI_GPM_COEX_B_MINOR_VERSION    = 7,
+        /* MCI_GPM_COEX_STATUS_QUERY */
+        MCI_GPM_COEX_B_BT_BITMAP        = 6,
+        MCI_GPM_COEX_B_WLAN_BITMAP      = 7,
+        /* MCI_GPM_COEX_HALT_BT_GPM */
+        MCI_GPM_COEX_B_HALT_STATE       = 6,
+        /* MCI_GPM_COEX_WLAN_CHANNELS */
+        MCI_GPM_COEX_B_CHANNEL_MAP      = 6,
+        /* MCI_GPM_COEX_BT_PROFILE_INFO */
+        MCI_GPM_COEX_B_PROFILE_TYPE     = 6,
+        MCI_GPM_COEX_B_PROFILE_LINKID   = 7,
+        MCI_GPM_COEX_B_PROFILE_STATE    = 8,
+        MCI_GPM_COEX_B_PROFILE_ROLE     = 9,
+        MCI_GPM_COEX_B_PROFILE_RATE     = 10,
+        MCI_GPM_COEX_B_PROFILE_VOTYPE   = 11,
+        MCI_GPM_COEX_H_PROFILE_T        = 12,
+        MCI_GPM_COEX_B_PROFILE_W        = 14,
+        MCI_GPM_COEX_B_PROFILE_A        = 15,
+        /* MCI_GPM_COEX_BT_STATUS_UPDATE */
+        MCI_GPM_COEX_B_STATUS_TYPE      = 6,
+        MCI_GPM_COEX_B_STATUS_LINKID    = 7,
+        MCI_GPM_COEX_B_STATUS_STATE     = 8,
+        /* MCI_GPM_COEX_BT_UPDATE_FLAGS */
+        MCI_GPM_COEX_W_BT_FLAGS         = 6,
+        MCI_GPM_COEX_B_BT_FLAGS_OP      = 10
+};
+
+enum mci_gpm_subtype {
+        MCI_GPM_BT_CAL_REQ      = 0,
+        MCI_GPM_BT_CAL_GRANT    = 1,
+        MCI_GPM_BT_CAL_DONE     = 2,
+        MCI_GPM_WLAN_CAL_REQ    = 3,
+        MCI_GPM_WLAN_CAL_GRANT  = 4,
+        MCI_GPM_WLAN_CAL_DONE   = 5,
+        MCI_GPM_COEX_AGENT      = 0x0c,
+        MCI_GPM_RSVD_PATTERN    = 0xfe,
+        MCI_GPM_RSVD_PATTERN32  = 0xfefefefe,
+        MCI_GPM_BT_DEBUG        = 0xff
+};
+
+enum mci_bt_state {
+        MCI_BT_SLEEP,
+        MCI_BT_AWAKE,
+        MCI_BT_CAL_START,
+        MCI_BT_CAL
+};
+
+/* Type of state query */
+enum mci_state_type {
+        MCI_STATE_ENABLE,
+        MCI_STATE_INIT_GPM_OFFSET,
+        MCI_STATE_NEXT_GPM_OFFSET,
+        MCI_STATE_LAST_GPM_OFFSET,
+        MCI_STATE_BT,
+        MCI_STATE_SET_BT_SLEEP,
+        MCI_STATE_SET_BT_AWAKE,
+        MCI_STATE_SET_BT_CAL_START,
+        MCI_STATE_SET_BT_CAL,
+        MCI_STATE_LAST_SCHD_MSG_OFFSET,
+        MCI_STATE_REMOTE_SLEEP,
+        MCI_STATE_CONT_RSSI_POWER,
+        MCI_STATE_CONT_PRIORITY,
+        MCI_STATE_CONT_TXRX,
+        MCI_STATE_RESET_REQ_WAKE,
+        MCI_STATE_SEND_WLAN_COEX_VERSION,
+        MCI_STATE_SET_BT_COEX_VERSION,
+        MCI_STATE_SEND_WLAN_CHANNELS,
+        MCI_STATE_SEND_VERSION_QUERY,
+        MCI_STATE_SEND_STATUS_QUERY,
+        MCI_STATE_NEED_FLUSH_BT_INFO,
+        MCI_STATE_SET_CONCUR_TX_PRI,
+        MCI_STATE_RECOVER_RX,
+        MCI_STATE_NEED_FTP_STOMP,
+        MCI_STATE_NEED_TUNING,
+        MCI_STATE_DEBUG,
+        MCI_STATE_MAX
+};
+
+enum mci_gpm_coex_opcode {
+        MCI_GPM_COEX_VERSION_QUERY,
+        MCI_GPM_COEX_VERSION_RESPONSE,
+        MCI_GPM_COEX_STATUS_QUERY,
+        MCI_GPM_COEX_HALT_BT_GPM,
+        MCI_GPM_COEX_WLAN_CHANNELS,
+        MCI_GPM_COEX_BT_PROFILE_INFO,
+        MCI_GPM_COEX_BT_STATUS_UPDATE,
+        MCI_GPM_COEX_BT_UPDATE_FLAGS
+};
+
+#define MCI_GPM_NOMORE  0
+#define MCI_GPM_MORE    1
+#define MCI_GPM_INVALID 0xffffffff
+
+#define MCI_GPM_RECYCLE(_p_gpm) do {                      \
+        *(((u32 *)_p_gpm) + MCI_GPM_COEX_W_GPM_PAYLOAD) = \
+                                MCI_GPM_RSVD_PATTERN32;   \
+} while (0)
+
+#define MCI_GPM_TYPE(_p_gpm)    \
+        (*(((u8 *)(_p_gpm)) + MCI_GPM_COEX_B_GPM_TYPE) & 0xff)
+
+#define MCI_GPM_OPCODE(_p_gpm)  \
+        (*(((u8 *)(_p_gpm)) + MCI_GPM_COEX_B_GPM_OPCODE) & 0xff)
+
+#define MCI_GPM_SET_CAL_TYPE(_p_gpm, _cal_type) do {                       \
+        *(((u8 *)(_p_gpm)) + MCI_GPM_COEX_B_GPM_TYPE) = (_cal_type) & 0xff;\
+} while (0)
+
+#define MCI_GPM_SET_TYPE_OPCODE(_p_gpm, _type, _opcode) do {               \
+        *(((u8 *)(_p_gpm)) + MCI_GPM_COEX_B_GPM_TYPE) = (_type) & 0xff;    \
+        *(((u8 *)(_p_gpm)) + MCI_GPM_COEX_B_GPM_OPCODE) = (_opcode) & 0xff;\
+} while (0)
+
+#define MCI_GPM_IS_CAL_TYPE(_type) ((_type) <= MCI_GPM_WLAN_CAL_DONE)
+
 struct ath9k_beacon_state {
         u32 bs_nexttbtt;
         u32 bs_nextdtim;
@@ -954,7 +1110,6 @@ bool ath9k_hw_disable(struct ath_hw *ah);
 void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test);
 void ath9k_hw_setopmode(struct ath_hw *ah);
 void ath9k_hw_setmcastfilter(struct ath_hw *ah, u32 filter0, u32 filter1);
-void ath9k_hw_setbssidmask(struct ath_hw *ah);
 void ath9k_hw_write_associd(struct ath_hw *ah);
 u32 ath9k_hw_gettsf32(struct ath_hw *ah);
 u64 ath9k_hw_gettsf64(struct ath_hw *ah);
@@ -1047,6 +1202,32 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning);
 void ath9k_hw_proc_mib_event(struct ath_hw *ah);
 void ath9k_hw_ani_monitor(struct ath_hw *ah, struct ath9k_channel *chan);
 
+bool ar9003_mci_send_message(struct ath_hw *ah, u8 header, u32 flag,
+                             u32 *payload, u8 len, bool wait_done,
+                             bool check_bt);
+void ar9003_mci_mute_bt(struct ath_hw *ah);
+u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type, u32 *p_data);
+void ar9003_mci_setup(struct ath_hw *ah, u32 gpm_addr, void *gpm_buf,
+                      u16 len, u32 sched_addr);
+void ar9003_mci_cleanup(struct ath_hw *ah);
+void ar9003_mci_send_coex_halt_bt_gpm(struct ath_hw *ah, bool halt,
+                                      bool wait_done);
+u32 ar9003_mci_wait_for_gpm(struct ath_hw *ah, u8 gpm_type,
+                            u8 gpm_opcode, int time_out);
+void ar9003_mci_2g5g_changed(struct ath_hw *ah, bool is_2g);
+void ar9003_mci_disable_interrupt(struct ath_hw *ah);
+void ar9003_mci_enable_interrupt(struct ath_hw *ah);
+void ar9003_mci_2g5g_switch(struct ath_hw *ah, bool wait_done);
+void ar9003_mci_reset(struct ath_hw *ah, bool en_int, bool is_2g,
+                      bool is_full_sleep);
+bool ar9003_mci_check_int(struct ath_hw *ah, u32 ints);
+void ar9003_mci_remote_reset(struct ath_hw *ah, bool wait_done);
+void ar9003_mci_send_sys_waking(struct ath_hw *ah, bool wait_done);
+void ar9003_mci_send_lna_transfer(struct ath_hw *ah, bool wait_done);
+void ar9003_mci_sync_bt_state(struct ath_hw *ah);
+void ar9003_mci_get_interrupt(struct ath_hw *ah, u32 *raw_intr,
+                              u32 *rx_msg_intr);
+
 #define ATH9K_CLOCK_RATE_CCK            22
 #define ATH9K_CLOCK_RATE_5GHZ_OFDM      40
 #define ATH9K_CLOCK_RATE_2GHZ_OFDM      44
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 5cb0599b01c2..c5df98139c4d 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -17,6 +17,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/ath9k_platform.h>
+#include <linux/module.h>
 
 #include "ath9k.h"
 
@@ -257,6 +258,8 @@ static void setup_ht_cap(struct ath_softc *sc,
 
         if (AR_SREV_9330(ah) || AR_SREV_9485(ah))
                 max_streams = 1;
+        else if (AR_SREV_9462(ah))
+                max_streams = 2;
         else if (AR_SREV_9300_20_OR_LATER(ah))
                 max_streams = 3;
         else
@@ -294,9 +297,22 @@ static int ath9k_reg_notifier(struct wiphy *wiphy,
 {
         struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
         struct ath_softc *sc = hw->priv;
-        struct ath_regulatory *reg = ath9k_hw_regulatory(sc->sc_ah);
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_regulatory *reg = ath9k_hw_regulatory(ah);
+        int ret;
+
+        ret = ath_reg_notifier_apply(wiphy, request, reg);
+
+        /* Set tx power */
+        if (ah->curchan) {
+                sc->config.txpowlimit = 2 * ah->curchan->chan->max_power;
+                ath9k_ps_wakeup(sc);
+                ath9k_hw_set_txpowerlimit(ah, sc->config.txpowlimit, false);
+                sc->curtxpow = ath9k_hw_regulatory(ah)->power_limit;
+                ath9k_ps_restore(sc);
+        }
 
-        return ath_reg_notifier_apply(wiphy, request, reg);
+        return ret;
 }
 
 /*
@@ -407,6 +423,7 @@ fail:
 static int ath9k_init_btcoex(struct ath_softc *sc)
 {
         struct ath_txq *txq;
+        struct ath_hw *ah = sc->sc_ah;
         int r;
 
         switch (sc->sc_ah->btcoex_hw.scheme) {
@@ -423,8 +440,37 @@ static int ath9k_init_btcoex(struct ath_softc *sc)
                 txq = sc->tx.txq_map[WME_AC_BE];
                 ath9k_hw_init_btcoex_hw(sc->sc_ah, txq->axq_qnum);
                 sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
+                break;
+        case ATH_BTCOEX_CFG_MCI:
+                sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
                 sc->btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;
                 INIT_LIST_HEAD(&sc->btcoex.mci.info);
+
+                r = ath_mci_setup(sc);
+                if (r)
+                        return r;
+
+                if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_MCI) {
+                        ah->btcoex_hw.mci.ready = false;
+                        ah->btcoex_hw.mci.bt_state = 0;
+                        ah->btcoex_hw.mci.bt_ver_major = 3;
+                        ah->btcoex_hw.mci.bt_ver_minor = 0;
+                        ah->btcoex_hw.mci.bt_version_known = false;
+                        ah->btcoex_hw.mci.update_2g5g = true;
+                        ah->btcoex_hw.mci.is_2g = true;
+                        ah->btcoex_hw.mci.wlan_channels_update = false;
+                        ah->btcoex_hw.mci.wlan_channels[0] = 0x00000000;
+                        ah->btcoex_hw.mci.wlan_channels[1] = 0xffffffff;
+                        ah->btcoex_hw.mci.wlan_channels[2] = 0xffffffff;
+                        ah->btcoex_hw.mci.wlan_channels[3] = 0x7fffffff;
+                        ah->btcoex_hw.mci.query_bt = true;
+                        ah->btcoex_hw.mci.unhalt_bt_gpm = true;
+                        ah->btcoex_hw.mci.halted_bt_gpm = false;
+                        ah->btcoex_hw.mci.need_flush_btinfo = false;
+                        ah->btcoex_hw.mci.wlan_cal_seq = 0;
+                        ah->btcoex_hw.mci.wlan_cal_done = 0;
+                        ah->btcoex_hw.mci.config = 0x2201;
+                }
                 break;
         default:
                 WARN_ON(1);
@@ -838,6 +884,9 @@ static void ath9k_deinit_softc(struct ath_softc *sc)
             sc->sc_ah->btcoex_hw.scheme == ATH_BTCOEX_CFG_3WIRE)
                 ath_gen_timer_free(sc->sc_ah, sc->btcoex.no_stomp_timer);
 
+        if (sc->sc_ah->btcoex_hw.scheme == ATH_BTCOEX_CFG_MCI)
+                ath_mci_cleanup(sc);
+
         for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)
                 if (ATH_TXQ_SETUP(sc, i))
                         ath_tx_cleanupq(sc, &sc->tx.txq[i]);
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
index 6a8fdf33a527..0e4fbb3bea33 100644
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -16,6 +16,7 @@
 
 #include "hw.h"
 #include "hw-ops.h"
+#include <linux/export.h>
 
 static void ath9k_hw_set_txq_interrupts(struct ath_hw *ah,
                                         struct ath9k_tx_queue_info *qi)
@@ -759,7 +760,10 @@ bool ath9k_hw_intrpend(struct ath_hw *ah)
                 return true;
 
         host_isr = REG_READ(ah, AR_INTR_ASYNC_CAUSE);
-        if ((host_isr & AR_INTR_MAC_IRQ) && (host_isr != AR_INTR_SPURIOUS))
+
+        if (((host_isr & AR_INTR_MAC_IRQ) ||
+             (host_isr & AR_INTR_ASYNC_MASK_MCI)) &&
+            (host_isr != AR_INTR_SPURIOUS))
                 return true;
 
         host_isr = REG_READ(ah, AR_INTR_SYNC_CAUSE);
@@ -797,6 +801,7 @@ void ath9k_hw_enable_interrupts(struct ath_hw *ah)
 {
         struct ath_common *common = ath9k_hw_common(ah);
         u32 sync_default = AR_INTR_SYNC_DEFAULT;
+        u32 async_mask;
 
         if (!(ah->imask & ATH9K_INT_GLOBAL))
                 return;
@@ -811,13 +816,16 @@ void ath9k_hw_enable_interrupts(struct ath_hw *ah)
         if (AR_SREV_9340(ah))
                 sync_default &= ~AR_INTR_SYNC_HOST1_FATAL;
 
+        async_mask = AR_INTR_MAC_IRQ;
+
+        if (ah->imask & ATH9K_INT_MCI)
+                async_mask |= AR_INTR_ASYNC_MASK_MCI;
+
         ath_dbg(common, ATH_DBG_INTERRUPT, "enable IER\n");
         REG_WRITE(ah, AR_IER, AR_IER_ENABLE);
         if (!AR_SREV_9100(ah)) {
-                REG_WRITE(ah, AR_INTR_ASYNC_ENABLE,
-                          AR_INTR_MAC_IRQ);
-                REG_WRITE(ah, AR_INTR_ASYNC_MASK, AR_INTR_MAC_IRQ);
-
+                REG_WRITE(ah, AR_INTR_ASYNC_ENABLE, async_mask);
+                REG_WRITE(ah, AR_INTR_ASYNC_MASK, async_mask);
 
                 REG_WRITE(ah, AR_INTR_SYNC_ENABLE, sync_default);
                 REG_WRITE(ah, AR_INTR_SYNC_MASK, sync_default);
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index e43c41cff25b..7fbc4bdd4efe 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -118,7 +118,7 @@ void ath9k_ps_restore(struct ath_softc *sc)
         if (--sc->ps_usecount != 0)
                 goto unlock;
 
-        if (sc->ps_idle)
+        if (sc->ps_idle && (sc->ps_flags & PS_WAIT_FOR_TX_ACK))
                 mode = ATH9K_PM_FULL_SLEEP;
         else if (sc->ps_enabled &&
                  !(sc->ps_flags & (PS_WAIT_FOR_BEACON |
@@ -286,7 +286,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
                         ath_start_ani(common);
         }
 
-        if (ath9k_hw_ops(ah)->antdiv_comb_conf_get && sc->ant_rx != 3) {
+        if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx != 3) {
                 struct ath_hw_antcomb_conf div_ant_conf;
                 u8 lna_conf;
 
@@ -332,7 +332,8 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
                 hchan = ah->curchan;
         }
 
-        if (fastcc && !ath9k_hw_check_alive(ah))
+        if (fastcc && (ah->chip_fullsleep ||
+            !ath9k_hw_check_alive(ah)))
                 fastcc = false;
 
         if (!ath_prepare_reset(sc, retry_tx, flush))
@@ -561,7 +562,6 @@ void ath_ani_calibrate(unsigned long data)
         /* Long calibration runs independently of short calibration. */
         if ((timestamp - common->ani.longcal_timer) >= long_cal_interval) {
                 longcal = true;
-                ath_dbg(common, ATH_DBG_ANI, "longcal @%lu\n", jiffies);
                 common->ani.longcal_timer = timestamp;
         }
 
@@ -569,8 +569,6 @@ void ath_ani_calibrate(unsigned long data)
         if (!common->ani.caldone) {
                 if ((timestamp - common->ani.shortcal_timer) >= short_cal_interval) {
                         shortcal = true;
-                        ath_dbg(common, ATH_DBG_ANI,
-                                "shortcal @%lu\n", jiffies);
                         common->ani.shortcal_timer = timestamp;
                         common->ani.resetcal_timer = timestamp;
                 }
@@ -584,8 +582,9 @@ void ath_ani_calibrate(unsigned long data)
         }
 
         /* Verify whether we must check ANI */
-        if ((timestamp - common->ani.checkani_timer) >=
-             ah->config.ani_poll_interval) {
+        if (sc->sc_ah->config.enable_ani
+            && (timestamp - common->ani.checkani_timer) >=
+            ah->config.ani_poll_interval) {
                 aniflag = true;
                 common->ani.checkani_timer = timestamp;
         }
@@ -605,6 +604,11 @@ void ath_ani_calibrate(unsigned long data)
                                                 ah->rxchainmask, longcal);
         }
 
+        ath_dbg(common, ATH_DBG_ANI,
+                "Calibration @%lu finished: %s %s %s, caldone: %s\n", jiffies,
+                longcal ? "long" : "", shortcal ? "short" : "",
+                aniflag ? "ani" : "", common->ani.caldone ? "true" : "false");
+
         ath9k_ps_restore(sc);
 
 set_timer:
@@ -640,9 +644,9 @@ static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta,
         spin_lock(&sc->nodes_lock);
         list_add(&an->list, &sc->nodes);
         spin_unlock(&sc->nodes_lock);
+#endif
         an->sta = sta;
         an->vif = vif;
-#endif
         if (sc->sc_flags & SC_OP_TXAGGR) {
                 ath_tx_node_init(sc, an);
                 an->maxampdu = 1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +
@@ -742,6 +746,9 @@ void ath9k_tasklet(unsigned long data)
                 if (status & ATH9K_INT_GENTIMER)
                         ath_gen_timer_isr(sc->sc_ah);
 
+        if (status & ATH9K_INT_MCI)
+                ath_mci_intr(sc);
+
 out:
         /* re-enable hardware interrupt */
         ath9k_hw_enable_interrupts(ah);
@@ -764,7 +771,8 @@ irqreturn_t ath_isr(int irq, void *dev)
                 ATH9K_INT_BMISS |               \
                 ATH9K_INT_CST |                 \
                 ATH9K_INT_TSFOOR |              \
-                ATH9K_INT_GENTIMER)
+                ATH9K_INT_GENTIMER |            \
+                ATH9K_INT_MCI)
 
         struct ath_softc *sc = dev;
         struct ath_hw *ah = sc->sc_ah;
@@ -882,82 +890,6 @@ chip_reset:
 #undef SCHED_INTR
 }
 
-static void ath_radio_enable(struct ath_softc *sc, struct ieee80211_hw *hw)
-{
-        struct ath_hw *ah = sc->sc_ah;
-        struct ath_common *common = ath9k_hw_common(ah);
-        struct ieee80211_channel *channel = hw->conf.channel;
-        int r;
-
-        ath9k_ps_wakeup(sc);
-        spin_lock_bh(&sc->sc_pcu_lock);
-        atomic_set(&ah->intr_ref_cnt, -1);
-
-        ath9k_hw_configpcipowersave(ah, false);
-
-        if (!ah->curchan)
-                ah->curchan = ath9k_cmn_get_curchannel(sc->hw, ah);
-
-        r = ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
-        if (r) {
-                ath_err(common,
-                        "Unable to reset channel (%u MHz), reset status %d\n",
-                        channel->center_freq, r);
-        }
-
-        ath_complete_reset(sc, true);
-
-        /* Enable LED */
-        ath9k_hw_cfg_output(ah, ah->led_pin,
-                            AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-        ath9k_hw_set_gpio(ah, ah->led_pin, 0);
-
-        spin_unlock_bh(&sc->sc_pcu_lock);
-
-        ath9k_ps_restore(sc);
-}
-
-void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw)
-{
-        struct ath_hw *ah = sc->sc_ah;
-        struct ieee80211_channel *channel = hw->conf.channel;
-        int r;
-
-        ath9k_ps_wakeup(sc);
-
-        ath_cancel_work(sc);
-
-        spin_lock_bh(&sc->sc_pcu_lock);
-
-        /*
-         * Keep the LED on when the radio is disabled
-         * during idle unassociated state.
-         */
-        if (!sc->ps_idle) {
-                ath9k_hw_set_gpio(ah, ah->led_pin, 1);
-                ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
-        }
-
-        ath_prepare_reset(sc, false, true);
-
-        if (!ah->curchan)
-                ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
-
-        r = ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
-        if (r) {
-                ath_err(ath9k_hw_common(sc->sc_ah),
-                        "Unable to reset channel (%u MHz), reset status %d\n",
-                        channel->center_freq, r);
-        }
-
-        ath9k_hw_phy_disable(ah);
-
-        ath9k_hw_configpcipowersave(ah, true);
-
-        spin_unlock_bh(&sc->sc_pcu_lock);
-        ath9k_ps_restore(sc);
-}
-
 static int ath_reset(struct ath_softc *sc, bool retry_tx)
 {
         int r;
@@ -1093,6 +1025,9 @@ static int ath9k_start(struct ieee80211_hw *hw)
          * and then setup of the interrupt mask.
          */
         spin_lock_bh(&sc->sc_pcu_lock);
+
+        atomic_set(&ah->intr_ref_cnt, -1);
+
         r = ath9k_hw_reset(ah, init_channel, ah->caldata, false);
         if (r) {
                 ath_err(common,
@@ -1119,6 +1054,9 @@ static int ath9k_start(struct ieee80211_hw *hw)
         if (ah->caps.hw_caps & ATH9K_HW_CAP_HT)
                 ah->imask |= ATH9K_INT_CST;
 
+        if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
+                ah->imask |= ATH9K_INT_MCI;
+
         sc->sc_flags &= ~SC_OP_INVALID;
         sc->sc_ah->is_monitoring = false;
 
@@ -1131,6 +1069,18 @@ static int ath9k_start(struct ieee80211_hw *hw)
                 goto mutex_unlock;
         }
 
+        if (ah->led_pin >= 0) {
+                ath9k_hw_cfg_output(ah, ah->led_pin,
+                                    AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
+                ath9k_hw_set_gpio(ah, ah->led_pin, 0);
+        }
+
+        /*
+         * Reset key cache to sane defaults (all entries cleared) instead of
+         * semi-random values after suspend/resume.
+         */
+        ath9k_cmn_init_crypto(sc->sc_ah);
+
         spin_unlock_bh(&sc->sc_pcu_lock);
 
         if ((ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE) &&
@@ -1176,6 +1126,13 @@ static void ath9k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
                 }
         }
 
+        /*
+         * Cannot tx while the hardware is in full sleep, it first needs a full
+         * chip reset to recover from that
+         */
+        if (unlikely(sc->sc_ah->power_mode == ATH9K_PM_FULL_SLEEP))
+                goto exit;
+
         if (unlikely(sc->sc_ah->power_mode != ATH9K_PM_AWAKE)) {
                 /*
                  * We are using PS-Poll and mac80211 can request TX while in
@@ -1222,6 +1179,7 @@ static void ath9k_stop(struct ieee80211_hw *hw)
         struct ath_softc *sc = hw->priv;
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
+        bool prev_idle;
 
         mutex_lock(&sc->mutex);
 
@@ -1252,35 +1210,45 @@ static void ath9k_stop(struct ieee80211_hw *hw)
          * before setting the invalid flag. */
         ath9k_hw_disable_interrupts(ah);
 
-        if (!(sc->sc_flags & SC_OP_INVALID)) {
-                ath_drain_all_txq(sc, false);
-                ath_stoprecv(sc);
-                ath9k_hw_phy_disable(ah);
-        } else
-                sc->rx.rxlink = NULL;
+        spin_unlock_bh(&sc->sc_pcu_lock);
+
+        /* we can now sync irq and kill any running tasklets, since we already
+         * disabled interrupts and not holding a spin lock */
+        synchronize_irq(sc->irq);
+        tasklet_kill(&sc->intr_tq);
+        tasklet_kill(&sc->bcon_tasklet);
+
+        prev_idle = sc->ps_idle;
+        sc->ps_idle = true;
+
+        spin_lock_bh(&sc->sc_pcu_lock);
+
+        if (ah->led_pin >= 0) {
+                ath9k_hw_set_gpio(ah, ah->led_pin, 1);
+                ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
+        }
+
+        ath_prepare_reset(sc, false, true);
 
         if (sc->rx.frag) {
                 dev_kfree_skb_any(sc->rx.frag);
                 sc->rx.frag = NULL;
         }
 
-        /* disable HAL and put h/w to sleep */
-        ath9k_hw_disable(ah);
+        if (!ah->curchan)
+                ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
+
+        ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
+        ath9k_hw_phy_disable(ah);
 
-        spin_unlock_bh(&sc->sc_pcu_lock);
+        ath9k_hw_configpcipowersave(ah, true);
 
-        /* we can now sync irq and kill any running tasklets, since we already
-         * disabled interrupts and not holding a spin lock */
-        synchronize_irq(sc->irq);
-        tasklet_kill(&sc->intr_tq);
-        tasklet_kill(&sc->bcon_tasklet);
+        spin_unlock_bh(&sc->sc_pcu_lock);
 
         ath9k_ps_restore(sc);
 
-        sc->ps_idle = true;
-        ath_radio_disable(sc, hw);
-
         sc->sc_flags |= SC_OP_INVALID;
+        sc->ps_idle = prev_idle;
 
         mutex_unlock(&sc->mutex);
 
@@ -1620,8 +1588,8 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
         struct ieee80211_conf *conf = &hw->conf;
-        bool disable_radio = false;
 
+        ath9k_ps_wakeup(sc);
         mutex_lock(&sc->mutex);
 
         /*
@@ -1632,13 +1600,8 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
          */
         if (changed & IEEE80211_CONF_CHANGE_IDLE) {
                 sc->ps_idle = !!(conf->flags & IEEE80211_CONF_IDLE);
-                if (!sc->ps_idle) {
-                        ath_radio_enable(sc, hw);
-                        ath_dbg(common, ATH_DBG_CONFIG,
-                                "not-idle: enabling radio\n");
-                } else {
-                        disable_radio = true;
-                }
+                if (sc->ps_idle)
+                        ath_cancel_work(sc);
         }
 
         /*
@@ -1745,18 +1708,12 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                 ath_dbg(common, ATH_DBG_CONFIG,
                         "Set power: %d\n", conf->power_level);
                 sc->config.txpowlimit = 2 * conf->power_level;
-                ath9k_ps_wakeup(sc);
                 ath9k_cmn_update_txpow(ah, sc->curtxpow,
                                        sc->config.txpowlimit, &sc->curtxpow);
-                ath9k_ps_restore(sc);
-        }
-
-        if (disable_radio) {
-                ath_dbg(common, ATH_DBG_CONFIG, "idle: disabling radio\n");
-                ath_radio_disable(sc, hw);
         }
 
         mutex_unlock(&sc->mutex);
+        ath9k_ps_restore(sc);
 
         return 0;
 }
@@ -1916,7 +1873,8 @@ static int ath9k_set_key(struct ieee80211_hw *hw,
         if (ath9k_modparam_nohwcrypt)
                 return -ENOSPC;
 
-        if (vif->type == NL80211_IFTYPE_ADHOC &&
+        if ((vif->type == NL80211_IFTYPE_ADHOC ||
+             vif->type == NL80211_IFTYPE_MESH_POINT) &&
             (key->cipher == WLAN_CIPHER_SUITE_TKIP ||
              key->cipher == WLAN_CIPHER_SUITE_CCMP) &&
             !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
@@ -2324,9 +2282,6 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop)
                 return;
         }
 
-        if (drop)
-                timeout = 1;
-
         for (j = 0; j < timeout; j++) {
                 bool npend = false;
 
@@ -2344,21 +2299,22 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop)
                 }
 
                 if (!npend)
-                    goto out;
+                    break;
         }
 
-        ath9k_ps_wakeup(sc);
-        spin_lock_bh(&sc->sc_pcu_lock);
-        drain_txq = ath_drain_all_txq(sc, false);
-        spin_unlock_bh(&sc->sc_pcu_lock);
+        if (drop) {
+                ath9k_ps_wakeup(sc);
+                spin_lock_bh(&sc->sc_pcu_lock);
+                drain_txq = ath_drain_all_txq(sc, false);
+                spin_unlock_bh(&sc->sc_pcu_lock);
 
-        if (!drain_txq)
-                ath_reset(sc, false);
+                if (!drain_txq)
+                        ath_reset(sc, false);
 
-        ath9k_ps_restore(sc);
-        ieee80211_wake_queues(hw);
+                ath9k_ps_restore(sc);
+                ieee80211_wake_queues(hw);
+        }
 
-out:
         ieee80211_queue_delayed_work(hw, &sc->tx_complete_work, 0);
         mutex_unlock(&sc->mutex);
 }
diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c
index 0fbb141bc302..691bf47906e2 100644
--- a/drivers/net/wireless/ath/ath9k/mci.c
+++ b/drivers/net/wireless/ath/ath9k/mci.c
@@ -14,6 +14,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/dma-mapping.h>
+#include <linux/slab.h>
+
 #include "ath9k.h"
 #include "mci.h"
 
@@ -181,8 +184,58 @@ static void ath_mci_update_scheme(struct ath_softc *sc)
         ath9k_btcoex_timer_resume(sc);
 }
 
-void ath_mci_process_profile(struct ath_softc *sc,
-                             struct ath_mci_profile_info *info)
+
+static void ath_mci_cal_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload)
+{
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(ah);
+        u32 payload[4] = {0, 0, 0, 0};
+
+        switch (opcode) {
+        case MCI_GPM_BT_CAL_REQ:
+
+                ath_dbg(common, ATH_DBG_MCI, "MCI received BT_CAL_REQ\n");
+
+                if (ar9003_mci_state(ah, MCI_STATE_BT, NULL) == MCI_BT_AWAKE) {
+                        ar9003_mci_state(ah, MCI_STATE_SET_BT_CAL_START, NULL);
+                        ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
+                } else
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI State mismatches: %d\n",
+                                ar9003_mci_state(ah, MCI_STATE_BT, NULL));
+
+                break;
+
+        case MCI_GPM_BT_CAL_DONE:
+
+                ath_dbg(common, ATH_DBG_MCI, "MCI received BT_CAL_DONE\n");
+
+                if (ar9003_mci_state(ah, MCI_STATE_BT, NULL) == MCI_BT_CAL)
+                        ath_dbg(common, ATH_DBG_MCI, "MCI error illegal!\n");
+                else
+                        ath_dbg(common, ATH_DBG_MCI, "MCI BT not in CAL state\n");
+
+                break;
+
+        case MCI_GPM_BT_CAL_GRANT:
+
+                ath_dbg(common, ATH_DBG_MCI, "MCI received BT_CAL_GRANT\n");
+
+                /* Send WLAN_CAL_DONE for now */
+                ath_dbg(common, ATH_DBG_MCI, "MCI send WLAN_CAL_DONE\n");
+                MCI_GPM_SET_CAL_TYPE(payload, MCI_GPM_WLAN_CAL_DONE);
+                ar9003_mci_send_message(sc->sc_ah, MCI_GPM, 0, payload,
+                                        16, false, true);
+                break;
+
+        default:
+                ath_dbg(common, ATH_DBG_MCI, "MCI Unknown GPM CAL message\n");
+                break;
+        }
+}
+
+static void ath_mci_process_profile(struct ath_softc *sc,
+                                    struct ath_mci_profile_info *info)
 {
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_btcoex *btcoex = &sc->btcoex;
@@ -208,8 +261,8 @@ void ath_mci_process_profile(struct ath_softc *sc,
         ath_mci_update_scheme(sc);
 }
 
-void ath_mci_process_status(struct ath_softc *sc,
-                            struct ath_mci_profile_status *status)
+static void ath_mci_process_status(struct ath_softc *sc,
+                                   struct ath_mci_profile_status *status)
 {
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_btcoex *btcoex = &sc->btcoex;
@@ -252,3 +305,369 @@ void ath_mci_process_status(struct ath_softc *sc,
         if (old_num_mgmt != mci->num_mgmt)
                 ath_mci_update_scheme(sc);
 }
+
+static void ath_mci_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload)
+{
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_mci_profile_info profile_info;
+        struct ath_mci_profile_status profile_status;
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+        u32 version;
+        u8 major;
+        u8 minor;
+        u32 seq_num;
+
+        switch (opcode) {
+
+        case MCI_GPM_COEX_VERSION_QUERY:
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI Recv GPM COEX Version Query.\n");
+                version = ar9003_mci_state(ah,
+                                MCI_STATE_SEND_WLAN_COEX_VERSION, NULL);
+                break;
+
+        case MCI_GPM_COEX_VERSION_RESPONSE:
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI Recv GPM COEX Version Response.\n");
+                major = *(rx_payload + MCI_GPM_COEX_B_MAJOR_VERSION);
+                minor = *(rx_payload + MCI_GPM_COEX_B_MINOR_VERSION);
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI BT Coex version: %d.%d\n", major, minor);
+                version = (major << 8) + minor;
+                version = ar9003_mci_state(ah,
+                          MCI_STATE_SET_BT_COEX_VERSION, &version);
+                break;
+
+        case MCI_GPM_COEX_STATUS_QUERY:
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI Recv GPM COEX Status Query = 0x%02x.\n",
+                        *(rx_payload + MCI_GPM_COEX_B_WLAN_BITMAP));
+                ar9003_mci_state(ah,
+                MCI_STATE_SEND_WLAN_CHANNELS, NULL);
+                break;
+
+        case MCI_GPM_COEX_BT_PROFILE_INFO:
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI Recv GPM Coex BT profile info\n");
+                memcpy(&profile_info,
+                       (rx_payload + MCI_GPM_COEX_B_PROFILE_TYPE), 10);
+
+                if ((profile_info.type == MCI_GPM_COEX_PROFILE_UNKNOWN)
+                    || (profile_info.type >=
+                                            MCI_GPM_COEX_PROFILE_MAX)) {
+
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "illegal profile type = %d,"
+                                "state = %d\n", profile_info.type,
+                                profile_info.start);
+                        break;
+                }
+
+                ath_mci_process_profile(sc, &profile_info);
+                break;
+
+        case MCI_GPM_COEX_BT_STATUS_UPDATE:
+                profile_status.is_link = *(rx_payload +
+                                           MCI_GPM_COEX_B_STATUS_TYPE);
+                profile_status.conn_handle = *(rx_payload +
+                                               MCI_GPM_COEX_B_STATUS_LINKID);
+                profile_status.is_critical = *(rx_payload +
+                                               MCI_GPM_COEX_B_STATUS_STATE);
+
+                seq_num = *((u32 *)(rx_payload + 12));
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI Recv GPM COEX BT_Status_Update: "
+                        "is_link=%d, linkId=%d, state=%d, SEQ=%d\n",
+                        profile_status.is_link, profile_status.conn_handle,
+                        profile_status.is_critical, seq_num);
+
+                ath_mci_process_status(sc, &profile_status);
+                break;
+
+        default:
+                ath_dbg(common, ATH_DBG_MCI,
+                "MCI Unknown GPM COEX message = 0x%02x\n", opcode);
+                break;
+        }
+}
+
+static int ath_mci_buf_alloc(struct ath_softc *sc, struct ath_mci_buf *buf)
+{
+        int error = 0;
+
+        buf->bf_addr = dma_alloc_coherent(sc->dev, buf->bf_len,
+                                          &buf->bf_paddr, GFP_KERNEL);
+
+        if (buf->bf_addr == NULL) {
+                error = -ENOMEM;
+                goto fail;
+        }
+
+        return 0;
+
+fail:
+        memset(buf, 0, sizeof(*buf));
+        return error;
+}
+
+static void ath_mci_buf_free(struct ath_softc *sc, struct ath_mci_buf *buf)
+{
+        if (buf->bf_addr) {
+                dma_free_coherent(sc->dev, buf->bf_len, buf->bf_addr,
+                                                        buf->bf_paddr);
+                memset(buf, 0, sizeof(*buf));
+        }
+}
+
+int ath_mci_setup(struct ath_softc *sc)
+{
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+        struct ath_mci_coex *mci = &sc->mci_coex;
+        int error = 0;
+
+        mci->sched_buf.bf_len = ATH_MCI_SCHED_BUF_SIZE + ATH_MCI_GPM_BUF_SIZE;
+
+        if (ath_mci_buf_alloc(sc, &mci->sched_buf)) {
+                ath_dbg(common, ATH_DBG_FATAL, "MCI buffer alloc failed\n");
+                error = -ENOMEM;
+                goto fail;
+        }
+
+        mci->sched_buf.bf_len = ATH_MCI_SCHED_BUF_SIZE;
+
+        memset(mci->sched_buf.bf_addr, MCI_GPM_RSVD_PATTERN,
+                                                mci->sched_buf.bf_len);
+
+        mci->gpm_buf.bf_len = ATH_MCI_GPM_BUF_SIZE;
+        mci->gpm_buf.bf_addr = (u8 *)mci->sched_buf.bf_addr +
+                                                        mci->sched_buf.bf_len;
+        mci->gpm_buf.bf_paddr = mci->sched_buf.bf_paddr + mci->sched_buf.bf_len;
+
+        /* initialize the buffer */
+        memset(mci->gpm_buf.bf_addr, MCI_GPM_RSVD_PATTERN, mci->gpm_buf.bf_len);
+
+        ar9003_mci_setup(sc->sc_ah, mci->gpm_buf.bf_paddr,
+                         mci->gpm_buf.bf_addr, (mci->gpm_buf.bf_len >> 4),
+                         mci->sched_buf.bf_paddr);
+fail:
+        return error;
+}
+
+void ath_mci_cleanup(struct ath_softc *sc)
+{
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_mci_coex *mci = &sc->mci_coex;
+
+        /*
+         * both schedule and gpm buffers will be released
+         */
+        ath_mci_buf_free(sc, &mci->sched_buf);
+        ar9003_mci_cleanup(ah);
+}
+
+void ath_mci_intr(struct ath_softc *sc)
+{
+        struct ath_mci_coex *mci = &sc->mci_coex;
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(ah);
+        u32 mci_int, mci_int_rxmsg;
+        u32 offset, subtype, opcode;
+        u32 *pgpm;
+        u32 more_data = MCI_GPM_MORE;
+        bool skip_gpm = false;
+
+        ar9003_mci_get_interrupt(sc->sc_ah, &mci_int, &mci_int_rxmsg);
+
+        if (ar9003_mci_state(ah, MCI_STATE_ENABLE, NULL) == 0) {
+
+                ar9003_mci_state(sc->sc_ah, MCI_STATE_INIT_GPM_OFFSET, NULL);
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI interrupt but MCI disabled\n");
+
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI interrupt: intr = 0x%x, intr_rxmsg = 0x%x\n",
+                        mci_int, mci_int_rxmsg);
+                return;
+        }
+
+        if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE) {
+                u32 payload[4] = { 0xffffffff, 0xffffffff,
+                                   0xffffffff, 0xffffff00};
+
+                /*
+                 * The following REMOTE_RESET and SYS_WAKING used to sent
+                 * only when BT wake up. Now they are always sent, as a
+                 * recovery method to reset BT MCI's RX alignment.
+                 */
+                ath_dbg(common, ATH_DBG_MCI, "MCI interrupt send REMOTE_RESET\n");
+
+                ar9003_mci_send_message(ah, MCI_REMOTE_RESET, 0,
+                                        payload, 16, true, false);
+                ath_dbg(common, ATH_DBG_MCI, "MCI interrupt send SYS_WAKING\n");
+                ar9003_mci_send_message(ah, MCI_SYS_WAKING, 0,
+                                        NULL, 0, true, false);
+
+                mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE;
+                ar9003_mci_state(ah, MCI_STATE_RESET_REQ_WAKE, NULL);
+
+                /*
+                 * always do this for recovery and 2G/5G toggling and LNA_TRANS
+                 */
+                ath_dbg(common, ATH_DBG_MCI, "MCI Set BT state to AWAKE.\n");
+                ar9003_mci_state(ah, MCI_STATE_SET_BT_AWAKE, NULL);
+        }
+
+        /* Processing SYS_WAKING/SYS_SLEEPING */
+        if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING) {
+                mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING;
+
+                if (ar9003_mci_state(ah, MCI_STATE_BT, NULL) == MCI_BT_SLEEP) {
+
+                        if (ar9003_mci_state(ah, MCI_STATE_REMOTE_SLEEP, NULL)
+                                        == MCI_BT_SLEEP)
+                                ath_dbg(common, ATH_DBG_MCI,
+                                        "MCI BT stays in sleep mode\n");
+                        else {
+                                ath_dbg(common, ATH_DBG_MCI,
+                                        "MCI Set BT state to AWAKE.\n");
+                                ar9003_mci_state(ah,
+                                                 MCI_STATE_SET_BT_AWAKE, NULL);
+                        }
+                } else
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI BT stays in AWAKE mode.\n");
+        }
+
+        if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING) {
+
+                mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING;
+
+                if (ar9003_mci_state(ah, MCI_STATE_BT, NULL) == MCI_BT_AWAKE) {
+
+                        if (ar9003_mci_state(ah, MCI_STATE_REMOTE_SLEEP, NULL)
+                                        == MCI_BT_AWAKE)
+                                ath_dbg(common, ATH_DBG_MCI,
+                                        "MCI BT stays in AWAKE mode.\n");
+                        else {
+                                ath_dbg(common, ATH_DBG_MCI,
+                                        "MCI SetBT state to SLEEP\n");
+                                ar9003_mci_state(ah, MCI_STATE_SET_BT_SLEEP,
+                                                 NULL);
+                        }
+                } else
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "MCI BT stays in SLEEP mode\n");
+        }
+
+        if ((mci_int & AR_MCI_INTERRUPT_RX_INVALID_HDR) ||
+            (mci_int & AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT)) {
+
+                ath_dbg(common, ATH_DBG_MCI, "MCI RX broken, skip GPM msgs\n");
+                ar9003_mci_state(ah, MCI_STATE_RECOVER_RX, NULL);
+                skip_gpm = true;
+        }
+
+        if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO) {
+
+                mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO;
+                offset = ar9003_mci_state(ah, MCI_STATE_LAST_SCHD_MSG_OFFSET,
+                                          NULL);
+        }
+
+        if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_GPM) {
+
+                mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_GPM;
+
+                while (more_data == MCI_GPM_MORE) {
+
+                        pgpm = mci->gpm_buf.bf_addr;
+                        offset = ar9003_mci_state(ah,
+                                        MCI_STATE_NEXT_GPM_OFFSET, &more_data);
+
+                        if (offset == MCI_GPM_INVALID)
+                                break;
+
+                        pgpm += (offset >> 2);
+
+                        /*
+                         * The first dword is timer.
+                         * The real data starts from 2nd dword.
+                         */
+
+                        subtype = MCI_GPM_TYPE(pgpm);
+                        opcode = MCI_GPM_OPCODE(pgpm);
+
+                        if (!skip_gpm) {
+
+                                if (MCI_GPM_IS_CAL_TYPE(subtype))
+                                        ath_mci_cal_msg(sc, subtype,
+                                                        (u8 *) pgpm);
+                                else {
+                                        switch (subtype) {
+                                        case MCI_GPM_COEX_AGENT:
+                                                ath_mci_msg(sc, opcode,
+                                                            (u8 *) pgpm);
+                                                break;
+                                        default:
+                                                break;
+                                        }
+                                }
+                        }
+                        MCI_GPM_RECYCLE(pgpm);
+                }
+        }
+
+        if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_HW_MSG_MASK) {
+
+                if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL)
+                        mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL;
+
+                if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_LNA_INFO) {
+                        mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_LNA_INFO;
+                        ath_dbg(common, ATH_DBG_MCI, "MCI LNA_INFO\n");
+                }
+
+                if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_CONT_INFO) {
+
+                        int value_dbm = ar9003_mci_state(ah,
+                                        MCI_STATE_CONT_RSSI_POWER, NULL);
+
+                        mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_CONT_INFO;
+
+                        if (ar9003_mci_state(ah, MCI_STATE_CONT_TXRX, NULL))
+                                ath_dbg(common, ATH_DBG_MCI,
+                                        "MCI CONT_INFO: "
+                                        "(tx) pri = %d, pwr = %d dBm\n",
+                                        ar9003_mci_state(ah,
+                                                MCI_STATE_CONT_PRIORITY, NULL),
+                                        value_dbm);
+                        else
+                                ath_dbg(common, ATH_DBG_MCI,
+                                        "MCI CONT_INFO:"
+                                        "(rx) pri = %d,pwr = %d dBm\n",
+                                        ar9003_mci_state(ah,
+                                                MCI_STATE_CONT_PRIORITY, NULL),
+                                        value_dbm);
+                }
+
+                if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_CONT_NACK) {
+                        mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_CONT_NACK;
+                        ath_dbg(common, ATH_DBG_MCI, "MCI CONT_NACK\n");
+                }
+
+                if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_CONT_RST) {
+                        mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_CONT_RST;
+                        ath_dbg(common, ATH_DBG_MCI, "MCI CONT_RST\n");
+                }
+        }
+
+        if ((mci_int & AR_MCI_INTERRUPT_RX_INVALID_HDR) ||
+            (mci_int & AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT))
+                mci_int &= ~(AR_MCI_INTERRUPT_RX_INVALID_HDR |
+                             AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT);
+
+        if (mci_int_rxmsg & 0xfffffffe)
+                ath_dbg(common, ATH_DBG_MCI,
+                        "MCI not processed mci_int_rxmsg = 0x%x\n",
+                        mci_int_rxmsg);
+}
diff --git a/drivers/net/wireless/ath/ath9k/mci.h b/drivers/net/wireless/ath/ath9k/mci.h
index 9590c61822d1..29e3e51d078f 100644
--- a/drivers/net/wireless/ath/ath9k/mci.h
+++ b/drivers/net/wireless/ath/ath9k/mci.h
@@ -17,6 +17,9 @@
 #ifndef MCI_H
 #define MCI_H
 
+#define ATH_MCI_SCHED_BUF_SIZE          (16 * 16) /* 16 entries, 4 dword each */
+#define ATH_MCI_GPM_MAX_ENTRY           16
+#define ATH_MCI_GPM_BUF_SIZE            (ATH_MCI_GPM_MAX_ENTRY * 16)
 #define ATH_MCI_DEF_BT_PERIOD           40
 #define ATH_MCI_BDR_DUTY_CYCLE          20
 #define ATH_MCI_MAX_DUTY_CYCLE          90
@@ -110,9 +113,22 @@ struct ath_mci_profile {
         u8 num_bdr;
 };
 
+
+struct ath_mci_buf {
+        void *bf_addr;          /* virtual addr of desc */
+        dma_addr_t bf_paddr;    /* physical addr of buffer */
+        u32 bf_len;             /* len of data */
+};
+
+struct ath_mci_coex {
+        atomic_t mci_cal_flag;
+        struct ath_mci_buf sched_buf;
+        struct ath_mci_buf gpm_buf;
+        u32 bt_cal_start;
+};
+
 void ath_mci_flush_profile(struct ath_mci_profile *mci);
-void ath_mci_process_profile(struct ath_softc *sc,
-                             struct ath_mci_profile_info *info);
-void ath_mci_process_status(struct ath_softc *sc,
-                            struct ath_mci_profile_status *status);
+int ath_mci_setup(struct ath_softc *sc);
+void ath_mci_cleanup(struct ath_softc *sc);
+void ath_mci_intr(struct ath_softc *sc);
 #endif
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index edb0b4b3da3a..a439edc5dc06 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -18,6 +18,7 @@
 #include <linux/pci.h>
 #include <linux/pci-aspm.h>
 #include <linux/ath9k_platform.h>
+#include <linux/module.h>
 #include "ath9k.h"
 
 static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
@@ -306,12 +307,11 @@ static int ath_pci_suspend(struct device *device)
         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
         struct ath_softc *sc = hw->priv;
 
-        ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 1);
-
         /* The device has to be moved to FULLSLEEP forcibly.
          * Otherwise the chip never moved to full sleep,
          * when no interface is up.
          */
+        ath9k_hw_disable(sc->sc_ah);
         ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_FULL_SLEEP);
 
         return 0;
@@ -320,8 +320,6 @@ static int ath_pci_suspend(struct device *device)
 static int ath_pci_resume(struct device *device)
 {
         struct pci_dev *pdev = to_pci_dev(device);
-        struct ieee80211_hw *hw = pci_get_drvdata(pdev);
-        struct ath_softc *sc = hw->priv;
         u32 val;
 
         /*
@@ -333,22 +331,6 @@ static int ath_pci_resume(struct device *device)
         if ((val & 0x0000ff00) != 0)
                 pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
 
-        ath9k_ps_wakeup(sc);
-        /* Enable LED */
-        ath9k_hw_cfg_output(sc->sc_ah, sc->sc_ah->led_pin,
-                            AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-        ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 0);
-
-          /*
-           * Reset key cache to sane defaults (all entries cleared) instead of
-           * semi-random values after suspend/resume.
-           */
-        ath9k_cmn_init_crypto(sc->sc_ah);
-        ath9k_ps_restore(sc);
-
-        sc->ps_idle = true;
-        ath_radio_disable(sc, hw);
-
         return 0;
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 8448281dd069..528d5f3e868c 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -16,6 +16,7 @@
  */
 
 #include <linux/slab.h>
+#include <linux/export.h>
 
 #include "ath9k.h"
 
@@ -1270,7 +1271,9 @@ static void ath_rc_init(struct ath_softc *sc,
 
         ath_rc_priv->max_valid_rate = k;
         ath_rc_sort_validrates(rate_table, ath_rc_priv);
-        ath_rc_priv->rate_max_phy = ath_rc_priv->valid_rate_index[k-4];
+        ath_rc_priv->rate_max_phy = (k > 4) ?
+                                        ath_rc_priv->valid_rate_index[k-4] :
+                                        ath_rc_priv->valid_rate_index[k-1];
         ath_rc_priv->rate_table = rate_table;
 
         ath_dbg(common, ATH_DBG_CONFIG,
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index 67b862cdae6d..ad5176de07dc 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -475,7 +475,6 @@ u32 ath_calcrxfilter(struct ath_softc *sc)
 
         return rfilt;
 
-#undef RX_FILTER_PRESERVE
 }
 
 int ath_startrecv(struct ath_softc *sc)
@@ -1824,6 +1823,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                 hdr = (struct ieee80211_hdr *) (hdr_skb->data + rx_status_len);
                 rxs = IEEE80211_SKB_RXCB(hdr_skb);
                 if (ieee80211_is_beacon(hdr->frame_control) &&
+                    !is_zero_ether_addr(common->curbssid) &&
                     !compare_ether_addr(hdr->addr3, common->curbssid))
                         rs.is_mybeacon = true;
                 else
@@ -1838,11 +1838,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                 if (sc->sc_flags & SC_OP_RXFLUSH)
                         goto requeue_drop_frag;
 
-                retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs,
-                                                 rxs, &decrypt_error);
-                if (retval)
-                        goto requeue_drop_frag;
-
                 rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp;
                 if (rs.rs_tstamp > tsf_lower &&
                     unlikely(rs.rs_tstamp - tsf_lower > 0x10000000))
@@ -1852,6 +1847,11 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                     unlikely(tsf_lower - rs.rs_tstamp > 0x10000000))
                         rxs->mactime += 0x100000000ULL;
 
+                retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs,
+                                                 rxs, &decrypt_error);
+                if (retval)
+                        goto requeue_drop_frag;
+
                 /* Ensure we always have an skb to requeue once we are done
                  * processing the current buffer's skb */
                 requeue_skb = ath_rxbuf_alloc(common, common->rx_bufsize, GFP_ATOMIC);
@@ -1923,15 +1923,20 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                         skb = hdr_skb;
                 }
 
-                /*
-                 * change the default rx antenna if rx diversity chooses the
-                 * other antenna 3 times in a row.
-                 */
-                if (sc->rx.defant != rs.rs_antenna) {
-                        if (++sc->rx.rxotherant >= 3)
-                                ath_setdefantenna(sc, rs.rs_antenna);
-                } else {
-                        sc->rx.rxotherant = 0;
+
+                if (ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) {
+
+                        /*
+                         * change the default rx antenna if rx diversity
+                         * chooses the other antenna 3 times in a row.
+                         */
+                        if (sc->rx.defant != rs.rs_antenna) {
+                                if (++sc->rx.rxotherant >= 3)
+                                        ath_setdefantenna(sc, rs.rs_antenna);
+                        } else {
+                                sc->rx.rxotherant = 0;
+                        }
+
                 }
 
                 if (rxs->flag & RX_FLAG_MMIC_STRIPPED)
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index 45910975d853..6e2f18861f5d 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -1006,6 +1006,8 @@ enum {
 #define AR_INTR_ASYNC_MASK                       (AR_SREV_9340(ah) ? 0x4018 : 0x4030)
 #define AR_INTR_ASYNC_MASK_GPIO                  0xFFFC0000
 #define AR_INTR_ASYNC_MASK_GPIO_S                18
+#define AR_INTR_ASYNC_MASK_MCI                   0x00000080
+#define AR_INTR_ASYNC_MASK_MCI_S                 7
 
 #define AR_INTR_SYNC_MASK                        (AR_SREV_9340(ah) ? 0x401c : 0x4034)
 #define AR_INTR_SYNC_MASK_GPIO                   0xFFFC0000
@@ -1013,6 +1015,14 @@ enum {
 
 #define AR_INTR_ASYNC_CAUSE_CLR                  (AR_SREV_9340(ah) ? 0x4020 : 0x4038)
 #define AR_INTR_ASYNC_CAUSE                      (AR_SREV_9340(ah) ? 0x4020 : 0x4038)
+#define AR_INTR_ASYNC_CAUSE_MCI                  0x00000080
+#define AR_INTR_ASYNC_USED                       (AR_INTR_MAC_IRQ | \
+                                                  AR_INTR_ASYNC_CAUSE_MCI)
+
+/* Asynchronous Interrupt Enable Register */
+#define AR_INTR_ASYNC_ENABLE_MCI         0x00000080
+#define AR_INTR_ASYNC_ENABLE_MCI_S       7
+
 
 #define AR_INTR_ASYNC_ENABLE                     (AR_SREV_9340(ah) ? 0x4024 : 0x403c)
 #define AR_INTR_ASYNC_ENABLE_GPIO                0xFFFC0000
@@ -1269,6 +1279,8 @@ enum {
 #define AR_RTC_INTR_MASK \
         ((AR_SREV_9100(ah)) ? (AR_RTC_BASE + 0x0058) : 0x7058)
 
+#define AR_RTC_KEEP_AWAKE       0x7034
+
 /* RTC_DERIVED_* - only for AR9100 */
 
 #define AR_RTC_DERIVED_CLK \
@@ -1555,6 +1567,8 @@ enum {
 #define AR_DIAG_FRAME_NV0           0x00020000
 #define AR_DIAG_OBS_PT_SEL1         0x000C0000
 #define AR_DIAG_OBS_PT_SEL1_S       18
+#define AR_DIAG_OBS_PT_SEL2         0x08000000
+#define AR_DIAG_OBS_PT_SEL2_S       27
 #define AR_DIAG_FORCE_RX_CLEAR      0x00100000 /* force rx_clear high */
 #define AR_DIAG_IGNORE_VIRT_CS      0x00200000
 #define AR_DIAG_FORCE_CH_IDLE_HIGH  0x00400000
@@ -1929,37 +1943,277 @@ enum {
 #define AR_PHY_AGC_CONTROL_YCOK_MAX_S           6
 
 /* MCI Registers */
-#define AR_MCI_INTERRUPT_RX_MSG_EN              0x183c
-#define AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET    0x00000001
-#define AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET_S  0
-#define AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL     0x00000002
-#define AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL_S   1
-#define AR_MCI_INTERRUPT_RX_MSG_CONT_NACK       0x00000004
-#define AR_MCI_INTERRUPT_RX_MSG_CONT_NACK_S     2
-#define AR_MCI_INTERRUPT_RX_MSG_CONT_INFO       0x00000008
-#define AR_MCI_INTERRUPT_RX_MSG_CONT_INFO_S     3
-#define AR_MCI_INTERRUPT_RX_MSG_CONT_RST        0x00000010
-#define AR_MCI_INTERRUPT_RX_MSG_CONT_RST_S      4
-#define AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO       0x00000020
-#define AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO_S     5
-#define AR_MCI_INTERRUPT_RX_MSG_CPU_INT         0x00000040
-#define AR_MCI_INTERRUPT_RX_MSG_CPU_INT_S       6
-#define AR_MCI_INTERRUPT_RX_MSG_GPM             0x00000100
-#define AR_MCI_INTERRUPT_RX_MSG_GPM_S           8
-#define AR_MCI_INTERRUPT_RX_MSG_LNA_INFO        0x00000200
-#define AR_MCI_INTERRUPT_RX_MSG_LNA_INFO_S      9
-#define AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING    0x00000400
-#define AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING_S  10
-#define AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING      0x00000800
-#define AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING_S    11
-#define AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE        0x00001000
-#define AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE_S      12
-#define AR_MCI_INTERRUPT_RX_HW_MSG_MASK (AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO  | \
+
+#define AR_MCI_COMMAND0                         0x1800
+#define AR_MCI_COMMAND0_HEADER                  0xFF
+#define AR_MCI_COMMAND0_HEADER_S                0
+#define AR_MCI_COMMAND0_LEN                     0x1f00
+#define AR_MCI_COMMAND0_LEN_S                   8
+#define AR_MCI_COMMAND0_DISABLE_TIMESTAMP       0x2000
+#define AR_MCI_COMMAND0_DISABLE_TIMESTAMP_S     13
+
+#define AR_MCI_COMMAND1                         0x1804
+
+#define AR_MCI_COMMAND2                         0x1808
+#define AR_MCI_COMMAND2_RESET_TX                0x01
+#define AR_MCI_COMMAND2_RESET_TX_S              0
+#define AR_MCI_COMMAND2_RESET_RX                0x02
+#define AR_MCI_COMMAND2_RESET_RX_S              1
+#define AR_MCI_COMMAND2_RESET_RX_NUM_CYCLES     0x3FC
+#define AR_MCI_COMMAND2_RESET_RX_NUM_CYCLES_S   2
+#define AR_MCI_COMMAND2_RESET_REQ_WAKEUP        0x400
+#define AR_MCI_COMMAND2_RESET_REQ_WAKEUP_S      10
+
+#define AR_MCI_RX_CTRL                          0x180c
+
+#define AR_MCI_TX_CTRL                          0x1810
+/* 0 = no division, 1 = divide by 2, 2 = divide by 4, 3 = divide by 8 */
+#define AR_MCI_TX_CTRL_CLK_DIV                  0x03
+#define AR_MCI_TX_CTRL_CLK_DIV_S                0
+#define AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE       0x04
+#define AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE_S     2
+#define AR_MCI_TX_CTRL_GAIN_UPDATE_FREQ         0xFFFFF8
+#define AR_MCI_TX_CTRL_GAIN_UPDATE_FREQ_S       3
+#define AR_MCI_TX_CTRL_GAIN_UPDATE_NUM          0xF000000
+#define AR_MCI_TX_CTRL_GAIN_UPDATE_NUM_S        24
+
+#define AR_MCI_MSG_ATTRIBUTES_TABLE                     0x1814
+#define AR_MCI_MSG_ATTRIBUTES_TABLE_CHECKSUM            0xFFFF
+#define AR_MCI_MSG_ATTRIBUTES_TABLE_CHECKSUM_S          0
+#define AR_MCI_MSG_ATTRIBUTES_TABLE_INVALID_HDR         0xFFFF0000
+#define AR_MCI_MSG_ATTRIBUTES_TABLE_INVALID_HDR_S       16
+
+#define AR_MCI_SCHD_TABLE_0                             0x1818
+#define AR_MCI_SCHD_TABLE_1                             0x181c
+#define AR_MCI_GPM_0                                    0x1820
+#define AR_MCI_GPM_1                                    0x1824
+#define AR_MCI_GPM_WRITE_PTR                            0xFFFF0000
+#define AR_MCI_GPM_WRITE_PTR_S                          16
+#define AR_MCI_GPM_BUF_LEN                              0x0000FFFF
+#define AR_MCI_GPM_BUF_LEN_S                            0
+
+#define AR_MCI_INTERRUPT_RAW                            0x1828
+#define AR_MCI_INTERRUPT_EN                             0x182c
+#define AR_MCI_INTERRUPT_SW_MSG_DONE                    0x00000001
+#define AR_MCI_INTERRUPT_SW_MSG_DONE_S                  0
+#define AR_MCI_INTERRUPT_CPU_INT_MSG                    0x00000002
+#define AR_MCI_INTERRUPT_CPU_INT_MSG_S                  1
+#define AR_MCI_INTERRUPT_RX_CKSUM_FAIL                  0x00000004
+#define AR_MCI_INTERRUPT_RX_CKSUM_FAIL_S                2
+#define AR_MCI_INTERRUPT_RX_INVALID_HDR                 0x00000008
+#define AR_MCI_INTERRUPT_RX_INVALID_HDR_S               3
+#define AR_MCI_INTERRUPT_RX_HW_MSG_FAIL                 0x00000010
+#define AR_MCI_INTERRUPT_RX_HW_MSG_FAIL_S               4
+#define AR_MCI_INTERRUPT_RX_SW_MSG_FAIL                 0x00000020
+#define AR_MCI_INTERRUPT_RX_SW_MSG_FAIL_S               5
+#define AR_MCI_INTERRUPT_TX_HW_MSG_FAIL                 0x00000080
+#define AR_MCI_INTERRUPT_TX_HW_MSG_FAIL_S               7
+#define AR_MCI_INTERRUPT_TX_SW_MSG_FAIL                 0x00000100
+#define AR_MCI_INTERRUPT_TX_SW_MSG_FAIL_S               8
+#define AR_MCI_INTERRUPT_RX_MSG                         0x00000200
+#define AR_MCI_INTERRUPT_RX_MSG_S                       9
+#define AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE            0x00000400
+#define AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE_S          10
+#define AR_MCI_INTERRUPT_BT_PRI                         0x07fff800
+#define AR_MCI_INTERRUPT_BT_PRI_S                       11
+#define AR_MCI_INTERRUPT_BT_PRI_THRESH                  0x08000000
+#define AR_MCI_INTERRUPT_BT_PRI_THRESH_S                27
+#define AR_MCI_INTERRUPT_BT_FREQ                        0x10000000
+#define AR_MCI_INTERRUPT_BT_FREQ_S                      28
+#define AR_MCI_INTERRUPT_BT_STOMP                       0x20000000
+#define AR_MCI_INTERRUPT_BT_STOMP_S                     29
+#define AR_MCI_INTERRUPT_BB_AIC_IRQ                     0x40000000
+#define AR_MCI_INTERRUPT_BB_AIC_IRQ_S                   30
+#define AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT              0x80000000
+#define AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT_S            31
+
+#define AR_MCI_INTERRUPT_DEFAULT    (AR_MCI_INTERRUPT_SW_MSG_DONE         | \
+                                     AR_MCI_INTERRUPT_RX_INVALID_HDR      | \
+                                     AR_MCI_INTERRUPT_RX_HW_MSG_FAIL      | \
+                                     AR_MCI_INTERRUPT_RX_SW_MSG_FAIL      | \
+                                     AR_MCI_INTERRUPT_TX_HW_MSG_FAIL      | \
+                                     AR_MCI_INTERRUPT_TX_SW_MSG_FAIL      | \
+                                     AR_MCI_INTERRUPT_RX_MSG              | \
+                                     AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE | \
+                                     AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT)
+
+#define AR_MCI_INTERRUPT_MSG_FAIL_MASK (AR_MCI_INTERRUPT_RX_HW_MSG_FAIL | \
+                                        AR_MCI_INTERRUPT_RX_SW_MSG_FAIL | \
+                                        AR_MCI_INTERRUPT_TX_HW_MSG_FAIL | \
+                                        AR_MCI_INTERRUPT_TX_SW_MSG_FAIL)
+
+#define AR_MCI_REMOTE_CPU_INT                           0x1830
+#define AR_MCI_REMOTE_CPU_INT_EN                        0x1834
+#define AR_MCI_INTERRUPT_RX_MSG_RAW                     0x1838
+#define AR_MCI_INTERRUPT_RX_MSG_EN                      0x183c
+#define AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET            0x00000001
+#define AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET_S          0
+#define AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL             0x00000002
+#define AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL_S           1
+#define AR_MCI_INTERRUPT_RX_MSG_CONT_NACK               0x00000004
+#define AR_MCI_INTERRUPT_RX_MSG_CONT_NACK_S             2
+#define AR_MCI_INTERRUPT_RX_MSG_CONT_INFO               0x00000008
+#define AR_MCI_INTERRUPT_RX_MSG_CONT_INFO_S             3
+#define AR_MCI_INTERRUPT_RX_MSG_CONT_RST                0x00000010
+#define AR_MCI_INTERRUPT_RX_MSG_CONT_RST_S              4
+#define AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO               0x00000020
+#define AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO_S             5
+#define AR_MCI_INTERRUPT_RX_MSG_CPU_INT                 0x00000040
+#define AR_MCI_INTERRUPT_RX_MSG_CPU_INT_S               6
+#define AR_MCI_INTERRUPT_RX_MSG_GPM                     0x00000100
+#define AR_MCI_INTERRUPT_RX_MSG_GPM_S                   8
+#define AR_MCI_INTERRUPT_RX_MSG_LNA_INFO                0x00000200
+#define AR_MCI_INTERRUPT_RX_MSG_LNA_INFO_S              9
+#define AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING            0x00000400
+#define AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING_S          10
+#define AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING              0x00000800
+#define AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING_S            11
+#define AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE                0x00001000
+#define AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE_S              12
+#define AR_MCI_INTERRUPT_RX_HW_MSG_MASK  (AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO  | \
                                           AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL| \
                                           AR_MCI_INTERRUPT_RX_MSG_LNA_INFO   | \
                                           AR_MCI_INTERRUPT_RX_MSG_CONT_NACK  | \
                                           AR_MCI_INTERRUPT_RX_MSG_CONT_INFO  | \
                                           AR_MCI_INTERRUPT_RX_MSG_CONT_RST)
 
+#define AR_MCI_INTERRUPT_RX_MSG_DEFAULT (AR_MCI_INTERRUPT_RX_MSG_GPM     | \
+                                         AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET| \
+                                         AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING  | \
+                                         AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING| \
+                                         AR_MCI_INTERRUPT_RX_MSG_SCHD_INFO   | \
+                                         AR_MCI_INTERRUPT_RX_MSG_LNA_CONTROL | \
+                                         AR_MCI_INTERRUPT_RX_MSG_LNA_INFO    | \
+                                         AR_MCI_INTERRUPT_RX_MSG_CONT_NACK   | \
+                                         AR_MCI_INTERRUPT_RX_MSG_CONT_INFO   | \
+                                         AR_MCI_INTERRUPT_RX_MSG_CONT_RST    | \
+                                         AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE)
+
+#define AR_MCI_CPU_INT                                  0x1840
+
+#define AR_MCI_RX_STATUS                        0x1844
+#define AR_MCI_RX_LAST_SCHD_MSG_INDEX           0x00000F00
+#define AR_MCI_RX_LAST_SCHD_MSG_INDEX_S         8
+#define AR_MCI_RX_REMOTE_SLEEP                  0x00001000
+#define AR_MCI_RX_REMOTE_SLEEP_S                12
+#define AR_MCI_RX_MCI_CLK_REQ                   0x00002000
+#define AR_MCI_RX_MCI_CLK_REQ_S                 13
+
+#define AR_MCI_CONT_STATUS                      0x1848
+#define AR_MCI_CONT_RSSI_POWER                  0x000000FF
+#define AR_MCI_CONT_RSSI_POWER_S                0
+#define AR_MCI_CONT_RRIORITY                    0x0000FF00
+#define AR_MCI_CONT_RRIORITY_S                  8
+#define AR_MCI_CONT_TXRX                        0x00010000
+#define AR_MCI_CONT_TXRX_S                      16
+
+#define AR_MCI_BT_PRI0                          0x184c
+#define AR_MCI_BT_PRI1                          0x1850
+#define AR_MCI_BT_PRI2                          0x1854
+#define AR_MCI_BT_PRI3                          0x1858
+#define AR_MCI_BT_PRI                           0x185c
+#define AR_MCI_WL_FREQ0                         0x1860
+#define AR_MCI_WL_FREQ1                         0x1864
+#define AR_MCI_WL_FREQ2                         0x1868
+#define AR_MCI_GAIN                             0x186c
+#define AR_MCI_WBTIMER1                         0x1870
+#define AR_MCI_WBTIMER2                         0x1874
+#define AR_MCI_WBTIMER3                         0x1878
+#define AR_MCI_WBTIMER4                         0x187c
+#define AR_MCI_MAXGAIN                          0x1880
+#define AR_MCI_HW_SCHD_TBL_CTL                  0x1884
+#define AR_MCI_HW_SCHD_TBL_D0                   0x1888
+#define AR_MCI_HW_SCHD_TBL_D1                   0x188c
+#define AR_MCI_HW_SCHD_TBL_D2                   0x1890
+#define AR_MCI_HW_SCHD_TBL_D3                   0x1894
+#define AR_MCI_TX_PAYLOAD0                      0x1898
+#define AR_MCI_TX_PAYLOAD1                      0x189c
+#define AR_MCI_TX_PAYLOAD2                      0x18a0
+#define AR_MCI_TX_PAYLOAD3                      0x18a4
+#define AR_BTCOEX_WBTIMER                       0x18a8
+
+#define AR_BTCOEX_CTRL                                  0x18ac
+#define AR_BTCOEX_CTRL_AR9462_MODE                      0x00000001
+#define AR_BTCOEX_CTRL_AR9462_MODE_S                    0
+#define AR_BTCOEX_CTRL_WBTIMER_EN                       0x00000002
+#define AR_BTCOEX_CTRL_WBTIMER_EN_S                     1
+#define AR_BTCOEX_CTRL_MCI_MODE_EN                      0x00000004
+#define AR_BTCOEX_CTRL_MCI_MODE_EN_S                    2
+#define AR_BTCOEX_CTRL_LNA_SHARED                       0x00000008
+#define AR_BTCOEX_CTRL_LNA_SHARED_S                     3
+#define AR_BTCOEX_CTRL_PA_SHARED                        0x00000010
+#define AR_BTCOEX_CTRL_PA_SHARED_S                      4
+#define AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN           0x00000020
+#define AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN_S         5
+#define AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN        0x00000040
+#define AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN_S      6
+#define AR_BTCOEX_CTRL_NUM_ANTENNAS                     0x00000180
+#define AR_BTCOEX_CTRL_NUM_ANTENNAS_S                   7
+#define AR_BTCOEX_CTRL_RX_CHAIN_MASK                    0x00000E00
+#define AR_BTCOEX_CTRL_RX_CHAIN_MASK_S                  9
+#define AR_BTCOEX_CTRL_AGGR_THRESH                      0x00007000
+#define AR_BTCOEX_CTRL_AGGR_THRESH_S                    12
+#define AR_BTCOEX_CTRL_1_CHAIN_BCN                      0x00080000
+#define AR_BTCOEX_CTRL_1_CHAIN_BCN_S                    19
+#define AR_BTCOEX_CTRL_1_CHAIN_ACK                      0x00100000
+#define AR_BTCOEX_CTRL_1_CHAIN_ACK_S                    20
+#define AR_BTCOEX_CTRL_WAIT_BA_MARGIN                   0x1FE00000
+#define AR_BTCOEX_CTRL_WAIT_BA_MARGIN_S                 28
+#define AR_BTCOEX_CTRL_REDUCE_TXPWR                     0x20000000
+#define AR_BTCOEX_CTRL_REDUCE_TXPWR_S                   29
+#define AR_BTCOEX_CTRL_SPDT_ENABLE_10                   0x40000000
+#define AR_BTCOEX_CTRL_SPDT_ENABLE_10_S                 30
+#define AR_BTCOEX_CTRL_SPDT_POLARITY                    0x80000000
+#define AR_BTCOEX_CTRL_SPDT_POLARITY_S                  31
+
+#define AR_BTCOEX_WL_WEIGHTS0                           0x18b0
+#define AR_BTCOEX_WL_WEIGHTS1                           0x18b4
+#define AR_BTCOEX_WL_WEIGHTS2                           0x18b8
+#define AR_BTCOEX_WL_WEIGHTS3                           0x18bc
+#define AR_BTCOEX_MAX_TXPWR(_x)                         (0x18c0 + ((_x) << 2))
+#define AR_BTCOEX_WL_LNA                                0x1940
+#define AR_BTCOEX_RFGAIN_CTRL                           0x1944
+
+#define AR_BTCOEX_CTRL2                                 0x1948
+#define AR_BTCOEX_CTRL2_TXPWR_THRESH                    0x0007F800
+#define AR_BTCOEX_CTRL2_TXPWR_THRESH_S                  11
+#define AR_BTCOEX_CTRL2_TX_CHAIN_MASK                   0x00380000
+#define AR_BTCOEX_CTRL2_TX_CHAIN_MASK_S                 19
+#define AR_BTCOEX_CTRL2_RX_DEWEIGHT                     0x00400000
+#define AR_BTCOEX_CTRL2_RX_DEWEIGHT_S                   22
+#define AR_BTCOEX_CTRL2_GPIO_OBS_SEL                    0x00800000
+#define AR_BTCOEX_CTRL2_GPIO_OBS_SEL_S                  23
+#define AR_BTCOEX_CTRL2_MAC_BB_OBS_SEL                  0x01000000
+#define AR_BTCOEX_CTRL2_MAC_BB_OBS_SEL_S                24
+#define AR_BTCOEX_CTRL2_DESC_BASED_TXPWR_ENABLE         0x02000000
+#define AR_BTCOEX_CTRL2_DESC_BASED_TXPWR_ENABLE_S       25
+
+#define AR_BTCOEX_CTRL_SPDT_ENABLE          0x00000001
+#define AR_BTCOEX_CTRL_SPDT_ENABLE_S        0
+#define AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL     0x00000002
+#define AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL_S   1
+#define AR_BTCOEX_CTRL_USE_LATCHED_BT_ANT   0x00000004
+#define AR_BTCOEX_CTRL_USE_LATCHED_BT_ANT_S 2
+#define AR_GLB_WLAN_UART_INTF_EN            0x00020000
+#define AR_GLB_WLAN_UART_INTF_EN_S          17
+#define AR_GLB_DS_JTAG_DISABLE              0x00040000
+#define AR_GLB_DS_JTAG_DISABLE_S            18
+
+#define AR_BTCOEX_RC                    0x194c
+#define AR_BTCOEX_MAX_RFGAIN(_x)        (0x1950 + ((_x) << 2))
+#define AR_BTCOEX_DBG                   0x1a50
+#define AR_MCI_LAST_HW_MSG_HDR          0x1a54
+#define AR_MCI_LAST_HW_MSG_BDY          0x1a58
+
+#define AR_MCI_SCHD_TABLE_2             0x1a5c
+#define AR_MCI_SCHD_TABLE_2_MEM_BASED   0x00000001
+#define AR_MCI_SCHD_TABLE_2_MEM_BASED_S 0
+#define AR_MCI_SCHD_TABLE_2_HW_BASED    0x00000002
+#define AR_MCI_SCHD_TABLE_2_HW_BASED_S  1
+
+#define AR_BTCOEX_CTRL3               0x1a60
+#define AR_BTCOEX_CTRL3_CONT_INFO_TIMEOUT       0x00000fff
+#define AR_BTCOEX_CTRL3_CONT_INFO_TIMEOUT_S     0
+
 
 #endif
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 55d077e7135d..23e80e63bca9 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -53,7 +53,7 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
                             int tx_flags, struct ath_txq *txq);
 static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
                                 struct ath_txq *txq, struct list_head *bf_q,
-                                struct ath_tx_status *ts, int txok, int sendbar);
+                                struct ath_tx_status *ts, int txok);
 static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq,
                              struct list_head *head, bool internal);
 static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf,
@@ -150,6 +150,12 @@ static struct ath_frame_info *get_frame_info(struct sk_buff *skb)
         return (struct ath_frame_info *) &tx_info->rate_driver_data[0];
 }
 
+static void ath_send_bar(struct ath_atx_tid *tid, u16 seqno)
+{
+        ieee80211_send_bar(tid->an->vif, tid->an->sta->addr, tid->tidno,
+                           seqno << IEEE80211_SEQ_SEQ_SHIFT);
+}
+
 static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
 {
         struct ath_txq *txq = tid->ac->txq;
@@ -158,28 +164,33 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
         struct list_head bf_head;
         struct ath_tx_status ts;
         struct ath_frame_info *fi;
+        bool sendbar = false;
 
         INIT_LIST_HEAD(&bf_head);
 
         memset(&ts, 0, sizeof(ts));
-        spin_lock_bh(&txq->axq_lock);
 
         while ((skb = __skb_dequeue(&tid->buf_q))) {
                 fi = get_frame_info(skb);
                 bf = fi->bf;
 
-                spin_unlock_bh(&txq->axq_lock);
                 if (bf && fi->retries) {
                         list_add_tail(&bf->list, &bf_head);
                         ath_tx_update_baw(sc, tid, bf->bf_state.seqno);
-                        ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0, 1);
+                        ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
+                        sendbar = true;
                 } else {
                         ath_tx_send_normal(sc, txq, NULL, skb);
                 }
-                spin_lock_bh(&txq->axq_lock);
         }
 
-        spin_unlock_bh(&txq->axq_lock);
+        if (tid->baw_head == tid->baw_tail) {
+                tid->state &= ~AGGR_ADDBA_COMPLETE;
+                tid->state &= ~AGGR_CLEANUP;
+        }
+
+        if (sendbar)
+                ath_send_bar(tid, tid->seq_start);
 }
 
 static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,
@@ -195,6 +206,8 @@ static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,
         while (tid->baw_head != tid->baw_tail && !test_bit(tid->baw_head, tid->tx_buf)) {
                 INCR(tid->seq_start, IEEE80211_SEQ_MAX);
                 INCR(tid->baw_head, ATH_TID_MAX_BUFS);
+                if (tid->bar_index >= 0)
+                        tid->bar_index--;
         }
 }
 
@@ -238,9 +251,7 @@ static void ath_tid_drain(struct ath_softc *sc, struct ath_txq *txq,
                 bf = fi->bf;
 
                 if (!bf) {
-                        spin_unlock(&txq->axq_lock);
                         ath_tx_complete(sc, skb, ATH_TX_ERROR, txq);
-                        spin_lock(&txq->axq_lock);
                         continue;
                 }
 
@@ -249,24 +260,26 @@ static void ath_tid_drain(struct ath_softc *sc, struct ath_txq *txq,
                 if (fi->retries)
                         ath_tx_update_baw(sc, tid, bf->bf_state.seqno);
 
-                spin_unlock(&txq->axq_lock);
-                ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0, 0);
-                spin_lock(&txq->axq_lock);
+                ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
         }
 
         tid->seq_next = tid->seq_start;
         tid->baw_tail = tid->baw_head;
+        tid->bar_index = -1;
 }
 
 static void ath_tx_set_retry(struct ath_softc *sc, struct ath_txq *txq,
-                             struct sk_buff *skb)
+                             struct sk_buff *skb, int count)
 {
         struct ath_frame_info *fi = get_frame_info(skb);
         struct ath_buf *bf = fi->bf;
         struct ieee80211_hdr *hdr;
+        int prev = fi->retries;
 
         TX_STAT_INC(txq->axq_qnum, a_retries);
-        if (fi->retries++ > 0)
+        fi->retries += count;
+
+        if (prev > 0)
                 return;
 
         hdr = (struct ieee80211_hdr *)skb->data;
@@ -365,7 +378,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
         struct ath_buf *bf_next, *bf_last = bf->bf_lastbf;
         struct list_head bf_head;
         struct sk_buff_head bf_pending;
-        u16 seq_st = 0, acked_cnt = 0, txfail_cnt = 0;
+        u16 seq_st = 0, acked_cnt = 0, txfail_cnt = 0, seq_first;
         u32 ba[WME_BA_BMP_SIZE >> 5];
         int isaggr, txfail, txpending, sendbar = 0, needreset = 0, nbad = 0;
         bool rc_update = true;
@@ -374,6 +387,8 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
         int nframes;
         u8 tidno;
         bool flush = !!(ts->ts_status & ATH9K_TX_FLUSH);
+        int i, retries;
+        int bar_index = -1;
 
         skb = bf->bf_mpdu;
         hdr = (struct ieee80211_hdr *)skb->data;
@@ -382,6 +397,10 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
 
         memcpy(rates, tx_info->control.rates, sizeof(rates));
 
+        retries = ts->ts_longretry + 1;
+        for (i = 0; i < ts->ts_rateindex; i++)
+                retries += rates[i].count;
+
         rcu_read_lock();
 
         sta = ieee80211_find_sta_by_ifaddr(hw, hdr->addr1, hdr->addr2);
@@ -395,8 +414,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                         if (!bf->bf_stale || bf_next != NULL)
                                 list_move_tail(&bf->list, &bf_head);
 
-                        ath_tx_complete_buf(sc, bf, txq, &bf_head, ts,
-                                0, 0);
+                        ath_tx_complete_buf(sc, bf, txq, &bf_head, ts, 0);
 
                         bf = bf_next;
                 }
@@ -406,6 +424,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
         an = (struct ath_node *)sta->drv_priv;
         tidno = ieee80211_get_qos_ctl(hdr)[0] & IEEE80211_QOS_CTL_TID_MASK;
         tid = ATH_AN_2_TID(an, tidno);
+        seq_first = tid->seq_start;
 
         /*
          * The hardware occasionally sends a tx status for the wrong TID.
@@ -455,25 +474,25 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                 } else if (!isaggr && txok) {
                         /* transmit completion */
                         acked_cnt++;
+                } else if ((tid->state & AGGR_CLEANUP) || !retry) {
+                        /*
+                         * cleanup in progress, just fail
+                         * the un-acked sub-frames
+                         */
+                        txfail = 1;
+                } else if (flush) {
+                        txpending = 1;
+                } else if (fi->retries < ATH_MAX_SW_RETRIES) {
+                        if (txok || !an->sleeping)
+                                ath_tx_set_retry(sc, txq, bf->bf_mpdu,
+                                                 retries);
+
+                        txpending = 1;
                 } else {
-                        if ((tid->state & AGGR_CLEANUP) || !retry) {
-                                /*
-                                 * cleanup in progress, just fail
-                                 * the un-acked sub-frames
-                                 */
-                                txfail = 1;
-                        } else if (flush) {
-                                txpending = 1;
-                        } else if (fi->retries < ATH_MAX_SW_RETRIES) {
-                                if (txok || !an->sleeping)
-                                        ath_tx_set_retry(sc, txq, bf->bf_mpdu);
-
-                                txpending = 1;
-                        } else {
-                                txfail = 1;
-                                sendbar = 1;
-                                txfail_cnt++;
-                        }
+                        txfail = 1;
+                        txfail_cnt++;
+                        bar_index = max_t(int, bar_index,
+                                ATH_BA_INDEX(seq_first, seqno));
                 }
 
                 /*
@@ -490,9 +509,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                          * complete the acked-ones/xretried ones; update
                          * block-ack window
                          */
-                        spin_lock_bh(&txq->axq_lock);
                         ath_tx_update_baw(sc, tid, seqno);
-                        spin_unlock_bh(&txq->axq_lock);
 
                         if (rc_update && (acked_cnt == 1 || txfail_cnt == 1)) {
                                 memcpy(tx_info->control.rates, rates, sizeof(rates));
@@ -501,33 +518,30 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                         }
 
                         ath_tx_complete_buf(sc, bf, txq, &bf_head, ts,
-                                !txfail, sendbar);
+                                !txfail);
                 } else {
                         /* retry the un-acked ones */
-                        if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)) {
-                                if (bf->bf_next == NULL && bf_last->bf_stale) {
-                                        struct ath_buf *tbf;
-
-                                        tbf = ath_clone_txbuf(sc, bf_last);
-                                        /*
-                                         * Update tx baw and complete the
-                                         * frame with failed status if we
-                                         * run out of tx buf.
-                                         */
-                                        if (!tbf) {
-                                                spin_lock_bh(&txq->axq_lock);
-                                                ath_tx_update_baw(sc, tid, seqno);
-                                                spin_unlock_bh(&txq->axq_lock);
-
-                                                ath_tx_complete_buf(sc, bf, txq,
-                                                                    &bf_head,
-                                                                    ts, 0,
-                                                                    !flush);
-                                                break;
-                                        }
-
-                                        fi->bf = tbf;
+                        if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) &&
+                            bf->bf_next == NULL && bf_last->bf_stale) {
+                                struct ath_buf *tbf;
+
+                                tbf = ath_clone_txbuf(sc, bf_last);
+                                /*
+                                 * Update tx baw and complete the
+                                 * frame with failed status if we
+                                 * run out of tx buf.
+                                 */
+                                if (!tbf) {
+                                        ath_tx_update_baw(sc, tid, seqno);
+
+                                        ath_tx_complete_buf(sc, bf, txq,
+                                                            &bf_head, ts, 0);
+                                        bar_index = max_t(int, bar_index,
+                                                ATH_BA_INDEX(seq_first, seqno));
+                                        break;
                                 }
+
+                                fi->bf = tbf;
                         }
 
                         /*
@@ -540,12 +554,18 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                 bf = bf_next;
         }
 
+        if (bar_index >= 0) {
+                u16 bar_seq = ATH_BA_INDEX2SEQ(seq_first, bar_index);
+                ath_send_bar(tid, ATH_BA_INDEX2SEQ(seq_first, bar_index + 1));
+                if (BAW_WITHIN(tid->seq_start, tid->baw_size, bar_seq))
+                        tid->bar_index = ATH_BA_INDEX(tid->seq_start, bar_seq);
+        }
+
         /* prepend un-acked frames to the beginning of the pending frame queue */
         if (!skb_queue_empty(&bf_pending)) {
                 if (an->sleeping)
                         ieee80211_sta_set_buffered(sta, tid->tidno, true);
 
-                spin_lock_bh(&txq->axq_lock);
                 skb_queue_splice(&bf_pending, &tid->buf_q);
                 if (!an->sleeping) {
                         ath_tx_queue_tid(txq, tid);
@@ -553,18 +573,11 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                         if (ts->ts_status & ATH9K_TXERR_FILT)
                                 tid->ac->clear_ps_filter = true;
                 }
-                spin_unlock_bh(&txq->axq_lock);
         }
 
-        if (tid->state & AGGR_CLEANUP) {
+        if (tid->state & AGGR_CLEANUP)
                 ath_tx_flush_tid(sc, tid);
 
-                if (tid->baw_head == tid->baw_tail) {
-                        tid->state &= ~AGGR_ADDBA_COMPLETE;
-                        tid->state &= ~AGGR_CLEANUP;
-                }
-        }
-
         rcu_read_unlock();
 
         if (needreset) {
@@ -618,24 +631,26 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,
         max_4ms_framelen = ATH_AMPDU_LIMIT_MAX;
 
         for (i = 0; i < 4; i++) {
-                if (rates[i].count) {
-                        int modeidx;
-                        if (!(rates[i].flags & IEEE80211_TX_RC_MCS)) {
-                                legacy = 1;
-                                break;
-                        }
+                int modeidx;
 
-                        if (rates[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
-                                modeidx = MCS_HT40;
-                        else
-                                modeidx = MCS_HT20;
-
-                        if (rates[i].flags & IEEE80211_TX_RC_SHORT_GI)
-                                modeidx++;
+                if (!rates[i].count)
+                        continue;
 
-                        frmlen = ath_max_4ms_framelen[modeidx][rates[i].idx];
-                        max_4ms_framelen = min(max_4ms_framelen, frmlen);
+                if (!(rates[i].flags & IEEE80211_TX_RC_MCS)) {
+                        legacy = 1;
+                        break;
                 }
+
+                if (rates[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
+                        modeidx = MCS_HT40;
+                else
+                        modeidx = MCS_HT20;
+
+                if (rates[i].flags & IEEE80211_TX_RC_SHORT_GI)
+                        modeidx++;
+
+                frmlen = ath_max_4ms_framelen[modeidx][rates[i].idx];
+                max_4ms_framelen = min(max_4ms_framelen, frmlen);
         }
 
         /*
@@ -771,8 +786,6 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,
 
                 bf->bf_state.bf_type = BUF_AMPDU | BUF_AGGR;
                 seqno = bf->bf_state.seqno;
-                if (!bf_first)
-                        bf_first = bf;
 
                 /* do not step over block-ack window */
                 if (!BAW_WITHIN(tid->seq_start, tid->baw_size, seqno)) {
@@ -780,6 +793,21 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,
                         break;
                 }
 
+                if (tid->bar_index > ATH_BA_INDEX(tid->seq_start, seqno)) {
+                        struct ath_tx_status ts = {};
+                        struct list_head bf_head;
+
+                        INIT_LIST_HEAD(&bf_head);
+                        list_add(&bf->list, &bf_head);
+                        __skb_unlink(skb, &tid->buf_q);
+                        ath_tx_update_baw(sc, tid, seqno);
+                        ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
+                        continue;
+                }
+
+                if (!bf_first)
+                        bf_first = bf;
+
                 if (!rl) {
                         aggr_limit = ath_lookup_rate(sc, bf, tid);
                         rl = 1;
@@ -1122,6 +1150,7 @@ int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
         txtid->state |= AGGR_ADDBA_PROGRESS;
         txtid->paused = true;
         *ssn = txtid->seq_start = txtid->seq_next;
+        txtid->bar_index = -1;
 
         memset(txtid->tx_buf, 0, sizeof(txtid->tx_buf));
         txtid->baw_head = txtid->baw_tail = 0;
@@ -1156,9 +1185,9 @@ void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid)
                 txtid->state |= AGGR_CLEANUP;
         else
                 txtid->state &= ~AGGR_ADDBA_COMPLETE;
-        spin_unlock_bh(&txq->axq_lock);
 
         ath_tx_flush_tid(sc, txtid);
+        spin_unlock_bh(&txq->axq_lock);
 }
 
 void ath_tx_aggr_sleep(struct ieee80211_sta *sta, struct ath_softc *sc,
@@ -1400,8 +1429,6 @@ static bool bf_is_ampdu_not_probing(struct ath_buf *bf)
 
 static void ath_drain_txq_list(struct ath_softc *sc, struct ath_txq *txq,
                                struct list_head *list, bool retry_tx)
-        __releases(txq->axq_lock)
-        __acquires(txq->axq_lock)
 {
         struct ath_buf *bf, *lastbf;
         struct list_head bf_head;
@@ -1428,13 +1455,11 @@ static void ath_drain_txq_list(struct ath_softc *sc, struct ath_txq *txq,
                 if (bf_is_ampdu_not_probing(bf))
                         txq->axq_ampdu_depth--;
 
-                spin_unlock_bh(&txq->axq_lock);
                 if (bf_isampdu(bf))
                         ath_tx_complete_aggr(sc, txq, bf, &bf_head, &ts, 0,
                                              retry_tx);
                 else
-                        ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0, 0);
-                spin_lock_bh(&txq->axq_lock);
+                        ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
         }
 }
 
@@ -1561,11 +1586,9 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq)
                                 break;
                 }
 
-                if (!list_empty(&ac->tid_q)) {
-                        if (!ac->sched) {
-                                ac->sched = true;
-                                list_add_tail(&ac->list, &txq->axq_acq);
-                        }
+                if (!list_empty(&ac->tid_q) && !ac->sched) {
+                        ac->sched = true;
+                        list_add_tail(&ac->list, &txq->axq_acq);
                 }
 
                 if (ac == last_ac ||
@@ -1708,10 +1731,6 @@ static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,
         list_add_tail(&bf->list, &bf_head);
         bf->bf_state.bf_type = 0;
 
-        /* update starting sequence number for subsequent ADDBA request */
-        if (tid)
-                INCR(tid->seq_start, IEEE80211_SEQ_MAX);
-
         bf->bf_lastbf = bf;
         ath_tx_fill_desc(sc, bf, txq, fi->framelen);
         ath_tx_txqaddbuf(sc, txq, &bf_head, false);
@@ -1819,7 +1838,6 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb,
         struct ath_buf *bf;
         u8 tidno;
 
-        spin_lock_bh(&txctl->txq->axq_lock);
         if ((sc->sc_flags & SC_OP_TXAGGR) && txctl->an &&
                 ieee80211_is_data_qos(hdr->frame_control)) {
                 tidno = ieee80211_get_qos_ctl(hdr)[0] &
@@ -1838,7 +1856,7 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb,
         } else {
                 bf = ath_tx_setup_buffer(sc, txctl->txq, tid, skb);
                 if (!bf)
-                        goto out;
+                        return;
 
                 bf->bf_state.bfs_paprd = txctl->paprd;
 
@@ -1847,9 +1865,6 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb,
 
                 ath_tx_send_normal(sc, txctl->txq, tid, skb);
         }
-
-out:
-        spin_unlock_bh(&txctl->txq->axq_lock);
 }
 
 /* Upon failure caller should free skb */
@@ -1916,9 +1931,11 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
                 ieee80211_stop_queue(sc->hw, q);
                 txq->stopped = 1;
         }
-        spin_unlock_bh(&txq->axq_lock);
 
         ath_tx_start_dma(sc, skb, txctl);
+
+        spin_unlock_bh(&txq->axq_lock);
+
         return 0;
 }
 
@@ -1937,9 +1954,6 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
 
         ath_dbg(common, ATH_DBG_XMIT, "TX complete: skb: %p\n", skb);
 
-        if (tx_flags & ATH_TX_BAR)
-                tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;
-
         if (!(tx_flags & ATH_TX_ERROR))
                 /* Frame was ACKed */
                 tx_info->flags |= IEEE80211_TX_STAT_ACK;
@@ -1955,7 +1969,7 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
                 skb_pull(skb, padsize);
         }
 
-        if (sc->ps_flags & PS_WAIT_FOR_TX_ACK) {
+        if ((sc->ps_flags & PS_WAIT_FOR_TX_ACK) && !txq->axq_depth) {
                 sc->ps_flags &= ~PS_WAIT_FOR_TX_ACK;
                 ath_dbg(common, ATH_DBG_PS,
                         "Going back to sleep after having received TX status (0x%lx)\n",
@@ -1967,7 +1981,6 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
 
         q = skb_get_queue_mapping(skb);
         if (txq == sc->tx.txq_map[q]) {
-                spin_lock_bh(&txq->axq_lock);
                 if (WARN_ON(--txq->pending_frames < 0))
                         txq->pending_frames = 0;
 
@@ -1975,7 +1988,6 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
                         ieee80211_wake_queue(sc->hw, q);
                         txq->stopped = 0;
                 }
-                spin_unlock_bh(&txq->axq_lock);
         }
 
         ieee80211_tx_status(hw, skb);
@@ -1983,16 +1995,13 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
 
 static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
                                 struct ath_txq *txq, struct list_head *bf_q,
-                                struct ath_tx_status *ts, int txok, int sendbar)
+                                struct ath_tx_status *ts, int txok)
 {
         struct sk_buff *skb = bf->bf_mpdu;
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
         unsigned long flags;
         int tx_flags = 0;
 
-        if (sendbar)
-                tx_flags = ATH_TX_BAR;
-
         if (!txok)
                 tx_flags |= ATH_TX_ERROR;
 
@@ -2084,8 +2093,6 @@ static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf,
 static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,
                                   struct ath_tx_status *ts, struct ath_buf *bf,
                                   struct list_head *bf_head)
-        __releases(txq->axq_lock)
-        __acquires(txq->axq_lock)
 {
         int txok;
 
@@ -2095,16 +2102,12 @@ static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,
         if (bf_is_ampdu_not_probing(bf))
                 txq->axq_ampdu_depth--;
 
-        spin_unlock_bh(&txq->axq_lock);
-
         if (!bf_isampdu(bf)) {
                 ath_tx_rc_status(sc, bf, ts, 1, txok ? 0 : 1, txok);
-                ath_tx_complete_buf(sc, bf, txq, bf_head, ts, txok, 0);
+                ath_tx_complete_buf(sc, bf, txq, bf_head, ts, txok);
         } else
                 ath_tx_complete_aggr(sc, txq, bf, bf_head, ts, txok, true);
 
-        spin_lock_bh(&txq->axq_lock);
-
         if (sc->sc_flags & SC_OP_TXAGGR)
                 ath_txq_schedule(sc, txq);
 }
diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c
index f4cae1cccbff..cba9d0435dc4 100644
--- a/drivers/net/wireless/ath/carl9170/fw.c
+++ b/drivers/net/wireless/ath/carl9170/fw.c
@@ -23,6 +23,7 @@
 #include <linux/kernel.h>
 #include <linux/firmware.h>
 #include <linux/crc32.h>
+#include <linux/module.h>
 #include "carl9170.h"
 #include "fwcmd.h"
 #include "version.h"
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index 59472e1605cd..d19a9ee9d057 100644
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
@@ -314,7 +314,7 @@ static void carl9170_tx_release(struct kref *ref)
                          *    feedback either [CTL_REQ_TX_STATUS not set]
                          */
 
-                        dev_kfree_skb_any(skb);
+                        ieee80211_free_txskb(ar->hw, skb);
                         return;
                 } else {
                         /*
@@ -1432,7 +1432,7 @@ void carl9170_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 
 err_free:
         ar->tx_dropped++;
-        dev_kfree_skb_any(skb);
+        ieee80211_free_txskb(ar->hw, skb);
 }
 
 void carl9170_tx_scheduler(struct ar9170 *ar)
diff --git a/drivers/net/wireless/ath/debug.c b/drivers/net/wireless/ath/debug.c
index 5367b1086e09..508eccf5d982 100644
--- a/drivers/net/wireless/ath/debug.c
+++ b/drivers/net/wireless/ath/debug.c
@@ -14,6 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/export.h>
 #include "ath.h"
 
 const char *ath_opmode_to_string(enum nl80211_iftype opmode)
diff --git a/drivers/net/wireless/ath/hw.c b/drivers/net/wireless/ath/hw.c
index 3f508e59f146..19befb331073 100644
--- a/drivers/net/wireless/ath/hw.c
+++ b/drivers/net/wireless/ath/hw.c
@@ -14,6 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/export.h>
 #include <asm/unaligned.h>
 
 #include "ath.h"
diff --git a/drivers/net/wireless/ath/key.c b/drivers/net/wireless/ath/key.c
index 17b0efd86f9a..4cf7c5eb4813 100644
--- a/drivers/net/wireless/ath/key.c
+++ b/drivers/net/wireless/ath/key.c
@@ -15,6 +15,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/export.h>
 #include <asm/unaligned.h>
 #include <net/mac80211.h>
 
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index f1be57f0f5bb..10dea37431b3 100644
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -15,11 +15,14 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <net/cfg80211.h>
 #include <net/mac80211.h>
 #include "regd.h"
 #include "regd_common.h"
 
+static int __ath_regd_init(struct ath_regulatory *reg);
+
 /*
  * This is a set of common rules used by our world regulatory domains.
  * We have 12 world regulatory domains. To save space we consolidate
@@ -346,10 +349,26 @@ static void ath_reg_apply_world_flags(struct wiphy *wiphy,
         }
 }
 
+static u16 ath_regd_find_country_by_name(char *alpha2)
+{
+        unsigned int i;
+
+        for (i = 0; i < ARRAY_SIZE(allCountries); i++) {
+                if (!memcmp(allCountries[i].isoName, alpha2, 2))
+                        return allCountries[i].countryCode;
+        }
+
+        return -1;
+}
+
 int ath_reg_notifier_apply(struct wiphy *wiphy,
                            struct regulatory_request *request,
                            struct ath_regulatory *reg)
 {
+        struct ath_common *common = container_of(reg, struct ath_common,
+                                                 regulatory);
+        u16 country_code;
+
         /* We always apply this */
         ath_reg_apply_radar_flags(wiphy);
 
@@ -362,14 +381,37 @@ int ath_reg_notifier_apply(struct wiphy *wiphy,
                 return 0;
 
         switch (request->initiator) {
-        case NL80211_REGDOM_SET_BY_DRIVER:
         case NL80211_REGDOM_SET_BY_CORE:
+                /*
+                 * If common->reg_world_copy is world roaming it means we *were*
+                 * world roaming... so we now have to restore that data.
+                 */
+                if (!ath_is_world_regd(&common->reg_world_copy))
+                        break;
+
+                memcpy(reg, &common->reg_world_copy,
+                       sizeof(struct ath_regulatory));
+                break;
+        case NL80211_REGDOM_SET_BY_DRIVER:
         case NL80211_REGDOM_SET_BY_USER:
                 break;
         case NL80211_REGDOM_SET_BY_COUNTRY_IE:
-                if (ath_is_world_regd(reg))
-                        ath_reg_apply_world_flags(wiphy, request->initiator,
-                                                  reg);
+                if (!ath_is_world_regd(reg))
+                        break;
+
+                country_code = ath_regd_find_country_by_name(request->alpha2);
+                if (country_code == (u16) -1)
+                        break;
+
+                reg->current_rd = COUNTRY_ERD_FLAG;
+                reg->current_rd |= country_code;
+
+                printk(KERN_DEBUG "ath: regdomain 0x%0x updated by CountryIE\n",
+                        reg->current_rd);
+                __ath_regd_init(reg);
+
+                ath_reg_apply_world_flags(wiphy, request->initiator, reg);
+
                 break;
         }
 
@@ -507,11 +549,7 @@ static void ath_regd_sanitize(struct ath_regulatory *reg)
         reg->current_rd = 0x64;
 }
 
-int
-ath_regd_init(struct ath_regulatory *reg,
-              struct wiphy *wiphy,
-              int (*reg_notifier)(struct wiphy *wiphy,
-                                  struct regulatory_request *request))
+static int __ath_regd_init(struct ath_regulatory *reg)
 {
         struct country_code_to_enum_rd *country = NULL;
         u16 regdmn;
@@ -582,7 +620,29 @@ ath_regd_init(struct ath_regulatory *reg,
         printk(KERN_DEBUG "ath: Regpair used: 0x%0x\n",
                 reg->regpair->regDmnEnum);
 
+        return 0;
+}
+
+int
+ath_regd_init(struct ath_regulatory *reg,
+              struct wiphy *wiphy,
+              int (*reg_notifier)(struct wiphy *wiphy,
+                                  struct regulatory_request *request))
+{
+        struct ath_common *common = container_of(reg, struct ath_common,
+                                                 regulatory);
+        int r;
+
+        r = __ath_regd_init(reg);
+        if (r)
+                return r;
+
+        if (ath_is_world_regd(reg))
+                memcpy(&common->reg_world_copy, reg,
+                       sizeof(struct ath_regulatory));
+
         ath_regd_init_wiphy(reg, wiphy, reg_notifier);
+
         return 0;
 }
 EXPORT_SYMBOL(ath_regd_init);
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 447a2307c9d9..37110dfd2c96 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -1011,14 +1011,10 @@ static inline bool b43_using_pio_transfers(struct b43_wldev *dev)
 }
 
 /* Message printing */
-void b43info(struct b43_wl *wl, const char *fmt, ...)
-    __attribute__ ((format(printf, 2, 3)));
-void b43err(struct b43_wl *wl, const char *fmt, ...)
-    __attribute__ ((format(printf, 2, 3)));
-void b43warn(struct b43_wl *wl, const char *fmt, ...)
-    __attribute__ ((format(printf, 2, 3)));
-void b43dbg(struct b43_wl *wl, const char *fmt, ...)
-    __attribute__ ((format(printf, 2, 3)));
+__printf(2, 3) void b43info(struct b43_wl *wl, const char *fmt, ...);
+__printf(2, 3) void b43err(struct b43_wl *wl, const char *fmt, ...);
+__printf(2, 3) void b43warn(struct b43_wl *wl, const char *fmt, ...);
+__printf(2, 3) void b43dbg(struct b43_wl *wl, const char *fmt, ...);
 
 
 /* A WARN_ON variant that vanishes when b43 debugging is disabled.
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 7cf4125a1624..5634d9a9965b 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -34,7 +34,7 @@
 
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/if_arp.h>
 #include <linux/etherdevice.h>
 #include <linux/firmware.h>
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
index 12b6b4067a39..714cad649c45 100644
--- a/drivers/net/wireless/b43/pcmcia.c
+++ b/drivers/net/wireless/b43/pcmcia.c
@@ -25,6 +25,7 @@
 
 #include <linux/ssb/ssb.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ciscode.h>
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index b17d9b6c33a5..c8fa2cd97e64 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -228,10 +228,98 @@ static void b43_chantab_radio_2056_upload(struct b43_wldev *dev,
 static void b43_radio_2056_setup(struct b43_wldev *dev,
                                 const struct b43_nphy_channeltab_entry_rev3 *e)
 {
+        struct ssb_sprom *sprom = dev->dev->bus_sprom;
+        enum ieee80211_band band = b43_current_band(dev->wl);
+        u16 offset;
+        u8 i;
+        u16 bias, cbias, pag_boost, pgag_boost, mixg_boost, padg_boost;
+
         B43_WARN_ON(dev->phy.rev < 3);
 
         b43_chantab_radio_2056_upload(dev, e);
-        /* TODO */
+        b2056_upload_syn_pll_cp2(dev, band == IEEE80211_BAND_5GHZ);
+
+        if (sprom->boardflags2_lo & B43_BFL2_GPLL_WAR &&
+            b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
+                b43_radio_write(dev, B2056_SYN_PLL_LOOPFILTER1, 0x1F);
+                b43_radio_write(dev, B2056_SYN_PLL_LOOPFILTER2, 0x1F);
+                if (dev->dev->chip_id == 0x4716) {
+                        b43_radio_write(dev, B2056_SYN_PLL_LOOPFILTER4, 0x14);
+                        b43_radio_write(dev, B2056_SYN_PLL_CP2, 0);
+                } else {
+                        b43_radio_write(dev, B2056_SYN_PLL_LOOPFILTER4, 0x0B);
+                        b43_radio_write(dev, B2056_SYN_PLL_CP2, 0x14);
+                }
+        }
+        if (sprom->boardflags2_lo & B43_BFL2_APLL_WAR &&
+            b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) {
+                b43_radio_write(dev, B2056_SYN_PLL_LOOPFILTER1, 0x1F);
+                b43_radio_write(dev, B2056_SYN_PLL_LOOPFILTER2, 0x1F);
+                b43_radio_write(dev, B2056_SYN_PLL_LOOPFILTER4, 0x05);
+                b43_radio_write(dev, B2056_SYN_PLL_CP2, 0x0C);
+        }
+
+        if (dev->phy.n->ipa2g_on && band == IEEE80211_BAND_2GHZ) {
+                for (i = 0; i < 2; i++) {
+                        offset = i ? B2056_TX1 : B2056_TX0;
+                        if (dev->phy.rev >= 5) {
+                                b43_radio_write(dev,
+                                        offset | B2056_TX_PADG_IDAC, 0xcc);
+
+                                if (dev->dev->chip_id == 0x4716) {
+                                        bias = 0x40;
+                                        cbias = 0x45;
+                                        pag_boost = 0x5;
+                                        pgag_boost = 0x33;
+                                        mixg_boost = 0x55;
+                                } else {
+                                        bias = 0x25;
+                                        cbias = 0x20;
+                                        pag_boost = 0x4;
+                                        pgag_boost = 0x03;
+                                        mixg_boost = 0x65;
+                                }
+                                padg_boost = 0x77;
+
+                                b43_radio_write(dev,
+                                        offset | B2056_TX_INTPAG_IMAIN_STAT,
+                                        bias);
+                                b43_radio_write(dev,
+                                        offset | B2056_TX_INTPAG_IAUX_STAT,
+                                        bias);
+                                b43_radio_write(dev,
+                                        offset | B2056_TX_INTPAG_CASCBIAS,
+                                        cbias);
+                                b43_radio_write(dev,
+                                        offset | B2056_TX_INTPAG_BOOST_TUNE,
+                                        pag_boost);
+                                b43_radio_write(dev,
+                                        offset | B2056_TX_PGAG_BOOST_TUNE,
+                                        pgag_boost);
+                                b43_radio_write(dev,
+                                        offset | B2056_TX_PADG_BOOST_TUNE,
+                                        padg_boost);
+                                b43_radio_write(dev,
+                                        offset | B2056_TX_MIXG_BOOST_TUNE,
+                                        mixg_boost);
+                        } else {
+                                bias = dev->phy.is_40mhz ? 0x40 : 0x20;
+                                b43_radio_write(dev,
+                                        offset | B2056_TX_INTPAG_IMAIN_STAT,
+                                        bias);
+                                b43_radio_write(dev,
+                                        offset | B2056_TX_INTPAG_IAUX_STAT,
+                                        bias);
+                                b43_radio_write(dev,
+                                        offset | B2056_TX_INTPAG_CASCBIAS,
+                                        0x30);
+                        }
+                        b43_radio_write(dev, offset | B2056_TX_PA_SPARE1, 0xee);
+                }
+        } else if (dev->phy.n->ipa5g_on && band == IEEE80211_BAND_5GHZ) {
+                /* TODO */
+        }
+
         udelay(50);
         /* VCO calibration */
         b43_radio_write(dev, B2056_SYN_PLL_VCOCAL12, 0x00);
@@ -387,7 +475,9 @@ static void b43_nphy_tx_power_fix(struct b43_wldev *dev)
         if (nphy->hang_avoid)
                 b43_nphy_stay_in_carrier_search(dev, 1);
 
-        if (dev->phy.rev >= 3) {
+        if (dev->phy.rev >= 7) {
+                txpi[0] = txpi[1] = 30;
+        } else if (dev->phy.rev >= 3) {
                 txpi[0] = 40;
                 txpi[1] = 40;
         } else if (sprom->revision < 4) {
@@ -411,6 +501,9 @@ static void b43_nphy_tx_power_fix(struct b43_wldev *dev)
                         txpi[1] = 91;
                 }
         }
+        if (dev->phy.rev < 7 &&
+            (txpi[0] < 40 || txpi[0] > 100 || txpi[1] < 40 || txpi[1] > 10))
+                txpi[0] = txpi[1] = 91;
 
         /*
         for (i = 0; i < 2; i++) {
@@ -421,15 +514,31 @@ static void b43_nphy_tx_power_fix(struct b43_wldev *dev)
 
         for (i = 0; i < 2; i++) {
                 if (dev->phy.rev >= 3) {
-                        /* FIXME: support 5GHz */
-                        txgain = b43_ntab_tx_gain_rev3plus_2ghz[txpi[i]];
+                        if (b43_nphy_ipa(dev)) {
+                                txgain = *(b43_nphy_get_ipa_gain_table(dev) +
+                                                txpi[i]);
+                        } else if (b43_current_band(dev->wl) ==
+                                   IEEE80211_BAND_5GHZ) {
+                                /* FIXME: use 5GHz tables */
+                                txgain =
+                                        b43_ntab_tx_gain_rev3plus_2ghz[txpi[i]];
+                        } else {
+                                if (dev->phy.rev >= 5 &&
+                                    sprom->fem.ghz5.extpa_gain == 3)
+                                        ; /* FIXME: 5GHz_txgain_HiPwrEPA */
+                                txgain =
+                                        b43_ntab_tx_gain_rev3plus_2ghz[txpi[i]];
+                        }
                         radio_gain = (txgain >> 16) & 0x1FFFF;
                 } else {
                         txgain = b43_ntab_tx_gain_rev0_1_2[txpi[i]];
                         radio_gain = (txgain >> 16) & 0x1FFF;
                 }
 
-                dac_gain = (txgain >> 8) & 0x3F;
+                if (dev->phy.rev >= 7)
+                        dac_gain = (txgain >> 8) & 0x7;
+                else
+                        dac_gain = (txgain >> 8) & 0x3F;
                 bbmult = txgain & 0xFF;
 
                 if (dev->phy.rev >= 3) {
@@ -459,7 +568,8 @@ static void b43_nphy_tx_power_fix(struct b43_wldev *dev)
                         u32 tmp32;
                         u16 reg = (i == 0) ?
                                 B43_NPHY_PAPD_EN0 : B43_NPHY_PAPD_EN1;
-                        tmp32 = b43_ntab_read(dev, B43_NTAB32(26 + i, txpi[i]));
+                        tmp32 = b43_ntab_read(dev, B43_NTAB32(26 + i,
+                                                              576 + txpi[i]));
                         b43_phy_maskset(dev, reg, 0xE00F, (u32) tmp32 << 4);
                         b43_phy_set(dev, reg, 0x4);
                 }
@@ -1493,8 +1603,8 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
         struct ssb_sprom *sprom = dev->dev->bus_sprom;
 
         /* TX to RX */
-        u8 tx2rx_events[9] = { 0x4, 0x3, 0x6, 0x5, 0x2, 0x1, 0x8, 0x1F };
-        u8 tx2rx_delays[9] = { 8, 4, 2, 2, 4, 4, 6, 1 };
+        u8 tx2rx_events[8] = { 0x4, 0x3, 0x6, 0x5, 0x2, 0x1, 0x8, 0x1F };
+        u8 tx2rx_delays[8] = { 8, 4, 2, 2, 4, 4, 6, 1 };
         /* RX to TX */
         u8 rx2tx_events_ipa[9] = { 0x0, 0x1, 0x2, 0x8, 0x5, 0x6, 0xF, 0x3,
                                         0x1F };
@@ -1505,6 +1615,9 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
         u16 tmp16;
         u32 tmp32;
 
+        b43_phy_write(dev, 0x23f, 0x1f8);
+        b43_phy_write(dev, 0x240, 0x1f8);
+
         tmp32 = b43_ntab_read(dev, B43_NTAB32(30, 0));
         tmp32 &= 0xffffff;
         b43_ntab_write(dev, B43_NTAB32(30, 0), tmp32);
@@ -1520,12 +1633,13 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
         b43_phy_write(dev, 0x2AE, 0x000C);
 
         /* TX to RX */
-        b43_nphy_set_rf_sequence(dev, 1, tx2rx_events, tx2rx_delays, 9);
+        b43_nphy_set_rf_sequence(dev, 1, tx2rx_events, tx2rx_delays,
+                                 ARRAY_SIZE(tx2rx_events));
 
         /* RX to TX */
         if (b43_nphy_ipa(dev))
-                b43_nphy_set_rf_sequence(dev, 1, rx2tx_events_ipa,
-                                         rx2tx_delays_ipa, 9);
+                b43_nphy_set_rf_sequence(dev, 0, rx2tx_events_ipa,
+                                rx2tx_delays_ipa, ARRAY_SIZE(rx2tx_events_ipa));
         if (nphy->hw_phyrxchain != 3 &&
             nphy->hw_phyrxchain != nphy->hw_phytxchain) {
                 if (b43_nphy_ipa(dev)) {
@@ -1533,7 +1647,8 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
                         rx2tx_delays[6] = 1;
                         rx2tx_events[7] = 0x1F;
                 }
-                b43_nphy_set_rf_sequence(dev, 1, rx2tx_events, rx2tx_delays, 9);
+                b43_nphy_set_rf_sequence(dev, 1, rx2tx_events, rx2tx_delays,
+                                         ARRAY_SIZE(rx2tx_events));
         }
 
         tmp16 = (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) ?
@@ -1547,8 +1662,8 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
 
         b43_nphy_gain_ctrl_workarounds(dev);
 
-        b43_ntab_write(dev, B43_NTAB32(8, 0), 2);
-        b43_ntab_write(dev, B43_NTAB32(8, 16), 2);
+        b43_ntab_write(dev, B43_NTAB16(8, 0), 2);
+        b43_ntab_write(dev, B43_NTAB16(8, 16), 2);
 
         /* TODO */
 
@@ -1560,6 +1675,8 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
         b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXA_BIAS_AUX, 0x07);
         b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXA_LOB_BIAS, 0x88);
         b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXA_LOB_BIAS, 0x88);
+        b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXA_CMFB_IDAC, 0x00);
+        b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXA_CMFB_IDAC, 0x00);
         b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXG_CMFB_IDAC, 0x00);
         b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXG_CMFB_IDAC, 0x00);
 
@@ -1584,18 +1701,18 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
                                 0x70);
         }
 
-        b43_phy_write(dev, 0x224, 0x039C);
-        b43_phy_write(dev, 0x225, 0x0357);
-        b43_phy_write(dev, 0x226, 0x0317);
-        b43_phy_write(dev, 0x227, 0x02D7);
-        b43_phy_write(dev, 0x228, 0x039C);
-        b43_phy_write(dev, 0x229, 0x0357);
-        b43_phy_write(dev, 0x22A, 0x0317);
-        b43_phy_write(dev, 0x22B, 0x02D7);
-        b43_phy_write(dev, 0x22C, 0x039C);
-        b43_phy_write(dev, 0x22D, 0x0357);
-        b43_phy_write(dev, 0x22E, 0x0317);
-        b43_phy_write(dev, 0x22F, 0x02D7);
+        b43_phy_write(dev, 0x224, 0x03eb);
+        b43_phy_write(dev, 0x225, 0x03eb);
+        b43_phy_write(dev, 0x226, 0x0341);
+        b43_phy_write(dev, 0x227, 0x0341);
+        b43_phy_write(dev, 0x228, 0x042b);
+        b43_phy_write(dev, 0x229, 0x042b);
+        b43_phy_write(dev, 0x22a, 0x0381);
+        b43_phy_write(dev, 0x22b, 0x0381);
+        b43_phy_write(dev, 0x22c, 0x042b);
+        b43_phy_write(dev, 0x22d, 0x042b);
+        b43_phy_write(dev, 0x22e, 0x0381);
+        b43_phy_write(dev, 0x22f, 0x0381);
 }
 
 static void b43_nphy_workarounds_rev1_2(struct b43_wldev *dev)
@@ -3928,6 +4045,76 @@ int b43_phy_initn(struct b43_wldev *dev)
         return 0;
 }
 
+/* http://bcm-v4.sipsolutions.net/802.11/PmuSpurAvoid */
+static void b43_nphy_pmu_spur_avoid(struct b43_wldev *dev, bool avoid)
+{
+        struct bcma_drv_cc *cc;
+        u32 pmu_ctl;
+
+        switch (dev->dev->bus_type) {
+#ifdef CONFIG_B43_BCMA
+        case B43_BUS_BCMA:
+                cc = &dev->dev->bdev->bus->drv_cc;
+                if (dev->dev->chip_id == 43224 || dev->dev->chip_id == 43225) {
+                        if (avoid) {
+                                bcma_chipco_pll_write(cc, 0x0, 0x11500010);
+                                bcma_chipco_pll_write(cc, 0x1, 0x000C0C06);
+                                bcma_chipco_pll_write(cc, 0x2, 0x0F600a08);
+                                bcma_chipco_pll_write(cc, 0x3, 0x00000000);
+                                bcma_chipco_pll_write(cc, 0x4, 0x2001E920);
+                                bcma_chipco_pll_write(cc, 0x5, 0x88888815);
+                        } else {
+                                bcma_chipco_pll_write(cc, 0x0, 0x11100010);
+                                bcma_chipco_pll_write(cc, 0x1, 0x000c0c06);
+                                bcma_chipco_pll_write(cc, 0x2, 0x03000a08);
+                                bcma_chipco_pll_write(cc, 0x3, 0x00000000);
+                                bcma_chipco_pll_write(cc, 0x4, 0x200005c0);
+                                bcma_chipco_pll_write(cc, 0x5, 0x88888815);
+                        }
+                        pmu_ctl = BCMA_CC_PMU_CTL_PLL_UPD;
+                } else if (dev->dev->chip_id == 0x4716) {
+                        if (avoid) {
+                                bcma_chipco_pll_write(cc, 0x0, 0x11500060);
+                                bcma_chipco_pll_write(cc, 0x1, 0x080C0C06);
+                                bcma_chipco_pll_write(cc, 0x2, 0x0F600000);
+                                bcma_chipco_pll_write(cc, 0x3, 0x00000000);
+                                bcma_chipco_pll_write(cc, 0x4, 0x2001E924);
+                                bcma_chipco_pll_write(cc, 0x5, 0x88888815);
+                        } else {
+                                bcma_chipco_pll_write(cc, 0x0, 0x11100060);
+                                bcma_chipco_pll_write(cc, 0x1, 0x080c0c06);
+                                bcma_chipco_pll_write(cc, 0x2, 0x03000000);
+                                bcma_chipco_pll_write(cc, 0x3, 0x00000000);
+                                bcma_chipco_pll_write(cc, 0x4, 0x200005c0);
+                                bcma_chipco_pll_write(cc, 0x5, 0x88888815);
+                        }
+                        pmu_ctl = BCMA_CC_PMU_CTL_PLL_UPD |
+                                  BCMA_CC_PMU_CTL_NOILPONW;
+                } else if (dev->dev->chip_id == 0x4322 ||
+                           dev->dev->chip_id == 0x4340 ||
+                           dev->dev->chip_id == 0x4341) {
+                        bcma_chipco_pll_write(cc, 0x0, 0x11100070);
+                        bcma_chipco_pll_write(cc, 0x1, 0x1014140a);
+                        bcma_chipco_pll_write(cc, 0x5, 0x88888854);
+                        if (avoid)
+                                bcma_chipco_pll_write(cc, 0x2, 0x05201828);
+                        else
+                                bcma_chipco_pll_write(cc, 0x2, 0x05001828);
+                        pmu_ctl = BCMA_CC_PMU_CTL_PLL_UPD;
+                } else {
+                        return;
+                }
+                bcma_cc_set32(cc, BCMA_CC_PMU_CTL, pmu_ctl);
+                break;
+#endif
+#ifdef CONFIG_B43_SSB
+        case B43_BUS_SSB:
+                /* FIXME */
+                break;
+#endif
+        }
+}
+
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ChanspecSetup */
 static void b43_nphy_channel_setup(struct b43_wldev *dev,
                                 const struct b43_phy_n_sfo_cfg *e,
@@ -3935,6 +4122,7 @@ static void b43_nphy_channel_setup(struct b43_wldev *dev,
 {
         struct b43_phy *phy = &dev->phy;
         struct b43_phy_n *nphy = dev->phy.n;
+        int ch = new_channel->hw_value;
 
         u16 old_band_5ghz;
         u32 tmp32;
@@ -3974,8 +4162,41 @@ static void b43_nphy_channel_setup(struct b43_wldev *dev,
 
         b43_nphy_tx_lp_fbw(dev);
 
-        if (dev->phy.rev >= 3 && 0) {
-                /* TODO */
+        if (dev->phy.rev >= 3 &&
+            dev->phy.n->spur_avoid != B43_SPUR_AVOID_DISABLE) {
+                bool avoid = false;
+                if (dev->phy.n->spur_avoid == B43_SPUR_AVOID_FORCE) {
+                        avoid = true;
+                } else if (!b43_channel_type_is_40mhz(phy->channel_type)) {
+                        if ((ch >= 5 && ch <= 8) || ch == 13 || ch == 14)
+                                avoid = true;
+                } else { /* 40MHz */
+                        if (nphy->aband_spurwar_en &&
+                            (ch == 38 || ch == 102 || ch == 118))
+                                avoid = dev->dev->chip_id == 0x4716;
+                }
+
+                b43_nphy_pmu_spur_avoid(dev, avoid);
+
+                if (dev->dev->chip_id == 43222 || dev->dev->chip_id == 43224 ||
+                    dev->dev->chip_id == 43225) {
+                        b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_LOW,
+                                    avoid ? 0x5341 : 0x8889);
+                        b43_write16(dev, B43_MMIO_TSF_CLK_FRAC_HIGH, 0x8);
+                }
+
+                if (dev->phy.rev == 3 || dev->phy.rev == 4)
+                        ; /* TODO: reset PLL */
+
+                if (avoid)
+                        b43_phy_set(dev, B43_NPHY_BBCFG, B43_NPHY_BBCFG_RSTRX);
+                else
+                        b43_phy_mask(dev, B43_NPHY_BBCFG,
+                                     ~B43_NPHY_BBCFG_RSTRX & 0xFFFF);
+
+                b43_nphy_reset_cca(dev);
+
+                /* wl sets useless phy_isspuravoid here */
         }
 
         b43_phy_write(dev, B43_NPHY_NDATAT_DUP40, 0x3830);
@@ -4055,10 +4276,13 @@ static void b43_nphy_op_prepare_structs(struct b43_wldev *dev)
 {
         struct b43_phy *phy = &dev->phy;
         struct b43_phy_n *nphy = phy->n;
+        struct ssb_sprom *sprom = dev->dev->bus_sprom;
 
         memset(nphy, 0, sizeof(*nphy));
 
         nphy->hang_avoid = (phy->rev == 3 || phy->rev == 4);
+        nphy->spur_avoid = (phy->rev >= 3) ?
+                                B43_SPUR_AVOID_AUTO : B43_SPUR_AVOID_DISABLE;
         nphy->gain_boost = true; /* this way we follow wl, assume it is true */
         nphy->txrx_chain = 2; /* sth different than 0 and 1 for now */
         nphy->phyrxchain = 3; /* to avoid b43_nphy_set_rx_core_state like wl */
@@ -4067,6 +4291,38 @@ static void b43_nphy_op_prepare_structs(struct b43_wldev *dev)
          * 0x7f == 127 and we check for 128 when restoring TX pwr ctl. */
         nphy->tx_pwr_idx[0] = 128;
         nphy->tx_pwr_idx[1] = 128;
+
+        /* Hardware TX power control and 5GHz power gain */
+        nphy->txpwrctrl = false;
+        nphy->pwg_gain_5ghz = false;
+        if (dev->phy.rev >= 3 ||
+            (dev->dev->board_vendor == PCI_VENDOR_ID_APPLE &&
+             (dev->dev->core_rev == 11 || dev->dev->core_rev == 12))) {
+                nphy->txpwrctrl = true;
+                nphy->pwg_gain_5ghz = true;
+        } else if (sprom->revision >= 4) {
+                if (dev->phy.rev >= 2 &&
+                    (sprom->boardflags2_lo & B43_BFL2_TXPWRCTRL_EN)) {
+                        nphy->txpwrctrl = true;
+#ifdef CONFIG_B43_SSB
+                        if (dev->dev->bus_type == B43_BUS_SSB &&
+                            dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI) {
+                                struct pci_dev *pdev =
+                                        dev->dev->sdev->bus->host_pci;
+                                if (pdev->device == 0x4328 ||
+                                    pdev->device == 0x432a)
+                                        nphy->pwg_gain_5ghz = true;
+                        }
+#endif
+                } else if (sprom->boardflags2_lo & B43_BFL2_5G_PWRGAIN) {
+                        nphy->pwg_gain_5ghz = true;
+                }
+        }
+
+        if (dev->phy.rev >= 3) {
+                nphy->ipa2g_on = sprom->fem.ghz2.extpa_gain == 2;
+                nphy->ipa5g_on = sprom->fem.ghz5.extpa_gain == 2;
+        }
 }
 
 static void b43_nphy_op_free(struct b43_wldev *dev)
diff --git a/drivers/net/wireless/b43/phy_n.h b/drivers/net/wireless/b43/phy_n.h
index fbf520285bd1..56ef97b5b815 100644
--- a/drivers/net/wireless/b43/phy_n.h
+++ b/drivers/net/wireless/b43/phy_n.h
@@ -716,6 +716,12 @@
 
 struct b43_wldev;
 
+enum b43_nphy_spur_avoid {
+        B43_SPUR_AVOID_DISABLE,
+        B43_SPUR_AVOID_AUTO,
+        B43_SPUR_AVOID_FORCE,
+};
+
 struct b43_chanspec {
         u16 center_freq;
         enum nl80211_channel_type channel_type;
@@ -785,6 +791,7 @@ struct b43_phy_n {
         u16 mphase_txcal_bestcoeffs[11];
 
         bool txpwrctrl;
+        bool pwg_gain_5ghz;
         u8 tx_pwr_idx[2];
         u16 adj_pwr_tbl[84];
         u16 txcal_bbmult;
@@ -803,6 +810,7 @@ struct b43_phy_n {
         u16 classifier_state;
         u16 clip_state[2];
 
+        enum b43_nphy_spur_avoid spur_avoid;
         bool aband_spurwar_en;
         bool gband_spurwar_en;
 
diff --git a/drivers/net/wireless/b43/radio_2056.c b/drivers/net/wireless/b43/radio_2056.c
index a01f776ca4de..ce037fb6789a 100644
--- a/drivers/net/wireless/b43/radio_2056.c
+++ b/drivers/net/wireless/b43/radio_2056.c
@@ -1572,14 +1572,14 @@ static const struct b2056_inittab_entry b2056_inittab_rev6_syn[] = {
         [B2056_SYN_PLL_XTAL5]           = { .ghz5 = 0x0077, .ghz2 = 0x0077, NOUPLOAD, },
         [B2056_SYN_PLL_XTAL6]           = { .ghz5 = 0x0007, .ghz2 = 0x0007, NOUPLOAD, },
         [B2056_SYN_PLL_REFDIV]          = { .ghz5 = 0x0001, .ghz2 = 0x0001, NOUPLOAD, },
-        [B2056_SYN_PLL_PFD]             = { .ghz5 = 0x0004, .ghz2 = 0x0004, NOUPLOAD, },
+        [B2056_SYN_PLL_PFD]             = { .ghz5 = 0x0006, .ghz2 = 0x0006, UPLOAD, },
         [B2056_SYN_PLL_CP1]             = { .ghz5 = 0x000f, .ghz2 = 0x000f, NOUPLOAD, },
-        [B2056_SYN_PLL_CP2]             = { .ghz5 = 0x0030, .ghz2 = 0x0030, NOUPLOAD, },
+        [B2056_SYN_PLL_CP2]             = { .ghz5 = 0x003f, .ghz2 = 0x003f, UPLOAD, },
         [B2056_SYN_PLL_CP3]             = { .ghz5 = 0x0032, .ghz2 = 0x0032, NOUPLOAD, },
-        [B2056_SYN_PLL_LOOPFILTER1]     = { .ghz5 = 0x000d, .ghz2 = 0x000d, NOUPLOAD, },
-        [B2056_SYN_PLL_LOOPFILTER2]     = { .ghz5 = 0x000d, .ghz2 = 0x000d, NOUPLOAD, },
+        [B2056_SYN_PLL_LOOPFILTER1]     = { .ghz5 = 0x0006, .ghz2 = 0x0006, UPLOAD, },
+        [B2056_SYN_PLL_LOOPFILTER2]     = { .ghz5 = 0x0006, .ghz2 = 0x0006, UPLOAD, },
         [B2056_SYN_PLL_LOOPFILTER3]     = { .ghz5 = 0x0004, .ghz2 = 0x0004, NOUPLOAD, },
-        [B2056_SYN_PLL_LOOPFILTER4]     = { .ghz5 = 0x0006, .ghz2 = 0x0006, NOUPLOAD, },
+        [B2056_SYN_PLL_LOOPFILTER4]     = { .ghz5 = 0x002b, .ghz2 = 0x002b, UPLOAD, },
         [B2056_SYN_PLL_LOOPFILTER5]     = { .ghz5 = 0x0001, .ghz2 = 0x0001, NOUPLOAD, },
         [B2056_SYN_PLL_MMD1]            = { .ghz5 = 0x001c, .ghz2 = 0x001c, NOUPLOAD, },
         [B2056_SYN_PLL_MMD2]            = { .ghz5 = 0x0002, .ghz2 = 0x0002, NOUPLOAD, },
@@ -9055,6 +9055,21 @@ void b2056_upload_inittabs(struct b43_wldev *dev,
                                 B2056_RX1, pts->rx, pts->rx_length);
 }
 
+void b2056_upload_syn_pll_cp2(struct b43_wldev *dev, bool ghz5)
+{
+        struct b2056_inittabs_pts *pts;
+        const struct b2056_inittab_entry *e;
+
+        if (dev->phy.rev >= ARRAY_SIZE(b2056_inittabs)) {
+                B43_WARN_ON(1);
+                return;
+        }
+        pts = &b2056_inittabs[dev->phy.rev];
+        e = &pts->syn[B2056_SYN_PLL_CP2];
+
+        b43_radio_write(dev, B2056_SYN_PLL_CP2, ghz5 ? e->ghz5 : e->ghz2);
+}
+
 const struct b43_nphy_channeltab_entry_rev3 *
 b43_nphy_get_chantabent_rev3(struct b43_wldev *dev, u16 freq)
 {
diff --git a/drivers/net/wireless/b43/radio_2056.h b/drivers/net/wireless/b43/radio_2056.h
index a7159d8578be..5b86673459fa 100644
--- a/drivers/net/wireless/b43/radio_2056.h
+++ b/drivers/net/wireless/b43/radio_2056.h
@@ -1090,6 +1090,7 @@ struct b43_nphy_channeltab_entry_rev3 {
 
 void b2056_upload_inittabs(struct b43_wldev *dev,
                            bool ghz5, bool ignore_uploadflag);
+void b2056_upload_syn_pll_cp2(struct b43_wldev *dev, bool ghz5);
 
 /* Get the NPHY Channel Switch Table entry for a channel.
  * Returns NULL on failure to find an entry. */
diff --git a/drivers/net/wireless/b43/tables_nphy.c b/drivers/net/wireless/b43/tables_nphy.c
index 7b326f2efdc9..3252560e9fa1 100644
--- a/drivers/net/wireless/b43/tables_nphy.c
+++ b/drivers/net/wireless/b43/tables_nphy.c
@@ -2171,6 +2171,48 @@ static const u16 b43_ntab_loftlt1_r3[] = {
         0x0000, 0x0000,
 };
 
+/* volatile  tables, PHY revision >= 3 */
+
+/* indexed by antswctl2g */
+static const u16 b43_ntab_antswctl2g_r3[4][32] = {
+        {
+                0x0082, 0x0082, 0x0211, 0x0222, 0x0328,
+                0x0000, 0x0000, 0x0000, 0x0144, 0x0000,
+                0x0000, 0x0000, 0x0188, 0x0000, 0x0000,
+                0x0000, 0x0082, 0x0082, 0x0211, 0x0222,
+                0x0328, 0x0000, 0x0000, 0x0000, 0x0144,
+                0x0000, 0x0000, 0x0000, 0x0188, 0x0000,
+                0x0000, 0x0000,
+        },
+        {
+                0x0022, 0x0022, 0x0011, 0x0022, 0x0022,
+                0x0000, 0x0000, 0x0000, 0x0011, 0x0000,
+                0x0000, 0x0000, 0x0022, 0x0000, 0x0000,
+                0x0000, 0x0022, 0x0022, 0x0011, 0x0022,
+                0x0022, 0x0000, 0x0000, 0x0000, 0x0011,
+                0x0000, 0x0000, 0x0000, 0x0022, 0x0000,
+                0x0000, 0x0000,
+        },
+        {
+                0x0088, 0x0088, 0x0044, 0x0088, 0x0088,
+                0x0000, 0x0000, 0x0000, 0x0044, 0x0000,
+                0x0000, 0x0000, 0x0088, 0x0000, 0x0000,
+                0x0000, 0x0088, 0x0088, 0x0044, 0x0088,
+                0x0088, 0x0000, 0x0000, 0x0000, 0x0044,
+                0x0000, 0x0000, 0x0000, 0x0088, 0x0000,
+                0x0000, 0x0000,
+        },
+        {
+                0x0022, 0x0022, 0x0011, 0x0022, 0x0000,
+                0x0000, 0x0000, 0x0000, 0x0011, 0x0000,
+                0x0000, 0x0000, 0x0022, 0x0000, 0x0000,
+                0x03cc, 0x0022, 0x0022, 0x0011, 0x0022,
+                0x0000, 0x0000, 0x0000, 0x0000, 0x0011,
+                0x0000, 0x0000, 0x0000, 0x0022, 0x0000,
+                0x0000, 0x03cc,
+        }
+};
+
 /* TX gain tables */
 const u32 b43_ntab_tx_gain_rev0_1_2[] = {
         0x03cc2b44, 0x03cc2b42, 0x03cc2a44, 0x03cc2a42,
@@ -2652,7 +2694,7 @@ const u16 tbl_tx_iqlo_cal_cmds_fullcal_nphyrev3[] = {
 const s16 tbl_tx_filter_coef_rev4[7][15] = {
         {  -377,   137,  -407,   208, -1527,
             956,    93,   186,    93,   230,
-            -44,   230,    20,  -191,   201 },
+            -44,   230,   201,  -191,   201 },
         {   -77,    20,   -98,    49,   -93,
              60,    56,   111,    56,    26,
              -5,    26,    34,   -32,    34 },
@@ -2838,9 +2880,8 @@ u32 b43_ntab_read(struct b43_wldev *dev, u32 offset)
                 break;
         case B43_NTAB_32BIT:
                 b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset);
-                value = b43_phy_read(dev, B43_NPHY_TABLE_DATAHI);
-                value <<= 16;
-                value |= b43_phy_read(dev, B43_NPHY_TABLE_DATALO);
+                value = b43_phy_read(dev, B43_NPHY_TABLE_DATALO);
+                value |= b43_phy_read(dev, B43_NPHY_TABLE_DATAHI) << 16;
                 break;
         default:
                 B43_WARN_ON(1);
@@ -2864,6 +2905,12 @@ void b43_ntab_read_bulk(struct b43_wldev *dev, u32 offset,
         b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset);
 
         for (i = 0; i < nr_elements; i++) {
+                /* Auto increment broken + caching issue on BCM43224? */
+                if (dev->dev->chip_id == 43224 && dev->dev->chip_rev == 1) {
+                        b43_phy_read(dev, B43_NPHY_TABLE_DATALO);
+                        b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset + i);
+                }
+
                 switch (type) {
                 case B43_NTAB_8BIT:
                         *data = b43_phy_read(dev, B43_NPHY_TABLE_DATALO) & 0xFF;
@@ -2874,9 +2921,10 @@ void b43_ntab_read_bulk(struct b43_wldev *dev, u32 offset,
                         data += 2;
                         break;
                 case B43_NTAB_32BIT:
-                        *((u32 *)data) = b43_phy_read(dev, B43_NPHY_TABLE_DATAHI);
-                        *((u32 *)data) <<= 16;
-                        *((u32 *)data) |= b43_phy_read(dev, B43_NPHY_TABLE_DATALO);
+                        *((u32 *)data) =
+                                b43_phy_read(dev, B43_NPHY_TABLE_DATALO);
+                        *((u32 *)data) |=
+                                b43_phy_read(dev, B43_NPHY_TABLE_DATAHI) << 16;
                         data += 4;
                         break;
                 default:
@@ -2932,6 +2980,13 @@ void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset,
         b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset);
 
         for (i = 0; i < nr_elements; i++) {
+                /* Auto increment broken + caching issue on BCM43224? */
+                if ((offset >> 10) == 9 && dev->dev->chip_id == 43224 &&
+                    dev->dev->chip_rev == 1) {
+                        b43_phy_read(dev, B43_NPHY_TABLE_DATALO);
+                        b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset + i);
+                }
+
                 switch (type) {
                 case B43_NTAB_8BIT:
                         value = *data;
@@ -2999,6 +3054,8 @@ void b43_nphy_rev0_1_2_tables_init(struct b43_wldev *dev)
         } while (0)
 void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev)
 {
+        struct ssb_sprom *sprom = dev->dev->bus_sprom;
+
         /* Static tables */
         ntab_upload_r3(dev, B43_NTAB_FRAMESTRUCT_R3, b43_ntab_framestruct_r3);
         ntab_upload_r3(dev, B43_NTAB_PILOT_R3, b43_ntab_pilot_r3);
@@ -3029,7 +3086,11 @@ void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev)
         ntab_upload_r3(dev, B43_NTAB_C1_LOFEEDTH_R3, b43_ntab_loftlt1_r3);
 
         /* Volatile tables */
-        /* TODO */
+        if (sprom->fem.ghz2.antswlut < ARRAY_SIZE(b43_ntab_antswctl2g_r3))
+                ntab_upload_r3(dev, B43_NTAB_ANT_SW_CTL_R3,
+                               b43_ntab_antswctl2g_r3[sprom->fem.ghz2.antswlut]);
+        else
+                B43_WARN_ON(1);
 }
 
 struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent(
diff --git a/drivers/net/wireless/b43/tables_nphy.h b/drivers/net/wireless/b43/tables_nphy.h
index a81696bff0ed..97038c481930 100644
--- a/drivers/net/wireless/b43/tables_nphy.h
+++ b/drivers/net/wireless/b43/tables_nphy.h
@@ -126,26 +126,29 @@ struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent(
 #define B43_NTAB_C1_LOFEEDTH            B43_NTAB16(0x1B, 0x1C0) /* Local Oscillator Feed Through Lookup Table Core 1 */
 #define B43_NTAB_C1_LOFEEDTH_SIZE       128
 
+/* Volatile N-PHY tables, PHY revision >= 3 */
+#define B43_NTAB_ANT_SW_CTL_R3          B43_NTAB16( 9,   0) /* antenna software control */
+
 /* Static N-PHY tables, PHY revision >= 3 */
-#define B43_NTAB_FRAMESTRUCT_R3         B43_NTAB32(10, 000) /* frame struct  */
-#define B43_NTAB_PILOT_R3               B43_NTAB16(11, 000) /* pilot  */
-#define B43_NTAB_TMAP_R3                B43_NTAB32(12, 000) /* TM AP  */
-#define B43_NTAB_INTLEVEL_R3            B43_NTAB32(13, 000) /* INT LV  */
-#define B43_NTAB_TDTRN_R3               B43_NTAB32(14, 000) /* TD TRN  */
-#define B43_NTAB_NOISEVAR0_R3           B43_NTAB32(16, 000) /* noise variance 0  */
+#define B43_NTAB_FRAMESTRUCT_R3         B43_NTAB32(10,   0) /* frame struct  */
+#define B43_NTAB_PILOT_R3               B43_NTAB16(11,   0) /* pilot  */
+#define B43_NTAB_TMAP_R3                B43_NTAB32(12,   0) /* TM AP  */
+#define B43_NTAB_INTLEVEL_R3            B43_NTAB32(13,   0) /* INT LV  */
+#define B43_NTAB_TDTRN_R3               B43_NTAB32(14,   0) /* TD TRN  */
+#define B43_NTAB_NOISEVAR0_R3           B43_NTAB32(16,   0) /* noise variance 0  */
 #define B43_NTAB_NOISEVAR1_R3           B43_NTAB32(16, 128) /* noise variance 1  */
-#define B43_NTAB_MCS_R3                 B43_NTAB16(18, 000) /* MCS  */
+#define B43_NTAB_MCS_R3                 B43_NTAB16(18,   0) /* MCS  */
 #define B43_NTAB_TDI20A0_R3             B43_NTAB32(19, 128) /* TDI 20/0  */
 #define B43_NTAB_TDI20A1_R3             B43_NTAB32(19, 256) /* TDI 20/1  */
 #define B43_NTAB_TDI40A0_R3             B43_NTAB32(19, 640) /* TDI 40/0  */
 #define B43_NTAB_TDI40A1_R3             B43_NTAB32(19, 768) /* TDI 40/1  */
-#define B43_NTAB_PILOTLT_R3             B43_NTAB32(20, 000) /* PLT lookup  */
-#define B43_NTAB_CHANEST_R3             B43_NTAB32(22, 000) /* channel estimate  */
-#define B43_NTAB_FRAMELT_R3             B43_NTAB8 (24, 000) /* frame lookup  */
-#define B43_NTAB_C0_ESTPLT_R3           B43_NTAB8 (26, 000) /* estimated power lookup 0  */
-#define B43_NTAB_C1_ESTPLT_R3           B43_NTAB8 (27, 000) /* estimated power lookup 1  */
-#define B43_NTAB_C0_ADJPLT_R3           B43_NTAB8 (26, 064) /* adjusted power lookup 0  */
-#define B43_NTAB_C1_ADJPLT_R3           B43_NTAB8 (27, 064) /* adjusted power lookup 1  */
+#define B43_NTAB_PILOTLT_R3             B43_NTAB32(20,   0) /* PLT lookup  */
+#define B43_NTAB_CHANEST_R3             B43_NTAB32(22,   0) /* channel estimate  */
+#define B43_NTAB_FRAMELT_R3              B43_NTAB8(24,   0) /* frame lookup  */
+#define B43_NTAB_C0_ESTPLT_R3            B43_NTAB8(26,   0) /* estimated power lookup 0  */
+#define B43_NTAB_C1_ESTPLT_R3            B43_NTAB8(27,   0) /* estimated power lookup 1  */
+#define B43_NTAB_C0_ADJPLT_R3            B43_NTAB8(26,  64) /* adjusted power lookup 0  */
+#define B43_NTAB_C1_ADJPLT_R3            B43_NTAB8(27,  64) /* adjusted power lookup 1  */
 #define B43_NTAB_C0_GAINCTL_R3          B43_NTAB32(26, 192) /* gain control lookup 0  */
 #define B43_NTAB_C1_GAINCTL_R3          B43_NTAB32(27, 192) /* gain control lookup 1  */
 #define B43_NTAB_C0_IQLT_R3             B43_NTAB32(26, 320) /* I/Q lookup 0  */
diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h
index 12b518251581..1d4fc9db7f5e 100644
--- a/drivers/net/wireless/b43legacy/b43legacy.h
+++ b/drivers/net/wireless/b43legacy/b43legacy.h
@@ -810,15 +810,15 @@ struct b43legacy_lopair *b43legacy_get_lopair(struct b43legacy_phy *phy,
 
 
 /* Message printing */
-void b43legacyinfo(struct b43legacy_wl *wl, const char *fmt, ...)
-                __attribute__((format(printf, 2, 3)));
-void b43legacyerr(struct b43legacy_wl *wl, const char *fmt, ...)
-                __attribute__((format(printf, 2, 3)));
-void b43legacywarn(struct b43legacy_wl *wl, const char *fmt, ...)
-                __attribute__((format(printf, 2, 3)));
+__printf(2, 3)
+void b43legacyinfo(struct b43legacy_wl *wl, const char *fmt, ...);
+__printf(2, 3)
+void b43legacyerr(struct b43legacy_wl *wl, const char *fmt, ...);
+__printf(2, 3)
+void b43legacywarn(struct b43legacy_wl *wl, const char *fmt, ...);
 #if B43legacy_DEBUG
-void b43legacydbg(struct b43legacy_wl *wl, const char *fmt, ...)
-                __attribute__((format(printf, 2, 3)));
+__printf(2, 3)
+void b43legacydbg(struct b43legacy_wl *wl, const char *fmt, ...);
 #else /* DEBUG */
 # define b43legacydbg(wl, fmt...) do { /* nothing */ } while (0)
 #endif /* DEBUG */
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index a3b72cd72c66..20f02437af8c 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -31,7 +31,7 @@
 
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/if_arp.h>
 #include <linux/etherdevice.h>
 #include <linux/firmware.h>
diff --git a/drivers/net/wireless/brcm80211/Kconfig b/drivers/net/wireless/brcm80211/Kconfig
index 2069fc8f7ad1..8f54c2eb6824 100644
--- a/drivers/net/wireless/brcm80211/Kconfig
+++ b/drivers/net/wireless/brcm80211/Kconfig
@@ -3,9 +3,8 @@ config BRCMUTIL
 
 config BRCMSMAC
         tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"
-        depends on PCI
         depends on MAC80211
-        depends on BCMA=n
+        depends on BCMA
         select BRCMUTIL
         select FW_LOADER
         select CRC_CCITT
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h b/drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h
deleted file mode 100644
index cecb5e5f412b..000000000000
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2011 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or 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 _bcmchip_h_
-#define _bcmchip_h_
-
-/* bcm4329 */
-/* firmware name */
-#define BCM4329_FW_NAME                 "brcm/bcm4329-fullmac-4.bin"
-#define BCM4329_NV_NAME                 "brcm/bcm4329-fullmac-4.txt"
-
-#endif                          /* _bcmchip_h_ */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index bff9dcd6fadc..6c85d668c9d7 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -17,6 +17,7 @@
 
 #include <linux/types.h>
 #include <linux/netdevice.h>
+#include <linux/export.h>
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <linux/sched.h>
@@ -221,19 +222,12 @@ bool brcmf_sdcard_regfail(struct brcmf_sdio_dev *sdiodev)
         return sdiodev->regfail;
 }
 
-int
-brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
-                      uint flags,
-                      u8 *buf, uint nbytes, struct sk_buff *pkt)
+static int brcmf_sdcard_recv_prepare(struct brcmf_sdio_dev *sdiodev, uint fn,
+                                     uint flags, uint width, u32 *addr)
 {
-        int status;
-        uint incr_fix;
-        uint width;
-        uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
+        uint bar0 = *addr & ~SBSDIO_SB_OFT_ADDR_MASK;
         int err = 0;
 
-        brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n", fn, addr, nbytes);
-
         /* Async not implemented yet */
         if (flags & SDIO_REQ_ASYNC)
                 return -ENOTSUPP;
@@ -246,29 +240,114 @@ brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
                 sdiodev->sbwad = bar0;
         }
 
-        addr &= SBSDIO_SB_OFT_ADDR_MASK;
+        *addr &= SBSDIO_SB_OFT_ADDR_MASK;
+
+        if (width == 4)
+                *addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
+
+        return 0;
+}
+
+int
+brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
+                      uint flags, u8 *buf, uint nbytes)
+{
+        struct sk_buff *mypkt;
+        int err;
+
+        mypkt = brcmu_pkt_buf_get_skb(nbytes);
+        if (!mypkt) {
+                brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n",
+                          nbytes);
+                return -EIO;
+        }
+
+        err = brcmf_sdcard_recv_pkt(sdiodev, addr, fn, flags, mypkt);
+        if (!err)
+                memcpy(buf, mypkt->data, nbytes);
+
+        brcmu_pkt_buf_free_skb(mypkt);
+        return err;
+}
+
+int
+brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
+                      uint flags, struct sk_buff *pkt)
+{
+        uint incr_fix;
+        uint width;
+        int err = 0;
+
+        brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n",
+                  fn, addr, pkt->len);
+
+        width = (flags & SDIO_REQ_4BYTE) ? 4 : 2;
+        err = brcmf_sdcard_recv_prepare(sdiodev, fn, flags, width, &addr);
+        if (err)
+                return err;
 
         incr_fix = (flags & SDIO_REQ_FIXED) ? SDIOH_DATA_FIX : SDIOH_DATA_INC;
+        err = brcmf_sdioh_request_buffer(sdiodev, incr_fix, SDIOH_READ,
+                                         fn, addr, pkt);
+
+        return err;
+}
+
+int brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
+                            uint flags, struct sk_buff_head *pktq)
+{
+        uint incr_fix;
+        uint width;
+        int err = 0;
+
+        brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n",
+                  fn, addr, pktq->qlen);
+
         width = (flags & SDIO_REQ_4BYTE) ? 4 : 2;
-        if (width == 4)
-                addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
+        err = brcmf_sdcard_recv_prepare(sdiodev, fn, flags, width, &addr);
+        if (err)
+                return err;
 
-        status = brcmf_sdioh_request_buffer(sdiodev, incr_fix, SDIOH_READ,
-                                            fn, addr, width, nbytes, buf, pkt);
+        incr_fix = (flags & SDIO_REQ_FIXED) ? SDIOH_DATA_FIX : SDIOH_DATA_INC;
+        err = brcmf_sdioh_request_chain(sdiodev, incr_fix, SDIOH_READ, fn, addr,
+                                        pktq);
 
-        return status;
+        return err;
 }
 
 int
 brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
-                      uint flags, u8 *buf, uint nbytes, struct sk_buff *pkt)
+                      uint flags, u8 *buf, uint nbytes)
+{
+        struct sk_buff *mypkt;
+        int err;
+
+        mypkt = brcmu_pkt_buf_get_skb(nbytes);
+        if (!mypkt) {
+                brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n",
+                          nbytes);
+                return -EIO;
+        }
+
+        memcpy(mypkt->data, buf, nbytes);
+        err = brcmf_sdcard_send_pkt(sdiodev, addr, fn, flags, mypkt);
+
+        brcmu_pkt_buf_free_skb(mypkt);
+        return err;
+
+}
+
+int
+brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
+                      uint flags, struct sk_buff *pkt)
 {
         uint incr_fix;
         uint width;
         uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
         int err = 0;
 
-        brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n", fn, addr, nbytes);
+        brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n",
+                  fn, addr, pkt->len);
 
         /* Async not implemented yet */
         if (flags & SDIO_REQ_ASYNC)
@@ -290,18 +369,39 @@ brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
                 addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
 
         return brcmf_sdioh_request_buffer(sdiodev, incr_fix, SDIOH_WRITE, fn,
-                                          addr, width, nbytes, buf, pkt);
+                                          addr, pkt);
 }
 
 int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw, u32 addr,
                         u8 *buf, uint nbytes)
 {
+        struct sk_buff *mypkt;
+        bool write = rw ? SDIOH_WRITE : SDIOH_READ;
+        int err;
+
         addr &= SBSDIO_SB_OFT_ADDR_MASK;
         addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
 
-        return brcmf_sdioh_request_buffer(sdiodev, SDIOH_DATA_INC,
-                (rw ? SDIOH_WRITE : SDIOH_READ), SDIO_FUNC_1,
-                addr, 4, nbytes, buf, NULL);
+        mypkt = brcmu_pkt_buf_get_skb(nbytes);
+        if (!mypkt) {
+                brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n",
+                          nbytes);
+                return -EIO;
+        }
+
+        /* For a write, copy the buffer data into the packet. */
+        if (write)
+                memcpy(mypkt->data, buf, nbytes);
+
+        err = brcmf_sdioh_request_buffer(sdiodev, SDIOH_DATA_INC, write,
+                                         SDIO_FUNC_1, addr, mypkt);
+
+        /* For a read, copy the packet data back to the buffer. */
+        if (!err && !write)
+                memcpy(buf, mypkt->data, nbytes);
+
+        brcmu_pkt_buf_free_skb(mypkt);
+        return err;
 }
 
 int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn)
@@ -332,7 +432,7 @@ int brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
         sdiodev->sbwad = SI_ENUM_BASE;
 
         /* try to attach to the target device */
-        sdiodev->bus = brcmf_sdbrcm_probe(0, 0, 0, 0, regs, sdiodev);
+        sdiodev->bus = brcmf_sdbrcm_probe(regs, sdiodev);
         if (!sdiodev->bus) {
                 brcmf_dbg(ERROR, "device attach failed\n");
                 ret = -ENODEV;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index bbaeb2d5c93a..b895f198a950 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -40,6 +40,7 @@
 #define DMA_ALIGN_MASK  0x03
 
 #define SDIO_DEVICE_ID_BROADCOM_4329    0x4329
+#define SDIO_DEVICE_ID_BROADCOM_4330    0x4330
 
 #define SDIO_FUNC1_BLOCKSIZE            64
 #define SDIO_FUNC2_BLOCKSIZE            512
@@ -47,6 +48,7 @@
 /* devices we support, null terminated */
 static const struct sdio_device_id brcmf_sdmmc_ids[] = {
         {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329)},
+        {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4330)},
         { /* end: all zeroes */ },
 };
 MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);
@@ -204,62 +206,75 @@ int brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev,
         return err_ret;
 }
 
+/* precondition: host controller is claimed */
 static int
-brcmf_sdioh_request_packet(struct brcmf_sdio_dev *sdiodev, uint fix_inc,
-                           uint write, uint func, uint addr,
-                           struct sk_buff *pkt)
+brcmf_sdioh_request_data(struct brcmf_sdio_dev *sdiodev, uint write, bool fifo,
+                         uint func, uint addr, struct sk_buff *pkt, uint pktlen)
+{
+        int err_ret = 0;
+
+        if ((write) && (!fifo)) {
+                err_ret = sdio_memcpy_toio(sdiodev->func[func], addr,
+                                           ((u8 *) (pkt->data)), pktlen);
+        } else if (write) {
+                err_ret = sdio_memcpy_toio(sdiodev->func[func], addr,
+                                           ((u8 *) (pkt->data)), pktlen);
+        } else if (fifo) {
+                err_ret = sdio_readsb(sdiodev->func[func],
+                                      ((u8 *) (pkt->data)), addr, pktlen);
+        } else {
+                err_ret = sdio_memcpy_fromio(sdiodev->func[func],
+                                             ((u8 *) (pkt->data)),
+                                             addr, pktlen);
+        }
+
+        return err_ret;
+}
+
+/*
+ * This function takes a queue of packets. The packets on the queue
+ * are assumed to be properly aligned by the caller.
+ */
+int
+brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc,
+                          uint write, uint func, uint addr,
+                          struct sk_buff_head *pktq)
 {
         bool fifo = (fix_inc == SDIOH_DATA_FIX);
         u32 SGCount = 0;
         int err_ret = 0;
 
-        struct sk_buff *pnext;
+        struct sk_buff *pkt;
 
         brcmf_dbg(TRACE, "Enter\n");
 
-        brcmf_pm_resume_wait(sdiodev, &sdiodev->request_packet_wait);
+        brcmf_pm_resume_wait(sdiodev, &sdiodev->request_chain_wait);
         if (brcmf_pm_resume_error(sdiodev))
                 return -EIO;
 
         /* Claim host controller */
         sdio_claim_host(sdiodev->func[func]);
-        for (pnext = pkt; pnext; pnext = pnext->next) {
-                uint pkt_len = pnext->len;
+
+        skb_queue_walk(pktq, pkt) {
+                uint pkt_len = pkt->len;
                 pkt_len += 3;
                 pkt_len &= 0xFFFFFFFC;
 
-                if ((write) && (!fifo)) {
-                        err_ret = sdio_memcpy_toio(sdiodev->func[func], addr,
-                                                   ((u8 *) (pnext->data)),
-                                                   pkt_len);
-                } else if (write) {
-                        err_ret = sdio_memcpy_toio(sdiodev->func[func], addr,
-                                                   ((u8 *) (pnext->data)),
-                                                   pkt_len);
-                } else if (fifo) {
-                        err_ret = sdio_readsb(sdiodev->func[func],
-                                              ((u8 *) (pnext->data)),
-                                              addr, pkt_len);
-                } else {
-                        err_ret = sdio_memcpy_fromio(sdiodev->func[func],
-                                                     ((u8 *) (pnext->data)),
-                                                     addr, pkt_len);
-                }
-
+                err_ret = brcmf_sdioh_request_data(sdiodev, write, fifo, func,
+                                                   addr, pkt, pkt_len);
                 if (err_ret) {
                         brcmf_dbg(ERROR, "%s FAILED %p[%d], addr=0x%05x, pkt_len=%d, ERR=0x%08x\n",
-                                  write ? "TX" : "RX", pnext, SGCount, addr,
+                                  write ? "TX" : "RX", pkt, SGCount, addr,
                                   pkt_len, err_ret);
                 } else {
                         brcmf_dbg(TRACE, "%s xfr'd %p[%d], addr=0x%05x, len=%d\n",
-                                  write ? "TX" : "RX", pnext, SGCount, addr,
+                                  write ? "TX" : "RX", pkt, SGCount, addr,
                                   pkt_len);
                 }
-
                 if (!fifo)
                         addr += pkt_len;
-                SGCount++;
 
+                SGCount++;
         }
 
         /* Release host controller */
@@ -270,91 +285,45 @@ brcmf_sdioh_request_packet(struct brcmf_sdio_dev *sdiodev, uint fix_inc,
 }
 
 /*
- * This function takes a buffer or packet, and fixes everything up
- * so that in the end, a DMA-able packet is created.
- *
- * A buffer does not have an associated packet pointer,
- * and may or may not be aligned.
- * A packet may consist of a single packet, or a packet chain.
- * If it is a packet chain, then all the packets in the chain
- * must be properly aligned.
- *
- * If the packet data is not aligned, then there may only be
- * one packet, and in this case,  it is copied to a new
- * aligned packet.
- *
+ * This function takes a single DMA-able packet.
  */
 int brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev,
                                uint fix_inc, uint write, uint func, uint addr,
-                               uint reg_width, uint buflen_u, u8 *buffer,
                                struct sk_buff *pkt)
 {
-        int Status;
-        struct sk_buff *mypkt = NULL;
+        int status;
+        uint pkt_len = pkt->len;
+        bool fifo = (fix_inc == SDIOH_DATA_FIX);
 
         brcmf_dbg(TRACE, "Enter\n");
 
+        if (pkt == NULL)
+                return -EINVAL;
+
         brcmf_pm_resume_wait(sdiodev, &sdiodev->request_buffer_wait);
         if (brcmf_pm_resume_error(sdiodev))
                 return -EIO;
-        /* Case 1: we don't have a packet. */
-        if (pkt == NULL) {
-                brcmf_dbg(DATA, "Creating new %s Packet, len=%d\n",
-                          write ? "TX" : "RX", buflen_u);
-                mypkt = brcmu_pkt_buf_get_skb(buflen_u);
-                if (!mypkt) {
-                        brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n",
-                                  buflen_u);
-                        return -EIO;
-                }
-
-                /* For a write, copy the buffer data into the packet. */
-                if (write)
-                        memcpy(mypkt->data, buffer, buflen_u);
-
-                Status = brcmf_sdioh_request_packet(sdiodev, fix_inc, write,
-                                                    func, addr, mypkt);
-
-                /* For a read, copy the packet data back to the buffer. */
-                if (!write)
-                        memcpy(buffer, mypkt->data, buflen_u);
-
-                brcmu_pkt_buf_free_skb(mypkt);
-        } else if (((ulong) (pkt->data) & DMA_ALIGN_MASK) != 0) {
-                /*
-                 * Case 2: We have a packet, but it is unaligned.
-                 * In this case, we cannot have a chain (pkt->next == NULL)
-                 */
-                brcmf_dbg(DATA, "Creating aligned %s Packet, len=%d\n",
-                          write ? "TX" : "RX", pkt->len);
-                mypkt = brcmu_pkt_buf_get_skb(pkt->len);
-                if (!mypkt) {
-                        brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n",
-                                  pkt->len);
-                        return -EIO;
-                }
 
-                /* For a write, copy the buffer data into the packet. */
-                if (write)
-                        memcpy(mypkt->data, pkt->data, pkt->len);
-
-                Status = brcmf_sdioh_request_packet(sdiodev, fix_inc, write,
-                                                    func, addr, mypkt);
+        /* Claim host controller */
+        sdio_claim_host(sdiodev->func[func]);
 
-                /* For a read, copy the packet data back to the buffer. */
-                if (!write)
-                        memcpy(pkt->data, mypkt->data, mypkt->len);
+        pkt_len += 3;
+        pkt_len &= (uint)~3;
 
-                brcmu_pkt_buf_free_skb(mypkt);
-        } else {                /* case 3: We have a packet and
-                                 it is aligned. */
-                brcmf_dbg(DATA, "Aligned %s Packet, direct DMA\n",
-                          write ? "Tx" : "Rx");
-                Status = brcmf_sdioh_request_packet(sdiodev, fix_inc, write,
-                                                    func, addr, pkt);
+        status = brcmf_sdioh_request_data(sdiodev, write, fifo, func,
+                                           addr, pkt, pkt_len);
+        if (status) {
+                brcmf_dbg(ERROR, "%s FAILED %p, addr=0x%05x, pkt_len=%d, ERR=0x%08x\n",
+                          write ? "TX" : "RX", pkt, addr, pkt_len, status);
+        } else {
+                brcmf_dbg(TRACE, "%s xfr'd %p, addr=0x%05x, len=%d\n",
+                          write ? "TX" : "RX", pkt, addr, pkt_len);
         }
 
-        return Status;
+        /* Release host controller */
+        sdio_release_host(sdiodev->func[func]);
+
+        return status;
 }
 
 /* Read client card reg */
@@ -494,6 +463,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
 {
         int ret = 0;
         struct brcmf_sdio_dev *sdiodev;
+        struct brcmf_bus *bus_if;
         brcmf_dbg(TRACE, "Enter\n");
         brcmf_dbg(TRACE, "func->class=%x\n", func->class);
         brcmf_dbg(TRACE, "sdio_vendor: 0x%04x\n", func->vendor);
@@ -505,17 +475,25 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
                         brcmf_dbg(ERROR, "card private drvdata occupied\n");
                         return -ENXIO;
                 }
+                bus_if = kzalloc(sizeof(struct brcmf_bus), GFP_KERNEL);
+                if (!bus_if)
+                        return -ENOMEM;
                 sdiodev = kzalloc(sizeof(struct brcmf_sdio_dev), GFP_KERNEL);
-                if (!sdiodev)
+                if (!sdiodev) {
+                        kfree(bus_if);
                         return -ENOMEM;
+                }
                 sdiodev->func[0] = func->card->sdio_func[0];
                 sdiodev->func[1] = func;
+                sdiodev->bus_if = bus_if;
+                bus_if->bus_priv = sdiodev;
+                bus_if->type = SDIO_BUS;
                 dev_set_drvdata(&func->card->dev, sdiodev);
 
                 atomic_set(&sdiodev->suspend, false);
                 init_waitqueue_head(&sdiodev->request_byte_wait);
                 init_waitqueue_head(&sdiodev->request_word_wait);
-                init_waitqueue_head(&sdiodev->request_packet_wait);
+                init_waitqueue_head(&sdiodev->request_chain_wait);
                 init_waitqueue_head(&sdiodev->request_buffer_wait);
         }
 
@@ -525,6 +503,10 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
                         return -ENODEV;
                 sdiodev->func[2] = func;
 
+                bus_if = sdiodev->bus_if;
+                sdiodev->dev = &func->dev;
+                dev_set_drvdata(&func->dev, bus_if);
+
                 brcmf_dbg(TRACE, "F2 found, calling brcmf_sdio_probe...\n");
                 ret = brcmf_sdio_probe(sdiodev);
         }
@@ -534,6 +516,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
 
 static void brcmf_ops_sdio_remove(struct sdio_func *func)
 {
+        struct brcmf_bus *bus_if;
         struct brcmf_sdio_dev *sdiodev;
         brcmf_dbg(TRACE, "Enter\n");
         brcmf_dbg(INFO, "func->class=%x\n", func->class);
@@ -542,10 +525,13 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func)
         brcmf_dbg(INFO, "Function#: 0x%04x\n", func->num);
 
         if (func->num == 2) {
-                sdiodev = dev_get_drvdata(&func->card->dev);
+                bus_if = dev_get_drvdata(&func->dev);
+                sdiodev = bus_if->bus_priv;
                 brcmf_dbg(TRACE, "F2 found, calling brcmf_sdio_remove...\n");
                 brcmf_sdio_remove(sdiodev);
                 dev_set_drvdata(&func->card->dev, NULL);
+                dev_set_drvdata(&func->dev, NULL);
+                kfree(bus_if);
                 kfree(sdiodev);
         }
 }
@@ -554,14 +540,12 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func)
 static int brcmf_sdio_suspend(struct device *dev)
 {
         mmc_pm_flag_t sdio_flags;
-        struct brcmf_sdio_dev *sdiodev;
         struct sdio_func *func = dev_to_sdio_func(dev);
+        struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&func->card->dev);
         int ret = 0;
 
         brcmf_dbg(TRACE, "\n");
 
-        sdiodev = dev_get_drvdata(&func->card->dev);
-
         atomic_set(&sdiodev->suspend, true);
 
         sdio_flags = sdio_get_host_pm_caps(sdiodev->func[1]);
@@ -583,10 +567,9 @@ static int brcmf_sdio_suspend(struct device *dev)
 
 static int brcmf_sdio_resume(struct device *dev)
 {
-        struct brcmf_sdio_dev *sdiodev;
         struct sdio_func *func = dev_to_sdio_func(dev);
+        struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&func->card->dev);
 
-        sdiodev = dev_get_drvdata(&func->card->dev);
         brcmf_sdio_wdtmr_enable(sdiodev, true);
         atomic_set(&sdiodev->suspend, false);
         return 0;
@@ -610,17 +593,26 @@ static struct sdio_driver brcmf_sdmmc_driver = {
 #endif  /* CONFIG_PM_SLEEP */
 };
 
-/* bus register interface */
-int brcmf_bus_register(void)
+static void __exit brcmf_sdio_exit(void)
 {
         brcmf_dbg(TRACE, "Enter\n");
 
-        return sdio_register_driver(&brcmf_sdmmc_driver);
+        sdio_unregister_driver(&brcmf_sdmmc_driver);
 }
 
-void brcmf_bus_unregister(void)
+static int __init brcmf_sdio_init(void)
 {
+        int ret;
+
         brcmf_dbg(TRACE, "Enter\n");
 
-        sdio_unregister_driver(&brcmf_sdmmc_driver);
+        ret = sdio_register_driver(&brcmf_sdmmc_driver);
+
+        if (ret)
+                brcmf_dbg(ERROR, "sdio_register_driver failed: %d\n", ret);
+
+        return ret;
 }
+
+module_init(brcmf_sdio_init);
+module_exit(brcmf_sdio_exit);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index 6da519e7578f..ed60f4d69627 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -87,7 +87,7 @@
 #define TOE_TX_CSUM_OL          0x00000001
 #define TOE_RX_CSUM_OL          0x00000002
 
-#define BRCMF_BSS_INFO_VERSION  108 /* curr ver of brcmf_bss_info_le struct */
+#define BRCMF_BSS_INFO_VERSION  109 /* curr ver of brcmf_bss_info_le struct */
 
 /* size of brcmf_scan_params not including variable length array */
 #define BRCMF_SCAN_PARAMS_FIXED_SIZE 64
@@ -571,8 +571,14 @@ struct brcmf_dcmd {
         uint needed;            /* bytes needed (optional) */
 };
 
+struct brcmf_bus {
+        u8 type;                /* bus type */
+        void *bus_priv;         /* pointer to bus private structure */
+        enum brcmf_bus_state state;
+};
+
 /* Forward decls for struct brcmf_pub (see below) */
-struct brcmf_bus;               /* device bus info */
+struct brcmf_sdio;              /* device bus info */
 struct brcmf_proto;     /* device communication protocol info */
 struct brcmf_info;      /* device driver info */
 struct brcmf_cfg80211_dev; /* cfg80211 device info */
@@ -580,15 +586,16 @@ struct brcmf_cfg80211_dev; /* cfg80211 device info */
 /* Common structure for module and instance linkage */
 struct brcmf_pub {
         /* Linkage ponters */
-        struct brcmf_bus *bus;
+        struct brcmf_sdio *bus;
+        struct brcmf_bus *bus_if;
         struct brcmf_proto *prot;
         struct brcmf_info *info;
         struct brcmf_cfg80211_dev *config;
+        struct device *dev;             /* fullmac dongle device pointer */
 
         /* Internal brcmf items */
         bool up;                /* Driver up/down (to OS) */
         bool txoff;             /* Transmit flow-controlled */
-        enum brcmf_bus_state busstate;
         uint hdrlen;            /* Total BRCMF header length (proto + bus) */
         uint maxctl;            /* Max size rxctl request from proto to bus */
         uint rxsz;              /* Rx buffer size bus module should use */
@@ -656,7 +663,6 @@ struct brcmf_pub {
 
         u8 country_code[BRCM_CNTRY_BUF_SZ];
         char eventmask[BRCMF_EVENTING_MASK_LEN];
-
 };
 
 struct brcmf_if_event {
@@ -681,8 +687,8 @@ extern uint brcmf_c_mkiovar(char *name, char *data, uint datalen,
  * Returned structure should have bus and prot pointers filled in.
  * bus_hdrlen specifies required headroom for bus module header.
  */
-extern struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus,
-                                      uint bus_hdrlen);
+extern struct brcmf_pub *brcmf_attach(struct brcmf_sdio *bus,
+                                      uint bus_hdrlen, struct device *dev);
 extern int brcmf_net_attach(struct brcmf_pub *drvr, int idx);
 extern int brcmf_netdev_wait_pend8021x(struct net_device *ndev);
 
@@ -699,7 +705,16 @@ extern bool brcmf_c_prec_enq(struct brcmf_pub *drvr, struct pktq *q,
 
 /* Receive frame for delivery to OS.  Callee disposes of rxp. */
 extern void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx,
-                         struct sk_buff *rxp, int numpkt);
+                           struct sk_buff_head *rxlist);
+static inline void brcmf_rx_packet(struct brcmf_pub *drvr, int ifidx,
+                                   struct sk_buff *pkt)
+{
+        struct sk_buff_head q;
+
+        skb_queue_head_init(&q);
+        skb_queue_tail(&q, pkt);
+        brcmf_rx_frame(drvr, ifidx, &q);
+}
 
 /* Return pointer to interface name */
 extern char *brcmf_ifname(struct brcmf_pub *drvr, int idx);
@@ -724,8 +739,6 @@ extern int brcmf_c_host_event(struct brcmf_info *drvr_priv, int *idx,
                               void *pktdata, struct brcmf_event_msg *,
                               void **data_ptr);
 
-extern void brcmf_c_init(void);
-
 extern int brcmf_add_if(struct brcmf_info *drvr_priv, int ifidx,
                         char *name, u8 *mac_addr);
 extern void brcmf_del_if(struct brcmf_info *drvr_priv, int ifidx);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
index a249407c9a1b..1841f996110b 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
@@ -27,31 +27,24 @@
  * Exported from brcmf bus module (brcmf_usb, brcmf_sdio)
  */
 
-/* Indicate (dis)interest in finding dongles. */
-extern int brcmf_bus_register(void);
-extern void brcmf_bus_unregister(void);
-
-/* obtain linux device object providing bus function */
-extern struct device *brcmf_bus_get_device(struct brcmf_bus *bus);
-
 /* Stop bus module: clear pending frames, disable data flow */
-extern void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus);
+extern void brcmf_sdbrcm_bus_stop(struct device *dev);
 
 /* Initialize bus module: prepare for communication w/dongle */
-extern int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr);
+extern int brcmf_sdbrcm_bus_init(struct device *dev);
 
 /* Send a data frame to the dongle.  Callee disposes of txp. */
-extern int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *txp);
+extern int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *txp);
 
 /* Send/receive a control message to/from the dongle.
  * Expects caller to enforce a single outstanding transaction.
  */
 extern int
-brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen);
+brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen);
 
 extern int
-brcmf_sdbrcm_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen);
+brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen);
 
-extern void brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick);
+extern void brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick);
 
 #endif                          /* _BRCMF_BUS_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
index e34c5c3d1d55..ebd53aa7202b 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
@@ -58,7 +58,7 @@ struct brcmf_proto_cdc_dcmd {
  * Used on data packets to convey priority across USB.
  */
 #define BDC_HEADER_LEN          4
-#define BDC_PROTO_VER           1       /* Protocol version */
+#define BDC_PROTO_VER           2       /* Protocol version */
 #define BDC_FLAG_VER_MASK       0xf0    /* Protocol version mask */
 #define BDC_FLAG_VER_SHIFT      4       /* Protocol version shift */
 #define BDC_FLAG_SUM_GOOD       0x04    /* Good RX checksums */
@@ -77,7 +77,7 @@ struct brcmf_proto_bdc_header {
         u8 flags;
         u8 priority;    /* 802.1d Priority, 4:7 flow control info for usb */
         u8 flags2;
-        u8 rssi;
+        u8 data_offset;
 };
 
 
@@ -116,7 +116,7 @@ static int brcmf_proto_cdc_msg(struct brcmf_pub *drvr)
                 len = CDC_MAX_MSG_SIZE;
 
         /* Send request */
-        return brcmf_sdbrcm_bus_txctl(drvr->bus, (unsigned char *)&prot->msg,
+        return brcmf_sdbrcm_bus_txctl(drvr->dev, (unsigned char *)&prot->msg,
                                       len);
 }
 
@@ -128,7 +128,7 @@ static int brcmf_proto_cdc_cmplt(struct brcmf_pub *drvr, u32 id, u32 len)
         brcmf_dbg(TRACE, "Enter\n");
 
         do {
-                ret = brcmf_sdbrcm_bus_rxctl(drvr->bus,
+                ret = brcmf_sdbrcm_bus_rxctl(drvr->dev,
                                 (unsigned char *)&prot->msg,
                                 len + sizeof(struct brcmf_proto_cdc_dcmd));
                 if (ret < 0)
@@ -280,7 +280,7 @@ brcmf_proto_dcmd(struct brcmf_pub *drvr, int ifidx, struct brcmf_dcmd *dcmd,
         struct brcmf_proto *prot = drvr->prot;
         int ret = -1;
 
-        if (drvr->busstate == BRCMF_BUS_DOWN) {
+        if (drvr->bus_if->state == BRCMF_BUS_DOWN) {
                 brcmf_dbg(ERROR, "bus is down. we have nothing to do.\n");
                 return ret;
         }
@@ -372,7 +372,7 @@ void brcmf_proto_hdrpush(struct brcmf_pub *drvr, int ifidx,
 
         h->priority = (pktbuf->priority & BDC_PRIORITY_MASK);
         h->flags2 = 0;
-        h->rssi = 0;
+        h->data_offset = 0;
         BDC_SET_IF_IDX(h, ifidx);
 }
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index 40928e58b6a6..69f335aeb255 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -32,8 +32,6 @@
 #define PKTFILTER_BUF_SIZE              2048
 #define BRCMF_ARPOL_MODE                0xb     /* agent|snoop|peer_autoreply */
 
-int brcmf_msg_level;
-
 #define MSGTRACE_VERSION        1
 
 #define BRCMF_PKT_FILTER_FIXED_LEN      offsetof(struct brcmf_pkt_filter_le, u)
@@ -85,19 +83,6 @@ brcmf_c_mkiovar(char *name, char *data, uint datalen, char *buf, uint buflen)
         return len;
 }
 
-void brcmf_c_init(void)
-{
-        /* Init global variables at run-time, not as part of the declaration.
-         * This is required to support init/de-init of the driver.
-         * Initialization
-         * of globals as part of the declaration results in non-deterministic
-         * behaviour since the value of the globals may be different on the
-         * first time that the driver is initialized vs subsequent
-         * initializations.
-         */
-        brcmf_msg_level = BRCMF_ERROR_VAL;
-}
-
 bool brcmf_c_prec_enq(struct brcmf_pub *drvr, struct pktq *q,
                       struct sk_buff *pkt, int prec)
 {
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 719fd9397eb6..58d92bca9ca2 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -43,7 +43,6 @@
 #include "dhd_proto.h"
 #include "dhd_dbg.h"
 #include "wl_cfg80211.h"
-#include "bcmchip.h"
 
 MODULE_AUTHOR("Broadcom Corporation");
 MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN fullmac driver.");
@@ -77,6 +76,7 @@ struct brcmf_info {
 };
 
 /* Error bits */
+int brcmf_msg_level = BRCMF_ERROR_VAL;
 module_param(brcmf_msg_level, int, 0);
 
 int brcmf_ifname2idx(struct brcmf_info *drvr_priv, char *name)
@@ -292,7 +292,7 @@ int brcmf_sendpkt(struct brcmf_pub *drvr, int ifidx, struct sk_buff *pktbuf)
         struct brcmf_info *drvr_priv = drvr->info;
 
         /* Reject if down */
-        if (!drvr->up || (drvr->busstate == BRCMF_BUS_DOWN))
+        if (!drvr->up || (drvr->bus_if->state == BRCMF_BUS_DOWN))
                 return -ENODEV;
 
         /* Update multicast statistic */
@@ -310,7 +310,7 @@ int brcmf_sendpkt(struct brcmf_pub *drvr, int ifidx, struct sk_buff *pktbuf)
         brcmf_proto_hdrpush(drvr, ifidx, pktbuf);
 
         /* Use bus module to send data frame */
-        return brcmf_sdbrcm_bus_txdata(drvr->bus, pktbuf);
+        return brcmf_sdbrcm_bus_txdata(drvr->dev, pktbuf);
 }
 
 static int brcmf_netdev_start_xmit(struct sk_buff *skb, struct net_device *ndev)
@@ -322,9 +322,11 @@ static int brcmf_netdev_start_xmit(struct sk_buff *skb, struct net_device *ndev)
         brcmf_dbg(TRACE, "Enter\n");
 
         /* Reject if down */
-        if (!drvr_priv->pub.up || (drvr_priv->pub.busstate == BRCMF_BUS_DOWN)) {
-                brcmf_dbg(ERROR, "xmit rejected pub.up=%d busstate=%d\n",
-                          drvr_priv->pub.up, drvr_priv->pub.busstate);
+        if (!drvr_priv->pub.up ||
+            (drvr_priv->pub.bus_if->state == BRCMF_BUS_DOWN)) {
+                brcmf_dbg(ERROR, "xmit rejected pub.up=%d state=%d\n",
+                          drvr_priv->pub.up,
+                          drvr_priv->pub.bus_if->state);
                 netif_stop_queue(ndev);
                 return -ENODEV;
         }
@@ -397,26 +399,21 @@ static int brcmf_host_event(struct brcmf_info *drvr_priv, int *ifidx,
         return bcmerror;
 }
 
-void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx, struct sk_buff *skb,
-                  int numpkt)
+void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx,
+                    struct sk_buff_head *skb_list)
 {
         struct brcmf_info *drvr_priv = drvr->info;
         unsigned char *eth;
         uint len;
         void *data;
-        struct sk_buff *pnext, *save_pktbuf;
-        int i;
+        struct sk_buff *skb, *pnext;
         struct brcmf_if *ifp;
         struct brcmf_event_msg event;
 
         brcmf_dbg(TRACE, "Enter\n");
 
-        save_pktbuf = skb;
-
-        for (i = 0; skb && i < numpkt; i++, skb = pnext) {
-
-                pnext = skb->next;
-                skb->next = NULL;
+        skb_queue_walk_safe(skb_list, skb, pnext) {
+                skb_unlink(skb, skb_list);
 
                 /* Get the protocol, maintain skb around eth_type_trans()
                  * The main reason for this hack is for the limitation of
@@ -437,6 +434,12 @@ void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx, struct sk_buff *skb,
                 if (ifp == NULL)
                         ifp = drvr_priv->iflist[0];
 
+                if (!ifp || !ifp->ndev ||
+                    ifp->ndev->reg_state != NETREG_REGISTERED) {
+                        brcmu_pkt_buf_free_skb(skb);
+                        continue;
+                }
+
                 skb->dev = ifp->ndev;
                 skb->protocol = eth_type_trans(skb, skb->dev);
 
@@ -605,9 +608,7 @@ static void brcmf_ethtool_get_drvinfo(struct net_device *ndev,
 
         sprintf(info->driver, KBUILD_MODNAME);
         sprintf(info->version, "%lu", drvr_priv->pub.drv_version);
-        sprintf(info->fw_version, "%s", BCM4329_FW_NAME);
-        sprintf(info->bus_info, "%s",
-                dev_name(brcmf_bus_get_device(drvr_priv->pub.bus)));
+        sprintf(info->bus_info, "%s", dev_name(drvr_priv->pub.dev));
 }
 
 static struct ethtool_ops brcmf_ethtool_ops = {
@@ -761,7 +762,7 @@ s32 brcmf_exec_dcmd(struct net_device *ndev, u32 cmd, void *arg, u32 len)
                 buflen = min_t(uint, dcmd.len, BRCMF_DCMD_MAXLEN);
 
         /* send to dongle (must be up, and wl) */
-        if ((drvr_priv->pub.busstate != BRCMF_BUS_DATA)) {
+        if ((drvr_priv->pub.bus_if->state != BRCMF_BUS_DATA)) {
                 brcmf_dbg(ERROR, "DONGLE_DOWN\n");
                 err = -EIO;
                 goto done;
@@ -940,7 +941,8 @@ void brcmf_del_if(struct brcmf_info *drvr_priv, int ifidx)
         }
 }
 
-struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen)
+struct brcmf_pub *brcmf_attach(struct brcmf_sdio *bus, uint bus_hdrlen,
+                               struct device *dev)
 {
         struct brcmf_info *drvr_priv = NULL;
 
@@ -959,6 +961,8 @@ struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen)
         /* Link to bus module */
         drvr_priv->pub.bus = bus;
         drvr_priv->pub.hdrlen = bus_hdrlen;
+        drvr_priv->pub.bus_if = dev_get_drvdata(dev);
+        drvr_priv->pub.dev = dev;
 
         /* Attach and link in the protocol */
         if (brcmf_proto_attach(&drvr_priv->pub) != 0) {
@@ -988,14 +992,14 @@ int brcmf_bus_start(struct brcmf_pub *drvr)
         brcmf_dbg(TRACE, "\n");
 
         /* Bring up the bus */
-        ret = brcmf_sdbrcm_bus_init(&drvr_priv->pub);
+        ret = brcmf_sdbrcm_bus_init(drvr_priv->pub.dev);
         if (ret != 0) {
                 brcmf_dbg(ERROR, "brcmf_sdbrcm_bus_init failed %d\n", ret);
                 return ret;
         }
 
         /* If bus is not ready, can't come up */
-        if (drvr_priv->pub.busstate != BRCMF_BUS_DATA) {
+        if (drvr_priv->pub.bus_if->state != BRCMF_BUS_DATA) {
                 brcmf_dbg(ERROR, "failed bus is not ready\n");
                 return -ENODEV;
         }
@@ -1077,10 +1081,7 @@ int brcmf_net_attach(struct brcmf_pub *drvr, int ifidx)
 
         /* attach to cfg80211 for primary interface */
         if (!ifidx) {
-                drvr->config =
-                        brcmf_cfg80211_attach(ndev,
-                                              brcmf_bus_get_device(drvr->bus),
-                                              drvr);
+                drvr->config = brcmf_cfg80211_attach(ndev, drvr->dev, drvr);
                 if (drvr->config == NULL) {
                         brcmf_dbg(ERROR, "wl_cfg80211_attach failed\n");
                         goto fail;
@@ -1114,7 +1115,7 @@ static void brcmf_bus_detach(struct brcmf_pub *drvr)
                         brcmf_proto_stop(&drvr_priv->pub);
 
                         /* Stop the bus module */
-                        brcmf_sdbrcm_bus_stop(drvr_priv->pub.bus);
+                        brcmf_sdbrcm_bus_stop(drvr_priv->pub.dev);
                 }
         }
 }
@@ -1148,34 +1149,6 @@ void brcmf_detach(struct brcmf_pub *drvr)
         }
 }
 
-static void __exit brcmf_module_cleanup(void)
-{
-        brcmf_dbg(TRACE, "Enter\n");
-
-        brcmf_bus_unregister();
-}
-
-static int __init brcmf_module_init(void)
-{
-        int error;
-
-        brcmf_dbg(TRACE, "Enter\n");
-
-        error = brcmf_bus_register();
-
-        if (error) {
-                brcmf_dbg(ERROR, "brcmf_bus_register failed\n");
-                goto failed;
-        }
-        return 0;
-
-failed:
-        return -EINVAL;
-}
-
-module_init(brcmf_module_init);
-module_exit(brcmf_module_cleanup);
-
 int brcmf_os_proto_block(struct brcmf_pub *drvr)
 {
         struct brcmf_info *drvr_priv = drvr->info;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 22913af26db8..43ba0dd48354 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -91,7 +91,6 @@ struct rte_console {
 #include "dhd_bus.h"
 #include "dhd_proto.h"
 #include "dhd_dbg.h"
-#include <bcmchip.h>
 
 #define TXQLEN          2048    /* bulk tx queue length */
 #define TXHI            (TXQLEN - 256)  /* turn on flow control above TXHI */
@@ -310,6 +309,11 @@ struct rte_console {
 /* Flags for SDH calls */
 #define F2SYNC  (SDIO_REQ_4BYTE | SDIO_REQ_FIXED)
 
+#define BRCMFMAC_FW_NAME        "brcm/brcmfmac.bin"
+#define BRCMFMAC_NV_NAME        "brcm/brcmfmac.txt"
+MODULE_FIRMWARE(BRCMFMAC_FW_NAME);
+MODULE_FIRMWARE(BRCMFMAC_NV_NAME);
+
 /*
  * Conversion of 802.1D priority to precedence level
  */
@@ -445,7 +449,7 @@ struct sdpcm_shared_le {
 
 /* misc chip info needed by some of the routines */
 /* Private data for SDIO bus interaction */
-struct brcmf_bus {
+struct brcmf_sdio {
         struct brcmf_pub *drvr;
 
         struct brcmf_sdio_dev *sdiodev; /* sdio device handler */
@@ -562,9 +566,7 @@ struct brcmf_bus {
 
         struct semaphore sdsem;
 
-        const char *fw_name;
         const struct firmware *firmware;
-        const char *nv_name;
         u32 fw_ptr;
 };
 
@@ -602,7 +604,7 @@ static void pkt_align(struct sk_buff *p, int len, int align)
 }
 
 /* To check if there's window offered */
-static bool data_ok(struct brcmf_bus *bus)
+static bool data_ok(struct brcmf_sdio *bus)
 {
         return (u8)(bus->tx_max - bus->tx_seq) != 0 &&
                ((u8)(bus->tx_max - bus->tx_seq) & 0x80) == 0;
@@ -613,7 +615,7 @@ static bool data_ok(struct brcmf_bus *bus)
  * adresses on the 32 bit backplane bus.
  */
 static void
-r_sdreg32(struct brcmf_bus *bus, u32 *regvar, u32 reg_offset, u32 *retryvar)
+r_sdreg32(struct brcmf_sdio *bus, u32 *regvar, u32 reg_offset, u32 *retryvar)
 {
         u8 idx = brcmf_sdio_chip_getinfidx(bus->ci, BCMA_CORE_SDIO_DEV);
         *retryvar = 0;
@@ -633,7 +635,7 @@ r_sdreg32(struct brcmf_bus *bus, u32 *regvar, u32 reg_offset, u32 *retryvar)
 }
 
 static void
-w_sdreg32(struct brcmf_bus *bus, u32 regval, u32 reg_offset, u32 *retryvar)
+w_sdreg32(struct brcmf_sdio *bus, u32 regval, u32 reg_offset, u32 *retryvar)
 {
         u8 idx = brcmf_sdio_chip_getinfidx(bus->ci, BCMA_CORE_SDIO_DEV);
         *retryvar = 0;
@@ -658,14 +660,14 @@ w_sdreg32(struct brcmf_bus *bus, u32 regval, u32 reg_offset, u32 *retryvar)
 /* Packet free applicable unconditionally for sdio and sdspi.
  * Conditional if bufpool was present for gspi bus.
  */
-static void brcmf_sdbrcm_pktfree2(struct brcmf_bus *bus, struct sk_buff *pkt)
+static void brcmf_sdbrcm_pktfree2(struct brcmf_sdio *bus, struct sk_buff *pkt)
 {
         if (bus->usebufpool)
                 brcmu_pkt_buf_free_skb(pkt);
 }
 
 /* Turn backplane clock on or off */
-static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)
+static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok)
 {
         int err;
         u8 clkctl, clkreq, devctl;
@@ -786,7 +788,7 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)
 }
 
 /* Change idle/active SD state */
-static int brcmf_sdbrcm_sdclk(struct brcmf_bus *bus, bool on)
+static int brcmf_sdbrcm_sdclk(struct brcmf_sdio *bus, bool on)
 {
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -799,7 +801,7 @@ static int brcmf_sdbrcm_sdclk(struct brcmf_bus *bus, bool on)
 }
 
 /* Transition SD and backplane clock readiness */
-static int brcmf_sdbrcm_clkctl(struct brcmf_bus *bus, uint target, bool pendok)
+static int brcmf_sdbrcm_clkctl(struct brcmf_sdio *bus, uint target, bool pendok)
 {
 #ifdef BCMDBG
         uint oldstate = bus->clkstate;
@@ -855,7 +857,7 @@ static int brcmf_sdbrcm_clkctl(struct brcmf_bus *bus, uint target, bool pendok)
         return 0;
 }
 
-static int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep)
+static int brcmf_sdbrcm_bussleep(struct brcmf_sdio *bus, bool sleep)
 {
         uint retries = 0;
 
@@ -927,13 +929,13 @@ static int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep)
         return 0;
 }
 
-static void bus_wake(struct brcmf_bus *bus)
+static void bus_wake(struct brcmf_sdio *bus)
 {
         if (bus->sleeping)
                 brcmf_sdbrcm_bussleep(bus, false);
 }
 
-static u32 brcmf_sdbrcm_hostmail(struct brcmf_bus *bus)
+static u32 brcmf_sdbrcm_hostmail(struct brcmf_sdio *bus)
 {
         u32 intstatus = 0;
         u32 hmb_data;
@@ -1009,7 +1011,7 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_bus *bus)
         return intstatus;
 }
 
-static void brcmf_sdbrcm_rxfail(struct brcmf_bus *bus, bool abort, bool rtx)
+static void brcmf_sdbrcm_rxfail(struct brcmf_sdio *bus, bool abort, bool rtx)
 {
         uint retries = 0;
         u16 lastrbc;
@@ -1066,11 +1068,11 @@ static void brcmf_sdbrcm_rxfail(struct brcmf_bus *bus, bool abort, bool rtx)
 
         /* If we can't reach the device, signal failure */
         if (err || brcmf_sdcard_regfail(bus->sdiodev))
-                bus->drvr->busstate = BRCMF_BUS_DOWN;
+                bus->drvr->bus_if->state = BRCMF_BUS_DOWN;
 }
 
 /* copy a buffer into a pkt buffer chain */
-static uint brcmf_sdbrcm_glom_from_buf(struct brcmf_bus *bus, uint len)
+static uint brcmf_sdbrcm_glom_from_buf(struct brcmf_sdio *bus, uint len)
 {
         uint n, ret = 0;
         struct sk_buff *p;
@@ -1093,7 +1095,7 @@ static uint brcmf_sdbrcm_glom_from_buf(struct brcmf_bus *bus, uint len)
 }
 
 /* return total length of buffer chain */
-static uint brcmf_sdbrcm_glom_len(struct brcmf_bus *bus)
+static uint brcmf_sdbrcm_glom_len(struct brcmf_sdio *bus)
 {
         struct sk_buff *p;
         uint total;
@@ -1104,7 +1106,7 @@ static uint brcmf_sdbrcm_glom_len(struct brcmf_bus *bus)
         return total;
 }
 
-static void brcmf_sdbrcm_free_glom(struct brcmf_bus *bus)
+static void brcmf_sdbrcm_free_glom(struct brcmf_sdio *bus)
 {
         struct sk_buff *cur, *next;
 
@@ -1114,13 +1116,13 @@ static void brcmf_sdbrcm_free_glom(struct brcmf_bus *bus)
         }
 }
 
-static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
+static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
 {
         u16 dlen, totlen;
         u8 *dptr, num = 0;
 
         u16 sublen, check;
-        struct sk_buff *pfirst, *plast, *pnext, *save_pfirst;
+        struct sk_buff *pfirst, *pnext;
 
         int errcode;
         u8 chan, seq, doff, sfdoff;
@@ -1137,7 +1139,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
 
         /* If there's a descriptor, generate the packet chain */
         if (bus->glomd) {
-                pfirst = plast = pnext = NULL;
+                pfirst = pnext = NULL;
                 dlen = (u16) (bus->glomd->len);
                 dptr = bus->glomd->data;
                 if (!dlen || (dlen & 1)) {
@@ -1228,17 +1230,14 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
                  * packet and and copy into the chain.
                  */
                 if (usechain) {
-                        errcode = brcmf_sdcard_recv_buf(bus->sdiodev,
+                        errcode = brcmf_sdcard_recv_chain(bus->sdiodev,
                                         bus->sdiodev->sbwad,
-                                        SDIO_FUNC_2,
-                                        F2SYNC, (u8 *) pfirst->data, dlen,
-                                        pfirst);
+                                        SDIO_FUNC_2, F2SYNC, &bus->glom);
                 } else if (bus->dataptr) {
                         errcode = brcmf_sdcard_recv_buf(bus->sdiodev,
                                         bus->sdiodev->sbwad,
-                                        SDIO_FUNC_2,
-                                        F2SYNC, bus->dataptr, dlen,
-                                        NULL);
+                                        SDIO_FUNC_2, F2SYNC,
+                                        bus->dataptr, dlen);
                         sublen = (u16) brcmf_sdbrcm_glom_from_buf(bus, dlen);
                         if (sublen != dlen) {
                                 brcmf_dbg(ERROR, "FAILED TO COPY, dlen %d sublen %d\n",
@@ -1338,10 +1337,14 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
                 /* Remove superframe header, remember offset */
                 skb_pull(pfirst, doff);
                 sfdoff = doff;
+                num = 0;
 
                 /* Validate all the subframe headers */
-                for (num = 0, pnext = pfirst; pnext && !errcode;
-                     num++, pnext = pnext->next) {
+                skb_queue_walk(&bus->glom, pnext) {
+                        /* leave when invalid subframe is found */
+                        if (errcode)
+                                break;
+
                         dptr = (u8 *) (pnext->data);
                         dlen = (u16) (pnext->len);
                         sublen = get_unaligned_le16(dptr);
@@ -1374,6 +1377,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
                                           num, doff, sublen, SDPCM_HDRLEN);
                                 errcode = -1;
                         }
+                        /* increase the subframe count */
+                        num++;
                 }
 
                 if (errcode) {
@@ -1394,13 +1399,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
                 }
 
                 /* Basic SD framing looks ok - process each packet (header) */
-                save_pfirst = pfirst;
-                plast = NULL;
-
-                for (num = 0; pfirst; rxseq++, pfirst = pnext) {
-                        pnext = pfirst->next;
-                        pfirst->next = NULL;
 
+                skb_queue_walk_safe(&bus->glom, pfirst, pnext) {
                         dptr = (u8 *) (pfirst->data);
                         sublen = get_unaligned_le16(dptr);
                         chan = SDPCM_PACKET_CHANNEL(&dptr[SDPCM_FRAMETAG_LEN]);
@@ -1420,6 +1420,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
                                 bus->rx_badseq++;
                                 rxseq = seq;
                         }
+                        rxseq++;
+
 #ifdef BCMDBG
                         if (BRCMF_BYTES_ON() && BRCMF_DATA_ON()) {
                                 printk(KERN_DEBUG "Rx Subframe Data:\n");
@@ -1432,36 +1434,22 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
                         skb_pull(pfirst, doff);
 
                         if (pfirst->len == 0) {
+                                skb_unlink(pfirst, &bus->glom);
                                 brcmu_pkt_buf_free_skb(pfirst);
-                                if (plast)
-                                        plast->next = pnext;
-                                else
-                                        save_pfirst = pnext;
-
                                 continue;
                         } else if (brcmf_proto_hdrpull(bus->drvr, &ifidx,
                                                        pfirst) != 0) {
                                 brcmf_dbg(ERROR, "rx protocol error\n");
                                 bus->drvr->rx_errors++;
+                                skb_unlink(pfirst, &bus->glom);
                                 brcmu_pkt_buf_free_skb(pfirst);
-                                if (plast)
-                                        plast->next = pnext;
-                                else
-                                        save_pfirst = pnext;
-
                                 continue;
                         }
 
-                        /* this packet will go up, link back into
-                                 chain and count it */
-                        pfirst->next = pnext;
-                        plast = pfirst;
-                        num++;
-
 #ifdef BCMDBG
                         if (BRCMF_GLOM_ON()) {
                                 brcmf_dbg(GLOM, "subframe %d to stack, %p (%p/%d) nxt/lnk %p/%p\n",
-                                          num, pfirst, pfirst->data,
+                                          bus->glom.qlen, pfirst, pfirst->data,
                                           pfirst->len, pfirst->next,
                                           pfirst->prev);
                                 print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
@@ -1470,19 +1458,20 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
                         }
 #endif                          /* BCMDBG */
                 }
-                if (num) {
+                /* sent any remaining packets up */
+                if (bus->glom.qlen) {
                         up(&bus->sdsem);
-                        brcmf_rx_frame(bus->drvr, ifidx, save_pfirst, num);
+                        brcmf_rx_frame(bus->drvr, ifidx, &bus->glom);
                         down(&bus->sdsem);
                 }
 
                 bus->rxglomframes++;
-                bus->rxglompkts += num;
+                bus->rxglompkts += bus->glom.qlen;
         }
         return num;
 }
 
-static int brcmf_sdbrcm_dcmd_resp_wait(struct brcmf_bus *bus, uint *condition,
+static int brcmf_sdbrcm_dcmd_resp_wait(struct brcmf_sdio *bus, uint *condition,
                                         bool *pending)
 {
         DECLARE_WAITQUEUE(wait, current);
@@ -1504,7 +1493,7 @@ static int brcmf_sdbrcm_dcmd_resp_wait(struct brcmf_bus *bus, uint *condition,
         return timeout;
 }
 
-static int brcmf_sdbrcm_dcmd_resp_wake(struct brcmf_bus *bus)
+static int brcmf_sdbrcm_dcmd_resp_wake(struct brcmf_sdio *bus)
 {
         if (waitqueue_active(&bus->dcmd_resp_wait))
                 wake_up_interruptible(&bus->dcmd_resp_wait);
@@ -1512,7 +1501,7 @@ static int brcmf_sdbrcm_dcmd_resp_wake(struct brcmf_bus *bus)
         return 0;
 }
 static void
-brcmf_sdbrcm_read_control(struct brcmf_bus *bus, u8 *hdr, uint len, uint doff)
+brcmf_sdbrcm_read_control(struct brcmf_sdio *bus, u8 *hdr, uint len, uint doff)
 {
         uint rdlen, pad;
 
@@ -1570,8 +1559,7 @@ brcmf_sdbrcm_read_control(struct brcmf_bus *bus, u8 *hdr, uint len, uint doff)
         sdret = brcmf_sdcard_recv_buf(bus->sdiodev,
                                 bus->sdiodev->sbwad,
                                 SDIO_FUNC_2,
-                                F2SYNC, (bus->rxctl + BRCMF_FIRSTREAD), rdlen,
-                                NULL);
+                                F2SYNC, (bus->rxctl + BRCMF_FIRSTREAD), rdlen);
         bus->f2rxdata++;
 
         /* Control frame failures need retransmission */
@@ -1602,7 +1590,7 @@ done:
 }
 
 /* Pad read to blocksize for efficiency */
-static void brcmf_pad(struct brcmf_bus *bus, u16 *pad, u16 *rdlen)
+static void brcmf_pad(struct brcmf_sdio *bus, u16 *pad, u16 *rdlen)
 {
         if (bus->roundup && bus->blocksize && *rdlen > bus->blocksize) {
                 *pad = bus->blocksize - (*rdlen % bus->blocksize);
@@ -1615,7 +1603,7 @@ static void brcmf_pad(struct brcmf_bus *bus, u16 *pad, u16 *rdlen)
 }
 
 static void
-brcmf_alloc_pkt_and_read(struct brcmf_bus *bus, u16 rdlen,
+brcmf_alloc_pkt_and_read(struct brcmf_sdio *bus, u16 rdlen,
                          struct sk_buff **pkt, u8 **rxbuf)
 {
         int sdret;              /* Return code from calls */
@@ -1627,9 +1615,8 @@ brcmf_alloc_pkt_and_read(struct brcmf_bus *bus, u16 rdlen,
         pkt_align(*pkt, rdlen, BRCMF_SDALIGN);
         *rxbuf = (u8 *) ((*pkt)->data);
         /* Read the entire frame */
-        sdret = brcmf_sdcard_recv_buf(bus->sdiodev, bus->sdiodev->sbwad,
-                                      SDIO_FUNC_2, F2SYNC,
-                                      *rxbuf, rdlen, *pkt);
+        sdret = brcmf_sdcard_recv_pkt(bus->sdiodev, bus->sdiodev->sbwad,
+                                      SDIO_FUNC_2, F2SYNC, *pkt);
         bus->f2rxdata++;
 
         if (sdret < 0) {
@@ -1648,7 +1635,7 @@ brcmf_alloc_pkt_and_read(struct brcmf_bus *bus, u16 rdlen,
 
 /* Checks the header */
 static int
-brcmf_check_rxbuf(struct brcmf_bus *bus, struct sk_buff *pkt, u8 *rxbuf,
+brcmf_check_rxbuf(struct brcmf_sdio *bus, struct sk_buff *pkt, u8 *rxbuf,
                   u8 rxseq, u16 nextlen, u16 *len)
 {
         u16 check;
@@ -1704,7 +1691,7 @@ fail:
 
 /* Return true if there may be more frames to read */
 static uint
-brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
+brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
 {
         u16 len, check; /* Extracted hardware header fields */
         u8 chan, seq, doff;     /* Extracted software header fields */
@@ -1727,7 +1714,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
         *finished = false;
 
         for (rxseq = bus->rx_seq, rxleft = maxframes;
-             !bus->rxskip && rxleft && bus->drvr->busstate != BRCMF_BUS_DOWN;
+             !bus->rxskip && rxleft &&
+             bus->drvr->bus_if->state != BRCMF_BUS_DOWN;
              rxseq++, rxleft--) {
 
                 /* Handle glomming separately */
@@ -1857,7 +1845,7 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
                 /* Read frame header (hardware and software) */
                 sdret = brcmf_sdcard_recv_buf(bus->sdiodev, bus->sdiodev->sbwad,
                                               SDIO_FUNC_2, F2SYNC, bus->rxhdr,
-                                              BRCMF_FIRSTREAD, NULL);
+                                              BRCMF_FIRSTREAD);
                 bus->f2rxhdrs++;
 
                 if (sdret < 0) {
@@ -2006,9 +1994,8 @@ brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
                 pkt_align(pkt, rdlen, BRCMF_SDALIGN);
 
                 /* Read the remaining frame data */
-                sdret = brcmf_sdcard_recv_buf(bus->sdiodev, bus->sdiodev->sbwad,
-                                SDIO_FUNC_2, F2SYNC, ((u8 *) (pkt->data)),
-                                rdlen, pkt);
+                sdret = brcmf_sdcard_recv_pkt(bus->sdiodev, bus->sdiodev->sbwad,
+                                              SDIO_FUNC_2, F2SYNC, pkt);
                 bus->f2rxdata++;
 
                 if (sdret < 0) {
@@ -2075,7 +2062,7 @@ deliver:
 
                 /* Unlock during rx call */
                 up(&bus->sdsem);
-                brcmf_rx_frame(bus->drvr, ifidx, pkt, 1);
+                brcmf_rx_packet(bus->drvr, ifidx, pkt);
                 down(&bus->sdsem);
         }
         rxcount = maxframes - rxleft;
@@ -2095,16 +2082,8 @@ deliver:
         return rxcount;
 }
 
-static int
-brcmf_sdbrcm_send_buf(struct brcmf_bus *bus, u32 addr, uint fn, uint flags,
-                    u8 *buf, uint nbytes, struct sk_buff *pkt)
-{
-        return brcmf_sdcard_send_buf
-                (bus->sdiodev, addr, fn, flags, buf, nbytes, pkt);
-}
-
 static void
-brcmf_sdbrcm_wait_for_event(struct brcmf_bus *bus, bool *lockvar)
+brcmf_sdbrcm_wait_for_event(struct brcmf_sdio *bus, bool *lockvar)
 {
         up(&bus->sdsem);
         wait_event_interruptible_timeout(bus->ctrl_wait,
@@ -2114,7 +2093,7 @@ brcmf_sdbrcm_wait_for_event(struct brcmf_bus *bus, bool *lockvar)
 }
 
 static void
-brcmf_sdbrcm_wait_event_wakeup(struct brcmf_bus *bus)
+brcmf_sdbrcm_wait_event_wakeup(struct brcmf_sdio *bus)
 {
         if (waitqueue_active(&bus->ctrl_wait))
                 wake_up_interruptible(&bus->ctrl_wait);
@@ -2123,7 +2102,7 @@ brcmf_sdbrcm_wait_event_wakeup(struct brcmf_bus *bus)
 
 /* Writes a HW/SW header into the packet and sends it. */
 /* Assumes: (a) header space already there, (b) caller holds lock */
-static int brcmf_sdbrcm_txpkt(struct brcmf_bus *bus, struct sk_buff *pkt,
+static int brcmf_sdbrcm_txpkt(struct brcmf_sdio *bus, struct sk_buff *pkt,
                               uint chan, bool free_pkt)
 {
         int ret;
@@ -2212,9 +2191,8 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_bus *bus, struct sk_buff *pkt,
         if (len & (ALIGNMENT - 1))
                         len = roundup(len, ALIGNMENT);
 
-        ret = brcmf_sdbrcm_send_buf(bus, bus->sdiodev->sbwad,
-                                    SDIO_FUNC_2, F2SYNC, frame,
-                                    len, pkt);
+        ret = brcmf_sdcard_send_pkt(bus->sdiodev, bus->sdiodev->sbwad,
+                                    SDIO_FUNC_2, F2SYNC, pkt);
         bus->f2txdata++;
 
         if (ret < 0) {
@@ -2261,7 +2239,7 @@ done:
         return ret;
 }
 
-static uint brcmf_sdbrcm_sendfromq(struct brcmf_bus *bus, uint maxframes)
+static uint brcmf_sdbrcm_sendfromq(struct brcmf_sdio *bus, uint maxframes)
 {
         struct sk_buff *pkt;
         u32 intstatus = 0;
@@ -2309,14 +2287,14 @@ static uint brcmf_sdbrcm_sendfromq(struct brcmf_bus *bus, uint maxframes)
         }
 
         /* Deflow-control stack if needed */
-        if (drvr->up && (drvr->busstate == BRCMF_BUS_DATA) &&
+        if (drvr->up && (drvr->bus_if->state == BRCMF_BUS_DATA) &&
             drvr->txoff && (pktq_len(&bus->txq) < TXLOW))
                 brcmf_txflowcontrol(drvr, 0, OFF);
 
         return cnt;
 }
 
-static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
+static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)
 {
         u32 intstatus, newstatus = 0;
         uint retries = 0;
@@ -2344,7 +2322,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
                                                SBSDIO_DEVICE_CTL, &err);
                 if (err) {
                         brcmf_dbg(ERROR, "error reading DEVCTL: %d\n", err);
-                        bus->drvr->busstate = BRCMF_BUS_DOWN;
+                        bus->drvr->bus_if->state = BRCMF_BUS_DOWN;
                 }
 #endif                          /* BCMDBG */
 
@@ -2354,7 +2332,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
                 if (err) {
                         brcmf_dbg(ERROR, "error reading CSR: %d\n",
                                   err);
-                        bus->drvr->busstate = BRCMF_BUS_DOWN;
+                        bus->drvr->bus_if->state = BRCMF_BUS_DOWN;
                 }
 
                 brcmf_dbg(INFO, "DPC: PENDING, devctl 0x%02x clkctl 0x%02x\n",
@@ -2367,7 +2345,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
                         if (err) {
                                 brcmf_dbg(ERROR, "error reading DEVCTL: %d\n",
                                           err);
-                                bus->drvr->busstate = BRCMF_BUS_DOWN;
+                                bus->drvr->bus_if->state = BRCMF_BUS_DOWN;
                         }
                         devctl &= ~SBSDIO_DEVCTL_CA_INT_ONLY;
                         brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
@@ -2375,7 +2353,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
                         if (err) {
                                 brcmf_dbg(ERROR, "error writing DEVCTL: %d\n",
                                           err);
-                                bus->drvr->busstate = BRCMF_BUS_DOWN;
+                                bus->drvr->bus_if->state = BRCMF_BUS_DOWN;
                         }
                         bus->clkstate = CLK_AVAIL;
                 } else {
@@ -2477,9 +2455,9 @@ clkwait:
                 (bus->clkstate == CLK_AVAIL)) {
                 int ret, i;
 
-                ret = brcmf_sdbrcm_send_buf(bus, bus->sdiodev->sbwad,
+                ret = brcmf_sdcard_send_buf(bus->sdiodev, bus->sdiodev->sbwad,
                         SDIO_FUNC_2, F2SYNC, (u8 *) bus->ctrl_frame_buf,
-                        (u32) bus->ctrl_frame_len, NULL);
+                        (u32) bus->ctrl_frame_len);
 
                 if (ret < 0) {
                         /* On failure, abort the command and
@@ -2531,11 +2509,11 @@ clkwait:
                  else await next interrupt */
         /* On failed register access, all bets are off:
                  no resched or interrupts */
-        if ((bus->drvr->busstate == BRCMF_BUS_DOWN) ||
+        if ((bus->drvr->bus_if->state == BRCMF_BUS_DOWN) ||
             brcmf_sdcard_regfail(bus->sdiodev)) {
                 brcmf_dbg(ERROR, "failed backplane access over SDIO, halting operation %d\n",
                           brcmf_sdcard_regfail(bus->sdiodev));
-                bus->drvr->busstate = BRCMF_BUS_DOWN;
+                bus->drvr->bus_if->state = BRCMF_BUS_DOWN;
                 bus->intstatus = 0;
         } else if (bus->clkstate == CLK_PENDING) {
                 brcmf_dbg(INFO, "rescheduled due to CLK_PENDING awaiting I_CHIPACTIVE interrupt\n");
@@ -2562,7 +2540,7 @@ clkwait:
 
 static int brcmf_sdbrcm_dpc_thread(void *data)
 {
-        struct brcmf_bus *bus = (struct brcmf_bus *) data;
+        struct brcmf_sdio *bus = (struct brcmf_sdio *) data;
 
         allow_signal(SIGTERM);
         /* Run until signal received */
@@ -2572,12 +2550,12 @@ static int brcmf_sdbrcm_dpc_thread(void *data)
                 if (!wait_for_completion_interruptible(&bus->dpc_wait)) {
                         /* Call bus dpc unless it indicated down
                         (then clean stop) */
-                        if (bus->drvr->busstate != BRCMF_BUS_DOWN) {
+                        if (bus->drvr->bus_if->state != BRCMF_BUS_DOWN) {
                                 if (brcmf_sdbrcm_dpc(bus))
                                         complete(&bus->dpc_wait);
                         } else {
                                 /* after stopping the bus, exit thread */
-                                brcmf_sdbrcm_bus_stop(bus);
+                                brcmf_sdbrcm_bus_stop(bus->sdiodev->dev);
                                 bus->dpc_tsk = NULL;
                                 break;
                         }
@@ -2587,10 +2565,13 @@ static int brcmf_sdbrcm_dpc_thread(void *data)
         return 0;
 }
 
-int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt)
+int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
 {
         int ret = -EBADE;
         uint datalen, prec;
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv;
+        struct brcmf_sdio *bus = sdiodev->bus;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -2638,7 +2619,7 @@ int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt)
 }
 
 static int
-brcmf_sdbrcm_membytes(struct brcmf_bus *bus, bool write, u32 address, u8 *data,
+brcmf_sdbrcm_membytes(struct brcmf_sdio *bus, bool write, u32 address, u8 *data,
                  uint size)
 {
         int bcmerror = 0;
@@ -2699,7 +2680,7 @@ xfer_done:
 #ifdef BCMDBG
 #define CONSOLE_LINE_MAX        192
 
-static int brcmf_sdbrcm_readconsole(struct brcmf_bus *bus)
+static int brcmf_sdbrcm_readconsole(struct brcmf_sdio *bus)
 {
         struct brcmf_console *c = &bus->console;
         u8 line[CONSOLE_LINE_MAX], ch;
@@ -2776,14 +2757,14 @@ break2:
 }
 #endif                          /* BCMDBG */
 
-static int brcmf_tx_frame(struct brcmf_bus *bus, u8 *frame, u16 len)
+static int brcmf_tx_frame(struct brcmf_sdio *bus, u8 *frame, u16 len)
 {
         int i;
         int ret;
 
         bus->ctrl_frame_stat = false;
-        ret = brcmf_sdbrcm_send_buf(bus, bus->sdiodev->sbwad,
-                                    SDIO_FUNC_2, F2SYNC, frame, len, NULL);
+        ret = brcmf_sdcard_send_buf(bus->sdiodev, bus->sdiodev->sbwad,
+                                    SDIO_FUNC_2, F2SYNC, frame, len);
 
         if (ret < 0) {
                 /* On failure, abort the command and terminate the frame */
@@ -2819,7 +2800,7 @@ static int brcmf_tx_frame(struct brcmf_bus *bus, u8 *frame, u16 len)
 }
 
 int
-brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
+brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen)
 {
         u8 *frame;
         u16 len;
@@ -2827,6 +2808,9 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
         uint retries = 0;
         u8 doff = 0;
         int ret = -1;
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv;
+        struct brcmf_sdio *bus = sdiodev->bus;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -2934,11 +2918,14 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
 }
 
 int
-brcmf_sdbrcm_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
+brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen)
 {
         int timeleft;
         uint rxlen = 0;
         bool pending;
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv;
+        struct brcmf_sdio *bus = sdiodev->bus;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -2971,7 +2958,7 @@ brcmf_sdbrcm_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
         return rxlen ? (int)rxlen : -ETIMEDOUT;
 }
 
-static int brcmf_sdbrcm_downloadvars(struct brcmf_bus *bus, void *arg, int len)
+static int brcmf_sdbrcm_downloadvars(struct brcmf_sdio *bus, void *arg, int len)
 {
         int bcmerror = 0;
 
@@ -3004,7 +2991,7 @@ err:
         return bcmerror;
 }
 
-static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus)
+static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)
 {
         int bcmerror = 0;
         u32 varsize;
@@ -3091,7 +3078,7 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus)
         return bcmerror;
 }
 
-static int brcmf_sdbrcm_download_state(struct brcmf_bus *bus, bool enter)
+static int brcmf_sdbrcm_download_state(struct brcmf_sdio *bus, bool enter)
 {
         uint retries;
         int bcmerror = 0;
@@ -3134,13 +3121,13 @@ static int brcmf_sdbrcm_download_state(struct brcmf_bus *bus, bool enter)
                 /* Allow HT Clock now that the ARM is running. */
                 bus->alp_only = false;
 
-                bus->drvr->busstate = BRCMF_BUS_LOAD;
+                bus->drvr->bus_if->state = BRCMF_BUS_LOAD;
         }
 fail:
         return bcmerror;
 }
 
-static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_bus *bus)
+static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_sdio *bus)
 {
         if (bus->firmware->size < bus->fw_ptr + len)
                 len = bus->firmware->size - bus->fw_ptr;
@@ -3150,10 +3137,7 @@ static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_bus *bus)
         return len;
 }
 
-MODULE_FIRMWARE(BCM4329_FW_NAME);
-MODULE_FIRMWARE(BCM4329_NV_NAME);
-
-static int brcmf_sdbrcm_download_code_file(struct brcmf_bus *bus)
+static int brcmf_sdbrcm_download_code_file(struct brcmf_sdio *bus)
 {
         int offset = 0;
         uint len;
@@ -3162,8 +3146,7 @@ static int brcmf_sdbrcm_download_code_file(struct brcmf_bus *bus)
 
         brcmf_dbg(INFO, "Enter\n");
 
-        bus->fw_name = BCM4329_FW_NAME;
-        ret = request_firmware(&bus->firmware, bus->fw_name,
+        ret = request_firmware(&bus->firmware, BRCMFMAC_FW_NAME,
                                &bus->sdiodev->func[2]->dev);
         if (ret) {
                 brcmf_dbg(ERROR, "Fail to request firmware %d\n", ret);
@@ -3253,15 +3236,14 @@ static uint brcmf_process_nvram_vars(char *varbuf, uint len)
         return buf_len;
 }
 
-static int brcmf_sdbrcm_download_nvram(struct brcmf_bus *bus)
+static int brcmf_sdbrcm_download_nvram(struct brcmf_sdio *bus)
 {
         uint len;
         char *memblock = NULL;
         char *bufp;
         int ret;
 
-        bus->nv_name = BCM4329_NV_NAME;
-        ret = request_firmware(&bus->firmware, bus->nv_name,
+        ret = request_firmware(&bus->firmware, BRCMFMAC_NV_NAME,
                                &bus->sdiodev->func[2]->dev);
         if (ret) {
                 brcmf_dbg(ERROR, "Fail to request nvram %d\n", ret);
@@ -3301,7 +3283,7 @@ err:
         return ret;
 }
 
-static int _brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus)
+static int _brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus)
 {
         int bcmerror = -1;
 
@@ -3334,7 +3316,7 @@ err:
 }
 
 static bool
-brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus)
+brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus)
 {
         bool ret;
 
@@ -3348,12 +3330,15 @@ brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus)
         return ret;
 }
 
-void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus)
+void brcmf_sdbrcm_bus_stop(struct device *dev)
 {
         u32 local_hostintmask;
         u8 saveclk;
         uint retries;
         int err;
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv;
+        struct brcmf_sdio *bus = sdiodev->bus;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3382,7 +3367,7 @@ void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus)
         bus->hostintmask = 0;
 
         /* Change our idea of bus state */
-        bus->drvr->busstate = BRCMF_BUS_DOWN;
+        bus->drvr->bus_if->state = BRCMF_BUS_DOWN;
 
         /* Force clocks on backplane to be sure F2 interrupt propagates */
         saveclk = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
@@ -3426,9 +3411,11 @@ void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus)
         up(&bus->sdsem);
 }
 
-int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr)
+int brcmf_sdbrcm_bus_init(struct device *dev)
 {
-        struct brcmf_bus *bus = drvr->bus;
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv;
+        struct brcmf_sdio *bus = sdiodev->bus;
         unsigned long timeout;
         uint retries = 0;
         u8 ready, enable;
@@ -3438,7 +3425,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr)
         brcmf_dbg(TRACE, "Enter\n");
 
         /* try to download image and nvram to the dongle */
-        if (drvr->busstate == BRCMF_BUS_DOWN) {
+        if (bus_if->state == BRCMF_BUS_DOWN) {
                 if (!(brcmf_sdbrcm_download_firmware(bus)))
                         return -1;
         }
@@ -3504,7 +3491,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr)
                                        SBSDIO_WATERMARK, 8, &err);
 
                 /* Set bus state according to enable result */
-                drvr->busstate = BRCMF_BUS_DATA;
+                bus_if->state = BRCMF_BUS_DATA;
         }
 
         else {
@@ -3519,7 +3506,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr)
                                SBSDIO_FUNC1_CHIPCLKCSR, saveclk, &err);
 
         /* If we didn't come up, turn off backplane clock */
-        if (drvr->busstate != BRCMF_BUS_DATA)
+        if (bus_if->state != BRCMF_BUS_DATA)
                 brcmf_sdbrcm_clkctl(bus, CLK_NONE, false);
 
 exit:
@@ -3530,7 +3517,7 @@ exit:
 
 void brcmf_sdbrcm_isr(void *arg)
 {
-        struct brcmf_bus *bus = (struct brcmf_bus *) arg;
+        struct brcmf_sdio *bus = (struct brcmf_sdio *) arg;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3539,7 +3526,7 @@ void brcmf_sdbrcm_isr(void *arg)
                 return;
         }
 
-        if (bus->drvr->busstate == BRCMF_BUS_DOWN) {
+        if (bus->drvr->bus_if->state == BRCMF_BUS_DOWN) {
                 brcmf_dbg(ERROR, "bus is down. we have nothing to do\n");
                 return;
         }
@@ -3562,14 +3549,14 @@ void brcmf_sdbrcm_isr(void *arg)
                 complete(&bus->dpc_wait);
 }
 
-static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr)
+static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
 {
-        struct brcmf_bus *bus;
+#ifdef BCMDBG
+        struct brcmf_bus *bus_if = dev_get_drvdata(bus->sdiodev->dev);
+#endif  /* BCMDBG */
 
         brcmf_dbg(TIMER, "Enter\n");
 
-        bus = drvr->bus;
-
         /* Ignore the timer if simulating bus down */
         if (bus->sleeping)
                 return false;
@@ -3613,7 +3600,8 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr)
         }
 #ifdef BCMDBG
         /* Poll for console output periodically */
-        if (drvr->busstate == BRCMF_BUS_DATA && bus->console_interval != 0) {
+        if (bus_if->state == BRCMF_BUS_DATA &&
+            bus->console_interval != 0) {
                 bus->console.count += BRCMF_WD_POLL_MS;
                 if (bus->console.count >= bus->console_interval) {
                         bus->console.count -= bus->console_interval;
@@ -3648,10 +3636,12 @@ static bool brcmf_sdbrcm_chipmatch(u16 chipid)
 {
         if (chipid == BCM4329_CHIP_ID)
                 return true;
+        if (chipid == BCM4330_CHIP_ID)
+                return true;
         return false;
 }
 
-static void brcmf_sdbrcm_release_malloc(struct brcmf_bus *bus)
+static void brcmf_sdbrcm_release_malloc(struct brcmf_sdio *bus)
 {
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3663,7 +3653,7 @@ static void brcmf_sdbrcm_release_malloc(struct brcmf_bus *bus)
         bus->databuf = NULL;
 }
 
-static bool brcmf_sdbrcm_probe_malloc(struct brcmf_bus *bus)
+static bool brcmf_sdbrcm_probe_malloc(struct brcmf_sdio *bus)
 {
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3699,7 +3689,7 @@ fail:
 }
 
 static bool
-brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, u32 regsva)
+brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva)
 {
         u8 clkctl = 0;
         int err = 0;
@@ -3784,7 +3774,7 @@ fail:
         return false;
 }
 
-static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus)
+static bool brcmf_sdbrcm_probe_init(struct brcmf_sdio *bus)
 {
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3792,7 +3782,7 @@ static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus)
         brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_0, SDIO_CCCR_IOEx,
                                SDIO_FUNC_ENABLE_1, NULL);
 
-        bus->drvr->busstate = BRCMF_BUS_DOWN;
+        bus->drvr->bus_if->state = BRCMF_BUS_DOWN;
         bus->sleeping = false;
         bus->rxflow = false;
 
@@ -3819,7 +3809,7 @@ static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus)
 static int
 brcmf_sdbrcm_watchdog_thread(void *data)
 {
-        struct brcmf_bus *bus = (struct brcmf_bus *)data;
+        struct brcmf_sdio *bus = (struct brcmf_sdio *)data;
 
         allow_signal(SIGTERM);
         /* Run until signal received */
@@ -3827,7 +3817,7 @@ brcmf_sdbrcm_watchdog_thread(void *data)
                 if (kthread_should_stop())
                         break;
                 if (!wait_for_completion_interruptible(&bus->watchdog_wait)) {
-                        brcmf_sdbrcm_bus_watchdog(bus->drvr);
+                        brcmf_sdbrcm_bus_watchdog(bus);
                         /* Count the tick for reference */
                         bus->drvr->tickcnt++;
                 } else
@@ -3839,7 +3829,7 @@ brcmf_sdbrcm_watchdog_thread(void *data)
 static void
 brcmf_sdbrcm_watchdog(unsigned long data)
 {
-        struct brcmf_bus *bus = (struct brcmf_bus *)data;
+        struct brcmf_sdio *bus = (struct brcmf_sdio *)data;
 
         if (bus->watchdog_tsk) {
                 complete(&bus->watchdog_wait);
@@ -3850,7 +3840,7 @@ brcmf_sdbrcm_watchdog(unsigned long data)
         }
 }
 
-static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus)
+static void brcmf_sdbrcm_release_dongle(struct brcmf_sdio *bus)
 {
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3867,7 +3857,7 @@ static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus)
 }
 
 /* Detach and free everything */
-static void brcmf_sdbrcm_release(struct brcmf_bus *bus)
+static void brcmf_sdbrcm_release(struct brcmf_sdio *bus)
 {
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3889,21 +3879,10 @@ static void brcmf_sdbrcm_release(struct brcmf_bus *bus)
         brcmf_dbg(TRACE, "Disconnected\n");
 }
 
-void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,
-                         u32 regsva, struct brcmf_sdio_dev *sdiodev)
+void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
 {
         int ret;
-        struct brcmf_bus *bus;
-
-        /* Init global variables at run-time, not as part of the declaration.
-         * This is required to support init/de-init of the driver.
-         * Initialization
-         * of globals as part of the declaration results in non-deterministic
-         * behavior since the value of the globals may be different on the
-         * first time that the driver is initialized vs subsequent
-         * initializations.
-         */
-        brcmf_c_init();
+        struct brcmf_sdio *bus;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3911,7 +3890,7 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,
          * regsva == SI_ENUM_BASE*/
 
         /* Allocate private bus interface state */
-        bus = kzalloc(sizeof(struct brcmf_bus), GFP_ATOMIC);
+        bus = kzalloc(sizeof(struct brcmf_sdio), GFP_ATOMIC);
         if (!bus)
                 goto fail;
 
@@ -3963,7 +3942,7 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,
         }
 
         /* Attach to the brcmf/OS/network interface */
-        bus->drvr = brcmf_attach(bus, SDPCM_RESERVE);
+        bus->drvr = brcmf_attach(bus, SDPCM_RESERVE, bus->sdiodev->dev);
         if (!bus->drvr) {
                 brcmf_dbg(ERROR, "brcmf_attach failed\n");
                 goto fail;
@@ -4015,7 +3994,7 @@ fail:
 
 void brcmf_sdbrcm_disconnect(void *ptr)
 {
-        struct brcmf_bus *bus = (struct brcmf_bus *)ptr;
+        struct brcmf_sdio *bus = (struct brcmf_sdio *)ptr;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -4025,13 +4004,8 @@ void brcmf_sdbrcm_disconnect(void *ptr)
         brcmf_dbg(TRACE, "Disconnected\n");
 }
 
-struct device *brcmf_bus_get_device(struct brcmf_bus *bus)
-{
-        return &bus->sdiodev->func[2]->dev;
-}
-
 void
-brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick)
+brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick)
 {
         /* Totally stop the timer */
         if (!wdtick && bus->wd_timer_valid == true) {
@@ -4042,7 +4016,7 @@ brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick)
         }
 
         /* don't start the wd until fw is loaded */
-        if (bus->drvr->busstate == BRCMF_BUS_DOWN)
+        if (bus->drvr->bus_if->state == BRCMF_BUS_DOWN)
                 return;
 
         if (wdtick) {
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
index f6b1822031fe..a6048d78d294 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -59,37 +59,17 @@ struct sdiod_drive_str {
         u8 strength;    /* Pad Drive Strength in mA */
         u8 sel;         /* Chip-specific select value */
 };
-/* SDIO Drive Strength to sel value table for PMU Rev 1 */
-static const struct sdiod_drive_str sdiod_drive_strength_tab1[] = {
-        {
-        4, 0x2}, {
-        2, 0x3}, {
-        1, 0x0}, {
-        0, 0x0}
-        };
-/* SDIO Drive Strength to sel value table for PMU Rev 2, 3 */
-static const struct sdiod_drive_str sdiod_drive_strength_tab2[] = {
-        {
-        12, 0x7}, {
-        10, 0x6}, {
-        8, 0x5}, {
-        6, 0x4}, {
-        4, 0x2}, {
-        2, 0x1}, {
-        0, 0x0}
-        };
-/* SDIO Drive Strength to sel value table for PMU Rev 8 (1.8V) */
-static const struct sdiod_drive_str sdiod_drive_strength_tab3[] = {
-        {
-        32, 0x7}, {
-        26, 0x6}, {
-        22, 0x5}, {
-        16, 0x4}, {
-        12, 0x3}, {
-        8, 0x2}, {
-        4, 0x1}, {
-        0, 0x0}
-        };
+/* SDIO Drive Strength to sel value table for PMU Rev 11 (1.8V) */
+static const struct sdiod_drive_str sdiod_drvstr_tab1_1v8[] = {
+        {32, 0x6},
+        {26, 0x7},
+        {22, 0x4},
+        {16, 0x5},
+        {12, 0x2},
+        {8, 0x3},
+        {4, 0x0},
+        {0, 0x1}
+};
 
 u8
 brcmf_sdio_chip_getinfidx(struct chip_info *ci, u16 coreid)
@@ -396,6 +376,23 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev,
                 ci->c_inf[3].base = BCM4329_CORE_ARM_BASE;
                 ci->ramsize = BCM4329_RAMSIZE;
                 break;
+        case BCM4330_CHIP_ID:
+                ci->c_inf[0].wrapbase = 0x18100000;
+                ci->c_inf[0].cib = 0x27004211;
+                ci->c_inf[1].id = BCMA_CORE_SDIO_DEV;
+                ci->c_inf[1].base = 0x18002000;
+                ci->c_inf[1].wrapbase = 0x18102000;
+                ci->c_inf[1].cib = 0x07004211;
+                ci->c_inf[2].id = BCMA_CORE_INTERNAL_MEM;
+                ci->c_inf[2].base = 0x18004000;
+                ci->c_inf[2].wrapbase = 0x18104000;
+                ci->c_inf[2].cib = 0x0d080401;
+                ci->c_inf[3].id = BCMA_CORE_ARM_CM3;
+                ci->c_inf[3].base = 0x18003000;
+                ci->c_inf[3].wrapbase = 0x18103000;
+                ci->c_inf[3].cib = 0x03004211;
+                ci->ramsize = 0x48000;
+                break;
         default:
                 brcmf_dbg(ERROR, "chipid 0x%x is not supported\n", ci->chip);
                 return -ENODEV;
@@ -569,19 +566,8 @@ brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev,
                 return;
 
         switch (SDIOD_DRVSTR_KEY(ci->chip, ci->pmurev)) {
-        case SDIOD_DRVSTR_KEY(BCM4325_CHIP_ID, 1):
-                str_tab = (struct sdiod_drive_str *)&sdiod_drive_strength_tab1;
-                str_mask = 0x30000000;
-                str_shift = 28;
-                break;
-        case SDIOD_DRVSTR_KEY(BCM4325_CHIP_ID, 2):
-        case SDIOD_DRVSTR_KEY(BCM4325_CHIP_ID, 3):
-                str_tab = (struct sdiod_drive_str *)&sdiod_drive_strength_tab2;
-                str_mask = 0x00003800;
-                str_shift = 11;
-                break;
-        case SDIOD_DRVSTR_KEY(BCM4336_CHIP_ID, 8):
-                str_tab = (struct sdiod_drive_str *)&sdiod_drive_strength_tab3;
+        case SDIOD_DRVSTR_KEY(BCM4330_CHIP_ID, 12):
+                str_tab = (struct sdiod_drive_str *)&sdiod_drvstr_tab1_1v8;
                 str_mask = 0x00003800;
                 str_shift = 11;
                 break;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
index 726fa8981113..d36a2a855a65 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
@@ -132,9 +132,10 @@ struct brcmf_sdio_dev {
         atomic_t suspend;               /* suspend flag */
         wait_queue_head_t request_byte_wait;
         wait_queue_head_t request_word_wait;
-        wait_queue_head_t request_packet_wait;
+        wait_queue_head_t request_chain_wait;
         wait_queue_head_t request_buffer_wait;
-
+        struct device *dev;
+        struct brcmf_bus *bus_if;
 };
 
 /* Register/deregister device interrupt handler. */
@@ -182,11 +183,21 @@ extern bool brcmf_sdcard_regfail(struct brcmf_sdio_dev *sdiodev);
  * NOTE: Async operation is not currently supported.
  */
 extern int
+brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
+                      uint flags, struct sk_buff *pkt);
+extern int
 brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
-                      uint flags, u8 *buf, uint nbytes, struct sk_buff *pkt);
+                      uint flags, u8 *buf, uint nbytes);
+
+extern int
+brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
+                      uint flags, struct sk_buff *pkt);
 extern int
 brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
-                      uint flags, u8 *buf, uint nbytes, struct sk_buff *pkt);
+                      uint flags, u8 *buf, uint nbytes);
+extern int
+brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
+                        uint flags, struct sk_buff_head *pktq);
 
 /* Flags bits */
 
@@ -237,16 +248,18 @@ brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev,
 /* read or write any buffer using cmd53 */
 extern int
 brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev,
-                           uint fix_inc, uint rw, uint fnc_num,
-                           u32 addr, uint regwidth,
-                           u32 buflen, u8 *buffer, struct sk_buff *pkt);
+                           uint fix_inc, uint rw, uint fnc_num, u32 addr,
+                           struct sk_buff *pkt);
+extern int
+brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc,
+                          uint write, uint func, uint addr,
+                          struct sk_buff_head *pktq);
 
 /* Watchdog timer interface for pm ops */
 extern void brcmf_sdio_wdtmr_enable(struct brcmf_sdio_dev *sdiodev,
                                     bool enable);
 
-extern void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,
-                                u32 regsva, struct brcmf_sdio_dev *sdiodev);
+extern void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev);
 extern void brcmf_sdbrcm_disconnect(void *ptr);
 extern void brcmf_sdbrcm_isr(void *arg);
 #endif                          /* _BRCM_SDH_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index cc19a733ac65..f23b0c3e4ea3 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -1429,7 +1429,7 @@ brcmf_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *ndev,
 
 static s32
 brcmf_cfg80211_set_tx_power(struct wiphy *wiphy,
-                         enum nl80211_tx_power_setting type, s32 dbm)
+                            enum nl80211_tx_power_setting type, s32 mbm)
 {
 
         struct brcmf_cfg80211_priv *cfg_priv = wiphy_to_cfg(wiphy);
@@ -1437,6 +1437,7 @@ brcmf_cfg80211_set_tx_power(struct wiphy *wiphy,
         u16 txpwrmw;
         s32 err = 0;
         s32 disable = 0;
+        s32 dbm = MBM_TO_DBM(mbm);
 
         WL_TRACE("Enter\n");
         if (!check_sys_up(wiphy))
@@ -1446,12 +1447,6 @@ brcmf_cfg80211_set_tx_power(struct wiphy *wiphy,
         case NL80211_TX_POWER_AUTOMATIC:
                 break;
         case NL80211_TX_POWER_LIMITED:
-                if (dbm < 0) {
-                        WL_ERR("TX_POWER_LIMITED - dbm is negative\n");
-                        err = -EINVAL;
-                        goto done;
-                }
-                break;
         case NL80211_TX_POWER_FIXED:
                 if (dbm < 0) {
                         WL_ERR("TX_POWER_FIXED - dbm is negative\n");
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
index 39e305443d7e..ab9bb11abfbb 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
@@ -318,37 +318,13 @@
 
 #define BADIDX          (SI_MAXCORES + 1)
 
-/* Newer chips can access PCI/PCIE and CC core without requiring to change
- * PCI BAR0 WIN
- */
-#define SI_FAST(si) (((si)->pub.buscoretype == PCIE_CORE_ID) || \
-                     (((si)->pub.buscoretype == PCI_CORE_ID) && \
-                      (si)->pub.buscorerev >= 13))
-
-#define CCREGS_FAST(si) (((char __iomem *)((si)->curmap) + \
-                          PCI_16KB0_CCREGS_OFFSET))
-
 #define IS_SIM(chippkg) \
         ((chippkg == HDLSIM_PKG_ID) || (chippkg == HWSIM_PKG_ID))
 
-/*
- * Macros to disable/restore function core(D11, ENET, ILINE20, etc) interrupts
- * before after core switching to avoid invalid register accesss inside ISR.
- */
-#define INTR_OFF(si, intr_val) \
-        if ((si)->intrsoff_fn && \
-            (si)->coreid[(si)->curidx] == (si)->dev_coreid) \
-                intr_val = (*(si)->intrsoff_fn)((si)->intr_arg)
-
-#define INTR_RESTORE(si, intr_val) \
-        if ((si)->intrsrestore_fn && \
-            (si)->coreid[(si)->curidx] == (si)->dev_coreid) \
-                (*(si)->intrsrestore_fn)((si)->intr_arg, intr_val)
+#define PCI(sih)        (ai_get_buscoretype(sih) == PCI_CORE_ID)
+#define PCIE(sih)       (ai_get_buscoretype(sih) == PCIE_CORE_ID)
 
-#define PCI(si)         ((si)->pub.buscoretype == PCI_CORE_ID)
-#define PCIE(si)        ((si)->pub.buscoretype == PCIE_CORE_ID)
-
-#define PCI_FORCEHT(si) (PCIE(si) && (si->pub.chip == BCM4716_CHIP_ID))
+#define PCI_FORCEHT(sih) (PCIE(sih) && (ai_get_chip_id(sih) == BCM4716_CHIP_ID))
 
 #ifdef BCMDBG
 #define SI_MSG(fmt, ...)        pr_debug(fmt, ##__VA_ARGS__)
@@ -360,9 +336,6 @@
         (((x) >= (b)) && ((x) < ((b) + SI_MAXCORES * SI_CORE_SIZE)) && \
                 IS_ALIGNED((x), SI_CORE_SIZE))
 
-#define PCIEREGS(si) ((__iomem char *)((si)->curmap) + \
-                        PCI_16KB0_PCIREGS_OFFSET)
-
 struct aidmp {
         u32 oobselina30;        /* 0x000 */
         u32 oobselina74;        /* 0x004 */
@@ -481,406 +454,13 @@ struct aidmp {
         u32 componentid3;       /* 0xffc */
 };
 
-/* EROM parsing */
-
-static u32
-get_erom_ent(struct si_pub *sih, u32 __iomem **eromptr, u32 mask, u32 match)
-{
-        u32 ent;
-        uint inv = 0, nom = 0;
-
-        while (true) {
-                ent = R_REG(*eromptr);
-                (*eromptr)++;
-
-                if (mask == 0)
-                        break;
-
-                if ((ent & ER_VALID) == 0) {
-                        inv++;
-                        continue;
-                }
-
-                if (ent == (ER_END | ER_VALID))
-                        break;
-
-                if ((ent & mask) == match)
-                        break;
-
-                nom++;
-        }
-
-        return ent;
-}
-
-static u32
-get_asd(struct si_pub *sih, u32 __iomem **eromptr, uint sp, uint ad, uint st,
-        u32 *addrl, u32 *addrh, u32 *sizel, u32 *sizeh)
-{
-        u32 asd, sz, szd;
-
-        asd = get_erom_ent(sih, eromptr, ER_VALID, ER_VALID);
-        if (((asd & ER_TAG1) != ER_ADD) ||
-            (((asd & AD_SP_MASK) >> AD_SP_SHIFT) != sp) ||
-            ((asd & AD_ST_MASK) != st)) {
-                /* This is not what we want, "push" it back */
-                (*eromptr)--;
-                return 0;
-        }
-        *addrl = asd & AD_ADDR_MASK;
-        if (asd & AD_AG32)
-                *addrh = get_erom_ent(sih, eromptr, 0, 0);
-        else
-                *addrh = 0;
-        *sizeh = 0;
-        sz = asd & AD_SZ_MASK;
-        if (sz == AD_SZ_SZD) {
-                szd = get_erom_ent(sih, eromptr, 0, 0);
-                *sizel = szd & SD_SZ_MASK;
-                if (szd & SD_SG32)
-                        *sizeh = get_erom_ent(sih, eromptr, 0, 0);
-        } else
-                *sizel = AD_SZ_BASE << (sz >> AD_SZ_SHIFT);
-
-        return asd;
-}
-
-static void ai_hwfixup(struct si_info *sii)
-{
-}
-
-/* parse the enumeration rom to identify all cores */
-static void ai_scan(struct si_pub *sih, struct chipcregs __iomem *cc)
-{
-        struct si_info *sii = (struct si_info *)sih;
-
-        u32 erombase;
-        u32 __iomem *eromptr, *eromlim;
-        void __iomem *regs = cc;
-
-        erombase = R_REG(&cc->eromptr);
-
-        /* Set wrappers address */
-        sii->curwrap = (void *)((unsigned long)cc + SI_CORE_SIZE);
-
-        /* Now point the window at the erom */
-        pci_write_config_dword(sii->pbus, PCI_BAR0_WIN, erombase);
-        eromptr = regs;
-        eromlim = eromptr + (ER_REMAPCONTROL / sizeof(u32));
-
-        while (eromptr < eromlim) {
-                u32 cia, cib, cid, mfg, crev, nmw, nsw, nmp, nsp;
-                u32 mpd, asd, addrl, addrh, sizel, sizeh;
-                u32 __iomem *base;
-                uint i, j, idx;
-                bool br;
-
-                br = false;
-
-                /* Grok a component */
-                cia = get_erom_ent(sih, &eromptr, ER_TAG, ER_CI);
-                if (cia == (ER_END | ER_VALID)) {
-                        /*  Found END of erom */
-                        ai_hwfixup(sii);
-                        return;
-                }
-                base = eromptr - 1;
-                cib = get_erom_ent(sih, &eromptr, 0, 0);
-
-                if ((cib & ER_TAG) != ER_CI) {
-                        /* CIA not followed by CIB */
-                        goto error;
-                }
-
-                cid = (cia & CIA_CID_MASK) >> CIA_CID_SHIFT;
-                mfg = (cia & CIA_MFG_MASK) >> CIA_MFG_SHIFT;
-                crev = (cib & CIB_REV_MASK) >> CIB_REV_SHIFT;
-                nmw = (cib & CIB_NMW_MASK) >> CIB_NMW_SHIFT;
-                nsw = (cib & CIB_NSW_MASK) >> CIB_NSW_SHIFT;
-                nmp = (cib & CIB_NMP_MASK) >> CIB_NMP_SHIFT;
-                nsp = (cib & CIB_NSP_MASK) >> CIB_NSP_SHIFT;
-
-                if (((mfg == MFGID_ARM) && (cid == DEF_AI_COMP)) || (nsp == 0))
-                        continue;
-                if ((nmw + nsw == 0)) {
-                        /* A component which is not a core */
-                        if (cid == OOB_ROUTER_CORE_ID) {
-                                asd = get_asd(sih, &eromptr, 0, 0, AD_ST_SLAVE,
-                                              &addrl, &addrh, &sizel, &sizeh);
-                                if (asd != 0)
-                                        sii->oob_router = addrl;
-                        }
-                        continue;
-                }
-
-                idx = sii->numcores;
-/*              sii->eromptr[idx] = base; */
-                sii->cia[idx] = cia;
-                sii->cib[idx] = cib;
-                sii->coreid[idx] = cid;
-
-                for (i = 0; i < nmp; i++) {
-                        mpd = get_erom_ent(sih, &eromptr, ER_VALID, ER_VALID);
-                        if ((mpd & ER_TAG) != ER_MP) {
-                                /* Not enough MP entries for component */
-                                goto error;
-                        }
-                }
-
-                /* First Slave Address Descriptor should be port 0:
-                 * the main register space for the core
-                 */
-                asd =
-                    get_asd(sih, &eromptr, 0, 0, AD_ST_SLAVE, &addrl, &addrh,
-                            &sizel, &sizeh);
-                if (asd == 0) {
-                        /* Try again to see if it is a bridge */
-                        asd =
-                            get_asd(sih, &eromptr, 0, 0, AD_ST_BRIDGE, &addrl,
-                                    &addrh, &sizel, &sizeh);
-                        if (asd != 0)
-                                br = true;
-                        else if ((addrh != 0) || (sizeh != 0)
-                                 || (sizel != SI_CORE_SIZE)) {
-                                /* First Slave ASD for core malformed */
-                                goto error;
-                        }
-                }
-                sii->coresba[idx] = addrl;
-                sii->coresba_size[idx] = sizel;
-                /* Get any more ASDs in port 0 */
-                j = 1;
-                do {
-                        asd =
-                            get_asd(sih, &eromptr, 0, j, AD_ST_SLAVE, &addrl,
-                                    &addrh, &sizel, &sizeh);
-                        if ((asd != 0) && (j == 1) && (sizel == SI_CORE_SIZE)) {
-                                sii->coresba2[idx] = addrl;
-                                sii->coresba2_size[idx] = sizel;
-                        }
-                        j++;
-                } while (asd != 0);
-
-                /* Go through the ASDs for other slave ports */
-                for (i = 1; i < nsp; i++) {
-                        j = 0;
-                        do {
-                                asd =
-                                    get_asd(sih, &eromptr, i, j++, AD_ST_SLAVE,
-                                            &addrl, &addrh, &sizel, &sizeh);
-                        } while (asd != 0);
-                        if (j == 0) {
-                                /* SP has no address descriptors */
-                                goto error;
-                        }
-                }
-
-                /* Now get master wrappers */
-                for (i = 0; i < nmw; i++) {
-                        asd =
-                            get_asd(sih, &eromptr, i, 0, AD_ST_MWRAP, &addrl,
-                                    &addrh, &sizel, &sizeh);
-                        if (asd == 0) {
-                                /* Missing descriptor for MW */
-                                goto error;
-                        }
-                        if ((sizeh != 0) || (sizel != SI_CORE_SIZE)) {
-                                /* Master wrapper %d is not 4KB */
-                                goto error;
-                        }
-                        if (i == 0)
-                                sii->wrapba[idx] = addrl;
-                }
-
-                /* And finally slave wrappers */
-                for (i = 0; i < nsw; i++) {
-                        uint fwp = (nsp == 1) ? 0 : 1;
-                        asd =
-                            get_asd(sih, &eromptr, fwp + i, 0, AD_ST_SWRAP,
-                                    &addrl, &addrh, &sizel, &sizeh);
-                        if (asd == 0) {
-                                /* Missing descriptor for SW */
-                                goto error;
-                        }
-                        if ((sizeh != 0) || (sizel != SI_CORE_SIZE)) {
-                                /* Slave wrapper is not 4KB */
-                                goto error;
-                        }
-                        if ((nmw == 0) && (i == 0))
-                                sii->wrapba[idx] = addrl;
-                }
-
-                /* Don't record bridges */
-                if (br)
-                        continue;
-
-                /* Done with core */
-                sii->numcores++;
-        }
-
- error:
-        /* Reached end of erom without finding END */
-        sii->numcores = 0;
-        return;
-}
-
-/*
- * This function changes the logical "focus" to the indicated core.
- * Return the current core's virtual address. Since each core starts with the
- * same set of registers (BIST, clock control, etc), the returned address
- * contains the first register of this 'common' register block (not to be
- * confused with 'common core').
- */
-void __iomem *ai_setcoreidx(struct si_pub *sih, uint coreidx)
-{
-        struct si_info *sii = (struct si_info *)sih;
-        u32 addr = sii->coresba[coreidx];
-        u32 wrap = sii->wrapba[coreidx];
-
-        if (coreidx >= sii->numcores)
-                return NULL;
-
-        /* point bar0 window */
-        pci_write_config_dword(sii->pbus, PCI_BAR0_WIN, addr);
-        /* point bar0 2nd 4KB window */
-        pci_write_config_dword(sii->pbus, PCI_BAR0_WIN2, wrap);
-        sii->curidx = coreidx;
-
-        return sii->curmap;
-}
-
-/* Return the number of address spaces in current core */
-int ai_numaddrspaces(struct si_pub *sih)
-{
-        return 2;
-}
-
-/* Return the address of the nth address space in the current core */
-u32 ai_addrspace(struct si_pub *sih, uint asidx)
-{
-        struct si_info *sii;
-        uint cidx;
-
-        sii = (struct si_info *)sih;
-        cidx = sii->curidx;
-
-        if (asidx == 0)
-                return sii->coresba[cidx];
-        else if (asidx == 1)
-                return sii->coresba2[cidx];
-        else {
-                /* Need to parse the erom again to find addr space */
-                return 0;
-        }
-}
-
-/* Return the size of the nth address space in the current core */
-u32 ai_addrspacesize(struct si_pub *sih, uint asidx)
-{
-        struct si_info *sii;
-        uint cidx;
-
-        sii = (struct si_info *)sih;
-        cidx = sii->curidx;
-
-        if (asidx == 0)
-                return sii->coresba_size[cidx];
-        else if (asidx == 1)
-                return sii->coresba2_size[cidx];
-        else {
-                /* Need to parse the erom again to find addr */
-                return 0;
-        }
-}
-
-uint ai_flag(struct si_pub *sih)
-{
-        struct si_info *sii;
-        struct aidmp *ai;
-
-        sii = (struct si_info *)sih;
-        ai = sii->curwrap;
-
-        return R_REG(&ai->oobselouta30) & 0x1f;
-}
-
-void ai_setint(struct si_pub *sih, int siflag)
-{
-}
-
-uint ai_corevendor(struct si_pub *sih)
-{
-        struct si_info *sii;
-        u32 cia;
-
-        sii = (struct si_info *)sih;
-        cia = sii->cia[sii->curidx];
-        return (cia & CIA_MFG_MASK) >> CIA_MFG_SHIFT;
-}
-
-uint ai_corerev(struct si_pub *sih)
-{
-        struct si_info *sii;
-        u32 cib;
-
-        sii = (struct si_info *)sih;
-        cib = sii->cib[sii->curidx];
-        return (cib & CIB_REV_MASK) >> CIB_REV_SHIFT;
-}
-
-bool ai_iscoreup(struct si_pub *sih)
-{
-        struct si_info *sii;
-        struct aidmp *ai;
-
-        sii = (struct si_info *)sih;
-        ai = sii->curwrap;
-
-        return (((R_REG(&ai->ioctrl) & (SICF_FGC | SICF_CLOCK_EN)) ==
-                 SICF_CLOCK_EN)
-                && ((R_REG(&ai->resetctrl) & AIRC_RESET) == 0));
-}
-
-void ai_core_cflags_wo(struct si_pub *sih, u32 mask, u32 val)
-{
-        struct si_info *sii;
-        struct aidmp *ai;
-        u32 w;
-
-        sii = (struct si_info *)sih;
-
-        ai = sii->curwrap;
-
-        if (mask || val) {
-                w = ((R_REG(&ai->ioctrl) & ~mask) | val);
-                W_REG(&ai->ioctrl, w);
-        }
-}
-
-u32 ai_core_cflags(struct si_pub *sih, u32 mask, u32 val)
-{
-        struct si_info *sii;
-        struct aidmp *ai;
-        u32 w;
-
-        sii = (struct si_info *)sih;
-        ai = sii->curwrap;
-
-        if (mask || val) {
-                w = ((R_REG(&ai->ioctrl) & ~mask) | val);
-                W_REG(&ai->ioctrl, w);
-        }
-
-        return R_REG(&ai->ioctrl);
-}
-
 /* return true if PCIE capability exists in the pci config space */
 static bool ai_ispcie(struct si_info *sii)
 {
         u8 cap_ptr;
 
         cap_ptr =
-            pcicore_find_pci_capability(sii->pbus, PCI_CAP_ID_EXP, NULL,
+            pcicore_find_pci_capability(sii->pcibus, PCI_CAP_ID_EXP, NULL,
                                         NULL);
         if (!cap_ptr)
                 return false;
@@ -896,117 +476,69 @@ static bool ai_buscore_prep(struct si_info *sii)
         return true;
 }
 
-u32 ai_core_sflags(struct si_pub *sih, u32 mask, u32 val)
-{
-        struct si_info *sii;
-        struct aidmp *ai;
-        u32 w;
-
-        sii = (struct si_info *)sih;
-        ai = sii->curwrap;
-
-        if (mask || val) {
-                w = ((R_REG(&ai->iostatus) & ~mask) | val);
-                W_REG(&ai->iostatus, w);
-        }
-
-        return R_REG(&ai->iostatus);
-}
-
 static bool
-ai_buscore_setup(struct si_info *sii, u32 savewin, uint *origidx)
+ai_buscore_setup(struct si_info *sii, struct bcma_device *cc)
 {
-        bool pci, pcie;
-        uint i;
-        uint pciidx, pcieidx, pcirev, pcierev;
-        struct chipcregs __iomem *cc;
+        struct bcma_device *pci = NULL;
+        struct bcma_device *pcie = NULL;
+        struct bcma_device *core;
 
-        cc = ai_setcoreidx(&sii->pub, SI_CC_IDX);
+
+        /* no cores found, bail out */
+        if (cc->bus->nr_cores == 0)
+                return false;
 
         /* get chipcommon rev */
-        sii->pub.ccrev = (int)ai_corerev(&sii->pub);
+        sii->pub.ccrev = cc->id.rev;
 
         /* get chipcommon chipstatus */
-        if (sii->pub.ccrev >= 11)
-                sii->pub.chipst = R_REG(&cc->chipstatus);
+        if (ai_get_ccrev(&sii->pub) >= 11)
+                sii->chipst = bcma_read32(cc, CHIPCREGOFFS(chipstatus));
 
         /* get chipcommon capabilites */
-        sii->pub.cccaps = R_REG(&cc->capabilities);
-        /* get chipcommon extended capabilities */
-
-        if (sii->pub.ccrev >= 35)
-                sii->pub.cccaps_ext = R_REG(&cc->capabilities_ext);
+        sii->pub.cccaps = bcma_read32(cc, CHIPCREGOFFS(capabilities));
 
         /* get pmu rev and caps */
-        if (sii->pub.cccaps & CC_CAP_PMU) {
-                sii->pub.pmucaps = R_REG(&cc->pmucapabilities);
+        if (ai_get_cccaps(&sii->pub) & CC_CAP_PMU) {
+                sii->pub.pmucaps = bcma_read32(cc,
+                                               CHIPCREGOFFS(pmucapabilities));
                 sii->pub.pmurev = sii->pub.pmucaps & PCAP_REV_MASK;
         }
 
-        /* figure out bus/orignal core idx */
-        sii->pub.buscoretype = NODEV_CORE_ID;
-        sii->pub.buscorerev = NOREV;
-        sii->pub.buscoreidx = BADIDX;
-
-        pci = pcie = false;
-        pcirev = pcierev = NOREV;
-        pciidx = pcieidx = BADIDX;
-
-        for (i = 0; i < sii->numcores; i++) {
+        /* figure out buscore */
+        list_for_each_entry(core, &cc->bus->cores, list) {
                 uint cid, crev;
 
-                ai_setcoreidx(&sii->pub, i);
-                cid = ai_coreid(&sii->pub);
-                crev = ai_corerev(&sii->pub);
+                cid = core->id.id;
+                crev = core->id.rev;
 
                 if (cid == PCI_CORE_ID) {
-                        pciidx = i;
-                        pcirev = crev;
-                        pci = true;
+                        pci = core;
                 } else if (cid == PCIE_CORE_ID) {
-                        pcieidx = i;
-                        pcierev = crev;
-                        pcie = true;
+                        pcie = core;
                 }
-
-                /* find the core idx before entering this func. */
-                if ((savewin && (savewin == sii->coresba[i])) ||
-                    (cc == sii->regs[i]))
-                        *origidx = i;
         }
 
         if (pci && pcie) {
                 if (ai_ispcie(sii))
-                        pci = false;
+                        pci = NULL;
                 else
-                        pcie = false;
+                        pcie = NULL;
         }
         if (pci) {
-                sii->pub.buscoretype = PCI_CORE_ID;
-                sii->pub.buscorerev = pcirev;
-                sii->pub.buscoreidx = pciidx;
+                sii->buscore = pci;
         } else if (pcie) {
-                sii->pub.buscoretype = PCIE_CORE_ID;
-                sii->pub.buscorerev = pcierev;
-                sii->pub.buscoreidx = pcieidx;
+                sii->buscore = pcie;
         }
 
         /* fixup necessary chip/core configurations */
-        if (SI_FAST(sii)) {
-                if (!sii->pch) {
-                        sii->pch = pcicore_init(&sii->pub, sii->pbus,
-                                                (__iomem void *)PCIEREGS(sii));
-                        if (sii->pch == NULL)
-                                return false;
-                }
+        if (!sii->pch) {
+                sii->pch = pcicore_init(&sii->pub, sii->icbus->drv_pci.core);
+                if (sii->pch == NULL)
+                        return false;
         }
-        if (ai_pci_fixcfg(&sii->pub)) {
-                /* si_doattach: si_pci_fixcfg failed */
+        if (ai_pci_fixcfg(&sii->pub))
                 return false;
-        }
-
-        /* return to the original core */
-        ai_setcoreidx(&sii->pub, *origidx);
 
         return true;
 }
@@ -1019,39 +551,27 @@ static __used void ai_nvram_process(struct si_info *sii)
         uint w = 0;
 
         /* do a pci config read to get subsystem id and subvendor id */
-        pci_read_config_dword(sii->pbus, PCI_SUBSYSTEM_VENDOR_ID, &w);
+        pci_read_config_dword(sii->pcibus, PCI_SUBSYSTEM_VENDOR_ID, &w);
 
         sii->pub.boardvendor = w & 0xffff;
         sii->pub.boardtype = (w >> 16) & 0xffff;
-        sii->pub.boardflags = getintvar(&sii->pub, BRCMS_SROM_BOARDFLAGS);
 }
 
 static struct si_info *ai_doattach(struct si_info *sii,
-                                   void __iomem *regs, struct pci_dev *pbus)
+                                   struct bcma_bus *pbus)
 {
         struct si_pub *sih = &sii->pub;
         u32 w, savewin;
-        struct chipcregs __iomem *cc;
+        struct bcma_device *cc;
         uint socitype;
-        uint origidx;
-
-        memset((unsigned char *) sii, 0, sizeof(struct si_info));
 
         savewin = 0;
 
-        sih->buscoreidx = BADIDX;
-
-        sii->curmap = regs;
-        sii->pbus = pbus;
+        sii->icbus = pbus;
+        sii->pcibus = pbus->host_pci;
 
-        /* find Chipcommon address */
-        pci_read_config_dword(sii->pbus, PCI_BAR0_WIN, &savewin);
-        if (!GOODCOREADDR(savewin, SI_ENUM_BASE))
-                savewin = SI_ENUM_BASE;
-
-        pci_write_config_dword(sii->pbus, PCI_BAR0_WIN,
-                               SI_ENUM_BASE);
-        cc = (struct chipcregs __iomem *) regs;
+        /* switch to Chipcommon core */
+        cc = pbus->drv_cc.core;
 
         /* bus/core/clk setup for register access */
         if (!ai_buscore_prep(sii))
@@ -1064,89 +584,69 @@ static struct si_info *ai_doattach(struct si_info *sii,
          *   hosts w/o chipcommon), some way of recognizing them needs to
          *   be added here.
          */
-        w = R_REG(&cc->chipid);
+        w = bcma_read32(cc, CHIPCREGOFFS(chipid));
         socitype = (w & CID_TYPE_MASK) >> CID_TYPE_SHIFT;
         /* Might as wll fill in chip id rev & pkg */
         sih->chip = w & CID_ID_MASK;
         sih->chiprev = (w & CID_REV_MASK) >> CID_REV_SHIFT;
         sih->chippkg = (w & CID_PKG_MASK) >> CID_PKG_SHIFT;
 
-        sih->issim = false;
-
         /* scan for cores */
-        if (socitype == SOCI_AI) {
-                SI_MSG("Found chip type AI (0x%08x)\n", w);
-                /* pass chipc address instead of original core base */
-                ai_scan(&sii->pub, cc);
-        } else {
-                /* Found chip of unknown type */
-                return NULL;
-        }
-        /* no cores found, bail out */
-        if (sii->numcores == 0)
+        if (socitype != SOCI_AI)
                 return NULL;
 
-        /* bus/core/clk setup */
-        origidx = SI_CC_IDX;
-        if (!ai_buscore_setup(sii, savewin, &origidx))
+        SI_MSG("Found chip type AI (0x%08x)\n", w);
+        if (!ai_buscore_setup(sii, cc))
                 goto exit;
 
         /* Init nvram from sprom/otp if they exist */
-        if (srom_var_init(&sii->pub, cc))
+        if (srom_var_init(&sii->pub))
                 goto exit;
 
         ai_nvram_process(sii);
 
         /* === NVRAM, clock is ready === */
-        cc = (struct chipcregs __iomem *) ai_setcore(sih, CC_CORE_ID, 0);
-        W_REG(&cc->gpiopullup, 0);
-        W_REG(&cc->gpiopulldown, 0);
-        ai_setcoreidx(sih, origidx);
+        bcma_write32(cc, CHIPCREGOFFS(gpiopullup), 0);
+        bcma_write32(cc, CHIPCREGOFFS(gpiopulldown), 0);
 
         /* PMU specific initializations */
-        if (sih->cccaps & CC_CAP_PMU) {
-                u32 xtalfreq;
+        if (ai_get_cccaps(sih) & CC_CAP_PMU) {
                 si_pmu_init(sih);
-                si_pmu_chip_init(sih);
-
-                xtalfreq = si_pmu_measure_alpclk(sih);
-                si_pmu_pll_init(sih, xtalfreq);
+                (void)si_pmu_measure_alpclk(sih);
                 si_pmu_res_init(sih);
-                si_pmu_swreg_init(sih);
         }
 
         /* setup the GPIO based LED powersave register */
         w = getintvar(sih, BRCMS_SROM_LEDDC);
         if (w == 0)
                 w = DEFAULT_GPIOTIMERVAL;
-        ai_corereg(sih, SI_CC_IDX, offsetof(struct chipcregs, gpiotimerval),
-                   ~0, w);
+        ai_cc_reg(sih, offsetof(struct chipcregs, gpiotimerval),
+                  ~0, w);
 
-        if (PCIE(sii))
+        if (PCIE(sih))
                 pcicore_attach(sii->pch, SI_DOATTACH);
 
-        if (sih->chip == BCM43224_CHIP_ID) {
+        if (ai_get_chip_id(sih) == BCM43224_CHIP_ID) {
                 /*
                  * enable 12 mA drive strenth for 43224 and
                  * set chipControl register bit 15
                  */
-                if (sih->chiprev == 0) {
+                if (ai_get_chiprev(sih) == 0) {
                         SI_MSG("Applying 43224A0 WARs\n");
-                        ai_corereg(sih, SI_CC_IDX,
-                                   offsetof(struct chipcregs, chipcontrol),
-                                   CCTRL43224_GPIO_TOGGLE,
-                                   CCTRL43224_GPIO_TOGGLE);
+                        ai_cc_reg(sih, offsetof(struct chipcregs, chipcontrol),
+                                  CCTRL43224_GPIO_TOGGLE,
+                                  CCTRL43224_GPIO_TOGGLE);
                         si_pmu_chipcontrol(sih, 0, CCTRL_43224A0_12MA_LED_DRIVE,
                                            CCTRL_43224A0_12MA_LED_DRIVE);
                 }
-                if (sih->chiprev >= 1) {
+                if (ai_get_chiprev(sih) >= 1) {
                         SI_MSG("Applying 43224B0+ WARs\n");
                         si_pmu_chipcontrol(sih, 0, CCTRL_43224B0_12MA_LED_DRIVE,
                                            CCTRL_43224B0_12MA_LED_DRIVE);
                 }
         }
 
-        if (sih->chip == BCM4313_CHIP_ID) {
+        if (ai_get_chip_id(sih) == BCM4313_CHIP_ID) {
                 /*
                  * enable 12 mA drive strenth for 4313 and
                  * set chipControl register bit 1
@@ -1167,22 +667,19 @@ static struct si_info *ai_doattach(struct si_info *sii,
 }
 
 /*
- * Allocate a si handle.
- * devid - pci device id (used to determine chip#)
- * osh - opaque OS handle
- * regs - virtual address of initial core registers
+ * Allocate a si handle and do the attach.
  */
 struct si_pub *
-ai_attach(void __iomem *regs, struct pci_dev *sdh)
+ai_attach(struct bcma_bus *pbus)
 {
         struct si_info *sii;
 
         /* alloc struct si_info */
-        sii = kmalloc(sizeof(struct si_info), GFP_ATOMIC);
+        sii = kzalloc(sizeof(struct si_info), GFP_ATOMIC);
         if (sii == NULL)
                 return NULL;
 
-        if (ai_doattach(sii, regs, sdh) == NULL) {
+        if (ai_doattach(sii, pbus) == NULL) {
                 kfree(sii);
                 return NULL;
         }
@@ -1211,292 +708,66 @@ void ai_detach(struct si_pub *sih)
         kfree(sii);
 }
 
-/* register driver interrupt disabling and restoring callback functions */
-void
-ai_register_intr_callback(struct si_pub *sih, void *intrsoff_fn,
-                          void *intrsrestore_fn,
-                          void *intrsenabled_fn, void *intr_arg)
-{
-        struct si_info *sii;
-
-        sii = (struct si_info *)sih;
-        sii->intr_arg = intr_arg;
-        sii->intrsoff_fn = (u32 (*)(void *)) intrsoff_fn;
-        sii->intrsrestore_fn = (void (*) (void *, u32)) intrsrestore_fn;
-        sii->intrsenabled_fn = (bool (*)(void *)) intrsenabled_fn;
-        /* save current core id.  when this function called, the current core
-         * must be the core which provides driver functions(il, et, wl, etc.)
-         */
-        sii->dev_coreid = sii->coreid[sii->curidx];
-}
-
-void ai_deregister_intr_callback(struct si_pub *sih)
-{
-        struct si_info *sii;
-
-        sii = (struct si_info *)sih;
-        sii->intrsoff_fn = NULL;
-}
-
-uint ai_coreid(struct si_pub *sih)
-{
-        struct si_info *sii;
-
-        sii = (struct si_info *)sih;
-        return sii->coreid[sii->curidx];
-}
-
-uint ai_coreidx(struct si_pub *sih)
-{
-        struct si_info *sii;
-
-        sii = (struct si_info *)sih;
-        return sii->curidx;
-}
-
-bool ai_backplane64(struct si_pub *sih)
-{
-        return (sih->cccaps & CC_CAP_BKPLN64) != 0;
-}
-
 /* return index of coreid or BADIDX if not found */
-uint ai_findcoreidx(struct si_pub *sih, uint coreid, uint coreunit)
+struct bcma_device *ai_findcore(struct si_pub *sih, u16 coreid, u16 coreunit)
 {
+        struct bcma_device *core;
         struct si_info *sii;
         uint found;
-        uint i;
 
         sii = (struct si_info *)sih;
 
         found = 0;
 
-        for (i = 0; i < sii->numcores; i++)
-                if (sii->coreid[i] == coreid) {
+        list_for_each_entry(core, &sii->icbus->cores, list)
+                if (core->id.id == coreid) {
                         if (found == coreunit)
-                                return i;
+                                return core;
                         found++;
                 }
 
-        return BADIDX;
-}
-
-/*
- * This function changes logical "focus" to the indicated core;
- * must be called with interrupts off.
- * Moreover, callers should keep interrupts off during switching
- * out of and back to d11 core.
- */
-void __iomem *ai_setcore(struct si_pub *sih, uint coreid, uint coreunit)
-{
-        uint idx;
-
-        idx = ai_findcoreidx(sih, coreid, coreunit);
-        if (idx >= SI_MAXCORES)
-                return NULL;
-
-        return ai_setcoreidx(sih, idx);
-}
-
-/* Turn off interrupt as required by ai_setcore, before switch core */
-void __iomem *ai_switch_core(struct si_pub *sih, uint coreid, uint *origidx,
-                             uint *intr_val)
-{
-        void __iomem *cc;
-        struct si_info *sii;
-
-        sii = (struct si_info *)sih;
-
-        if (SI_FAST(sii)) {
-                /* Overloading the origidx variable to remember the coreid,
-                 * this works because the core ids cannot be confused with
-                 * core indices.
-                 */
-                *origidx = coreid;
-                if (coreid == CC_CORE_ID)
-                        return CCREGS_FAST(sii);
-                else if (coreid == sih->buscoretype)
-                        return PCIEREGS(sii);
-        }
-        INTR_OFF(sii, *intr_val);
-        *origidx = sii->curidx;
-        cc = ai_setcore(sih, coreid, 0);
-        return cc;
-}
-
-/* restore coreidx and restore interrupt */
-void ai_restore_core(struct si_pub *sih, uint coreid, uint intr_val)
-{
-        struct si_info *sii;
-
-        sii = (struct si_info *)sih;
-        if (SI_FAST(sii)
-            && ((coreid == CC_CORE_ID) || (coreid == sih->buscoretype)))
-                return;
-
-        ai_setcoreidx(sih, coreid);
-        INTR_RESTORE(sii, intr_val);
-}
-
-void ai_write_wrapperreg(struct si_pub *sih, u32 offset, u32 val)
-{
-        struct si_info *sii = (struct si_info *)sih;
-        u32 *w = (u32 *) sii->curwrap;
-        W_REG(w + (offset / 4), val);
-        return;
+        return NULL;
 }
 
 /*
- * Switch to 'coreidx', issue a single arbitrary 32bit register mask&set
- * operation, switch back to the original core, and return the new value.
- *
- * When using the silicon backplane, no fiddling with interrupts or core
- * switches is needed.
- *
- * Also, when using pci/pcie, we can optimize away the core switching for pci
- * registers and (on newer pci cores) chipcommon registers.
+ * read/modify chipcommon core register.
  */
-uint ai_corereg(struct si_pub *sih, uint coreidx, uint regoff, uint mask,
-                uint val)
+uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val)
 {
-        uint origidx = 0;
-        u32 __iomem *r = NULL;
-        uint w;
-        uint intr_val = 0;
-        bool fast = false;
+        struct bcma_device *cc;
+        u32 w;
         struct si_info *sii;
 
         sii = (struct si_info *)sih;
-
-        if (coreidx >= SI_MAXCORES)
-                return 0;
-
-        /*
-         * If pci/pcie, we can get at pci/pcie regs
-         * and on newer cores to chipc
-         */
-        if ((sii->coreid[coreidx] == CC_CORE_ID) && SI_FAST(sii)) {
-                /* Chipc registers are mapped at 12KB */
-                fast = true;
-                r = (u32 __iomem *)((__iomem char *)sii->curmap +
-                                    PCI_16KB0_CCREGS_OFFSET + regoff);
-        } else if (sii->pub.buscoreidx == coreidx) {
-                /*
-                 * pci registers are at either in the last 2KB of
-                 * an 8KB window or, in pcie and pci rev 13 at 8KB
-                 */
-                fast = true;
-                if (SI_FAST(sii))
-                        r = (u32 __iomem *)((__iomem char *)sii->curmap +
-                                    PCI_16KB0_PCIREGS_OFFSET + regoff);
-                else
-                        r = (u32 __iomem *)((__iomem char *)sii->curmap +
-                                    ((regoff >= SBCONFIGOFF) ?
-                                      PCI_BAR0_PCISBR_OFFSET :
-                                      PCI_BAR0_PCIREGS_OFFSET) + regoff);
-        }
-
-        if (!fast) {
-                INTR_OFF(sii, intr_val);
-
-                /* save current core index */
-                origidx = ai_coreidx(&sii->pub);
-
-                /* switch core */
-                r = (u32 __iomem *) ((unsigned char __iomem *)
-                        ai_setcoreidx(&sii->pub, coreidx) + regoff);
-        }
+        cc = sii->icbus->drv_cc.core;
 
         /* mask and set */
         if (mask || val) {
-                w = (R_REG(r) & ~mask) | val;
-                W_REG(r, w);
+                bcma_maskset32(cc, regoff, ~mask, val);
         }
 
         /* readback */
-        w = R_REG(r);
-
-        if (!fast) {
-                /* restore core index */
-                if (origidx != coreidx)
-                        ai_setcoreidx(&sii->pub, origidx);
-
-                INTR_RESTORE(sii, intr_val);
-        }
+        w = bcma_read32(cc, regoff);
 
         return w;
 }
 
-void ai_core_disable(struct si_pub *sih, u32 bits)
-{
-        struct si_info *sii;
-        u32 dummy;
-        struct aidmp *ai;
-
-        sii = (struct si_info *)sih;
-
-        ai = sii->curwrap;
-
-        /* if core is already in reset, just return */
-        if (R_REG(&ai->resetctrl) & AIRC_RESET)
-                return;
-
-        W_REG(&ai->ioctrl, bits);
-        dummy = R_REG(&ai->ioctrl);
-        udelay(10);
-
-        W_REG(&ai->resetctrl, AIRC_RESET);
-        udelay(1);
-}
-
-/* reset and re-enable a core
- * inputs:
- * bits - core specific bits that are set during and after reset sequence
- * resetbits - core specific bits that are set only during reset sequence
- */
-void ai_core_reset(struct si_pub *sih, u32 bits, u32 resetbits)
-{
-        struct si_info *sii;
-        struct aidmp *ai;
-        u32 dummy;
-
-        sii = (struct si_info *)sih;
-        ai = sii->curwrap;
-
-        /*
-         * Must do the disable sequence first to work
-         * for arbitrary current core state.
-         */
-        ai_core_disable(sih, (bits | resetbits));
-
-        /*
-         * Now do the initialization sequence.
-         */
-        W_REG(&ai->ioctrl, (bits | SICF_FGC | SICF_CLOCK_EN));
-        dummy = R_REG(&ai->ioctrl);
-        W_REG(&ai->resetctrl, 0);
-        udelay(1);
-
-        W_REG(&ai->ioctrl, (bits | SICF_CLOCK_EN));
-        dummy = R_REG(&ai->ioctrl);
-        udelay(1);
-}
-
 /* return the slow clock source - LPO, XTAL, or PCI */
-static uint ai_slowclk_src(struct si_info *sii)
+static uint ai_slowclk_src(struct si_pub *sih, struct bcma_device *cc)
 {
-        struct chipcregs __iomem *cc;
+        struct si_info *sii;
         u32 val;
 
-        if (sii->pub.ccrev < 6) {
-                pci_read_config_dword(sii->pbus, PCI_GPIO_OUT,
+        sii = (struct si_info *)sih;
+        if (ai_get_ccrev(&sii->pub) < 6) {
+                pci_read_config_dword(sii->pcibus, PCI_GPIO_OUT,
                                       &val);
                 if (val & PCI_CFG_GPIO_SCS)
                         return SCC_SS_PCI;
                 return SCC_SS_XTAL;
-        } else if (sii->pub.ccrev < 10) {
-                cc = (struct chipcregs __iomem *)
-                        ai_setcoreidx(&sii->pub, sii->curidx);
-                return R_REG(&cc->slow_clk_ctl) & SCC_SS_MASK;
+        } else if (ai_get_ccrev(&sii->pub) < 10) {
+                return bcma_read32(cc, CHIPCREGOFFS(slow_clk_ctl)) &
+                       SCC_SS_MASK;
         } else                  /* Insta-clock */
                 return SCC_SS_XTAL;
 }
@@ -1505,24 +776,24 @@ static uint ai_slowclk_src(struct si_info *sii)
 * return the ILP (slowclock) min or max frequency
 * precondition: we've established the chip has dynamic clk control
 */
-static uint ai_slowclk_freq(struct si_info *sii, bool max_freq,
-                            struct chipcregs __iomem *cc)
+static uint ai_slowclk_freq(struct si_pub *sih, bool max_freq,
+                            struct bcma_device *cc)
 {
         u32 slowclk;
         uint div;
 
-        slowclk = ai_slowclk_src(sii);
-        if (sii->pub.ccrev < 6) {
+        slowclk = ai_slowclk_src(sih, cc);
+        if (ai_get_ccrev(sih) < 6) {
                 if (slowclk == SCC_SS_PCI)
                         return max_freq ? (PCIMAXFREQ / 64)
                                 : (PCIMINFREQ / 64);
                 else
                         return max_freq ? (XTALMAXFREQ / 32)
                                 : (XTALMINFREQ / 32);
-        } else if (sii->pub.ccrev < 10) {
+        } else if (ai_get_ccrev(sih) < 10) {
                 div = 4 *
-                    (((R_REG(&cc->slow_clk_ctl) & SCC_CD_MASK) >>
-                      SCC_CD_SHIFT) + 1);
+                    (((bcma_read32(cc, CHIPCREGOFFS(slow_clk_ctl)) &
+                      SCC_CD_MASK) >> SCC_CD_SHIFT) + 1);
                 if (slowclk == SCC_SS_LPO)
                         return max_freq ? LPOMAXFREQ : LPOMINFREQ;
                 else if (slowclk == SCC_SS_XTAL)
@@ -1533,15 +804,15 @@ static uint ai_slowclk_freq(struct si_info *sii, bool max_freq,
                                 : (PCIMINFREQ / div);
         } else {
                 /* Chipc rev 10 is InstaClock */
-                div = R_REG(&cc->system_clk_ctl) >> SYCC_CD_SHIFT;
-                div = 4 * (div + 1);
+                div = bcma_read32(cc, CHIPCREGOFFS(system_clk_ctl));
+                div = 4 * ((div >> SYCC_CD_SHIFT) + 1);
                 return max_freq ? XTALMAXFREQ : (XTALMINFREQ / div);
         }
         return 0;
 }
 
 static void
-ai_clkctl_setdelay(struct si_info *sii, struct chipcregs __iomem *cc)
+ai_clkctl_setdelay(struct si_pub *sih, struct bcma_device *cc)
 {
         uint slowmaxfreq, pll_delay, slowclk;
         uint pll_on_delay, fref_sel_delay;
@@ -1554,55 +825,40 @@ ai_clkctl_setdelay(struct si_info *sii, struct chipcregs __iomem *cc)
          * powered down by dynamic clk control logic.
          */
 
-        slowclk = ai_slowclk_src(sii);
+        slowclk = ai_slowclk_src(sih, cc);
         if (slowclk != SCC_SS_XTAL)
                 pll_delay += XTAL_ON_DELAY;
 
         /* Starting with 4318 it is ILP that is used for the delays */
         slowmaxfreq =
-            ai_slowclk_freq(sii, (sii->pub.ccrev >= 10) ? false : true, cc);
+            ai_slowclk_freq(sih,
+                            (ai_get_ccrev(sih) >= 10) ? false : true, cc);
 
         pll_on_delay = ((slowmaxfreq * pll_delay) + 999999) / 1000000;
         fref_sel_delay = ((slowmaxfreq * FREF_DELAY) + 999999) / 1000000;
 
-        W_REG(&cc->pll_on_delay, pll_on_delay);
-        W_REG(&cc->fref_sel_delay, fref_sel_delay);
+        bcma_write32(cc, CHIPCREGOFFS(pll_on_delay), pll_on_delay);
+        bcma_write32(cc, CHIPCREGOFFS(fref_sel_delay), fref_sel_delay);
 }
 
 /* initialize power control delay registers */
 void ai_clkctl_init(struct si_pub *sih)
 {
-        struct si_info *sii;
-        uint origidx = 0;
-        struct chipcregs __iomem *cc;
-        bool fast;
+        struct bcma_device *cc;
 
-        if (!(sih->cccaps & CC_CAP_PWR_CTL))
+        if (!(ai_get_cccaps(sih) & CC_CAP_PWR_CTL))
                 return;
 
-        sii = (struct si_info *)sih;
-        fast = SI_FAST(sii);
-        if (!fast) {
-                origidx = sii->curidx;
-                cc = (struct chipcregs __iomem *)
-                        ai_setcore(sih, CC_CORE_ID, 0);
-                if (cc == NULL)
-                        return;
-        } else {
-                cc = (struct chipcregs __iomem *) CCREGS_FAST(sii);
-                if (cc == NULL)
-                        return;
-        }
+        cc = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
+        if (cc == NULL)
+                return;
 
         /* set all Instaclk chip ILP to 1 MHz */
-        if (sih->ccrev >= 10)
-                SET_REG(&cc->system_clk_ctl, SYCC_CD_MASK,
-                        (ILP_DIV_1MHZ << SYCC_CD_SHIFT));
+        if (ai_get_ccrev(sih) >= 10)
+                bcma_maskset32(cc, CHIPCREGOFFS(system_clk_ctl), SYCC_CD_MASK,
+                               (ILP_DIV_1MHZ << SYCC_CD_SHIFT));
 
-        ai_clkctl_setdelay(sii, cc);
-
-        if (!fast)
-                ai_setcoreidx(sih, origidx);
+        ai_clkctl_setdelay(sih, cc);
 }
 
 /*
@@ -1612,47 +868,25 @@ void ai_clkctl_init(struct si_pub *sih)
 u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih)
 {
         struct si_info *sii;
-        uint origidx = 0;
-        struct chipcregs __iomem *cc;
+        struct bcma_device *cc;
         uint slowminfreq;
         u16 fpdelay;
-        uint intr_val = 0;
-        bool fast;
 
         sii = (struct si_info *)sih;
-        if (sih->cccaps & CC_CAP_PMU) {
-                INTR_OFF(sii, intr_val);
+        if (ai_get_cccaps(sih) & CC_CAP_PMU) {
                 fpdelay = si_pmu_fast_pwrup_delay(sih);
-                INTR_RESTORE(sii, intr_val);
                 return fpdelay;
         }
 
-        if (!(sih->cccaps & CC_CAP_PWR_CTL))
+        if (!(ai_get_cccaps(sih) & CC_CAP_PWR_CTL))
                 return 0;
 
-        fast = SI_FAST(sii);
         fpdelay = 0;
-        if (!fast) {
-                origidx = sii->curidx;
-                INTR_OFF(sii, intr_val);
-                cc = (struct chipcregs __iomem *)
-                        ai_setcore(sih, CC_CORE_ID, 0);
-                if (cc == NULL)
-                        goto done;
-        } else {
-                cc = (struct chipcregs __iomem *) CCREGS_FAST(sii);
-                if (cc == NULL)
-                        goto done;
-        }
-
-        slowminfreq = ai_slowclk_freq(sii, false, cc);
-        fpdelay = (((R_REG(&cc->pll_on_delay) + 2) * 1000000) +
-                   (slowminfreq - 1)) / slowminfreq;
-
- done:
-        if (!fast) {
-                ai_setcoreidx(sih, origidx);
-                INTR_RESTORE(sii, intr_val);
+        cc = ai_findcore(sih, CC_CORE_ID, 0);
+        if (cc) {
+                slowminfreq = ai_slowclk_freq(sih, false, cc);
+                fpdelay = (((bcma_read32(cc, CHIPCREGOFFS(pll_on_delay)) + 2)
+                            * 1000000) + (slowminfreq - 1)) / slowminfreq;
         }
         return fpdelay;
 }
@@ -1666,12 +900,12 @@ int ai_clkctl_xtal(struct si_pub *sih, uint what, bool on)
         sii = (struct si_info *)sih;
 
         /* pcie core doesn't have any mapping to control the xtal pu */
-        if (PCIE(sii))
+        if (PCIE(sih))
                 return -1;
 
-        pci_read_config_dword(sii->pbus, PCI_GPIO_IN, &in);
-        pci_read_config_dword(sii->pbus, PCI_GPIO_OUT, &out);
-        pci_read_config_dword(sii->pbus, PCI_GPIO_OUTEN, &outen);
+        pci_read_config_dword(sii->pcibus, PCI_GPIO_IN, &in);
+        pci_read_config_dword(sii->pcibus, PCI_GPIO_OUT, &out);
+        pci_read_config_dword(sii->pcibus, PCI_GPIO_OUTEN, &outen);
 
         /*
          * Avoid glitching the clock if GPRS is already using it.
@@ -1692,9 +926,9 @@ int ai_clkctl_xtal(struct si_pub *sih, uint what, bool on)
                         out |= PCI_CFG_GPIO_XTAL;
                         if (what & PLL)
                                 out |= PCI_CFG_GPIO_PLL;
-                        pci_write_config_dword(sii->pbus,
+                        pci_write_config_dword(sii->pcibus,
                                                PCI_GPIO_OUT, out);
-                        pci_write_config_dword(sii->pbus,
+                        pci_write_config_dword(sii->pcibus,
                                                PCI_GPIO_OUTEN, outen);
                         udelay(XTAL_ON_DELAY);
                 }
@@ -1702,7 +936,7 @@ int ai_clkctl_xtal(struct si_pub *sih, uint what, bool on)
                 /* turn pll on */
                 if (what & PLL) {
                         out &= ~PCI_CFG_GPIO_PLL;
-                        pci_write_config_dword(sii->pbus,
+                        pci_write_config_dword(sii->pcibus,
                                                PCI_GPIO_OUT, out);
                         mdelay(2);
                 }
@@ -1711,9 +945,9 @@ int ai_clkctl_xtal(struct si_pub *sih, uint what, bool on)
                         out &= ~PCI_CFG_GPIO_XTAL;
                 if (what & PLL)
                         out |= PCI_CFG_GPIO_PLL;
-                pci_write_config_dword(sii->pbus,
+                pci_write_config_dword(sii->pcibus,
                                        PCI_GPIO_OUT, out);
-                pci_write_config_dword(sii->pbus,
+                pci_write_config_dword(sii->pcibus,
                                        PCI_GPIO_OUTEN, outen);
         }
 
@@ -1723,63 +957,52 @@ int ai_clkctl_xtal(struct si_pub *sih, uint what, bool on)
 /* clk control mechanism through chipcommon, no policy checking */
 static bool _ai_clkctl_cc(struct si_info *sii, uint mode)
 {
-        uint origidx = 0;
-        struct chipcregs __iomem *cc;
+        struct bcma_device *cc;
         u32 scc;
-        uint intr_val = 0;
-        bool fast = SI_FAST(sii);
 
         /* chipcommon cores prior to rev6 don't support dynamic clock control */
-        if (sii->pub.ccrev < 6)
+        if (ai_get_ccrev(&sii->pub) < 6)
                 return false;
 
-        if (!fast) {
-                INTR_OFF(sii, intr_val);
-                origidx = sii->curidx;
-                cc = (struct chipcregs __iomem *)
-                                        ai_setcore(&sii->pub, CC_CORE_ID, 0);
-        } else {
-                cc = (struct chipcregs __iomem *) CCREGS_FAST(sii);
-                if (cc == NULL)
-                        goto done;
-        }
+        cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0);
 
-        if (!(sii->pub.cccaps & CC_CAP_PWR_CTL) && (sii->pub.ccrev < 20))
-                goto done;
+        if (!(ai_get_cccaps(&sii->pub) & CC_CAP_PWR_CTL) &&
+            (ai_get_ccrev(&sii->pub) < 20))
+                return mode == CLK_FAST;
 
         switch (mode) {
         case CLK_FAST:          /* FORCEHT, fast (pll) clock */
-                if (sii->pub.ccrev < 10) {
+                if (ai_get_ccrev(&sii->pub) < 10) {
                         /*
                          * don't forget to force xtal back
                          * on before we clear SCC_DYN_XTAL..
                          */
                         ai_clkctl_xtal(&sii->pub, XTAL, ON);
-                        SET_REG(&cc->slow_clk_ctl,
-                                (SCC_XC | SCC_FS | SCC_IP), SCC_IP);
-                } else if (sii->pub.ccrev < 20) {
-                        OR_REG(&cc->system_clk_ctl, SYCC_HR);
+                        bcma_maskset32(cc, CHIPCREGOFFS(slow_clk_ctl),
+                                       (SCC_XC | SCC_FS | SCC_IP), SCC_IP);
+                } else if (ai_get_ccrev(&sii->pub) < 20) {
+                        bcma_set32(cc, CHIPCREGOFFS(system_clk_ctl), SYCC_HR);
                 } else {
-                        OR_REG(&cc->clk_ctl_st, CCS_FORCEHT);
+                        bcma_set32(cc, CHIPCREGOFFS(clk_ctl_st), CCS_FORCEHT);
                 }
 
                 /* wait for the PLL */
-                if (sii->pub.cccaps & CC_CAP_PMU) {
+                if (ai_get_cccaps(&sii->pub) & CC_CAP_PMU) {
                         u32 htavail = CCS_HTAVAIL;
-                        SPINWAIT(((R_REG(&cc->clk_ctl_st) & htavail)
-                                  == 0), PMU_MAX_TRANSITION_DLY);
+                        SPINWAIT(((bcma_read32(cc, CHIPCREGOFFS(clk_ctl_st)) &
+                                   htavail) == 0), PMU_MAX_TRANSITION_DLY);
                 } else {
                         udelay(PLL_DELAY);
                 }
                 break;
 
         case CLK_DYNAMIC:       /* enable dynamic clock control */
-                if (sii->pub.ccrev < 10) {
-                        scc = R_REG(&cc->slow_clk_ctl);
+                if (ai_get_ccrev(&sii->pub) < 10) {
+                        scc = bcma_read32(cc, CHIPCREGOFFS(slow_clk_ctl));
                         scc &= ~(SCC_FS | SCC_IP | SCC_XC);
                         if ((scc & SCC_SS_MASK) != SCC_SS_XTAL)
                                 scc |= SCC_XC;
-                        W_REG(&cc->slow_clk_ctl, scc);
+                        bcma_write32(cc, CHIPCREGOFFS(slow_clk_ctl), scc);
 
                         /*
                          * for dynamic control, we have to
@@ -1787,11 +1010,11 @@ static bool _ai_clkctl_cc(struct si_info *sii, uint mode)
                          */
                         if (scc & SCC_XC)
                                 ai_clkctl_xtal(&sii->pub, XTAL, OFF);
-                } else if (sii->pub.ccrev < 20) {
+                } else if (ai_get_ccrev(&sii->pub) < 20) {
                         /* Instaclock */
-                        AND_REG(&cc->system_clk_ctl, ~SYCC_HR);
+                        bcma_mask32(cc, CHIPCREGOFFS(system_clk_ctl), ~SYCC_HR);
                 } else {
-                        AND_REG(&cc->clk_ctl_st, ~CCS_FORCEHT);
+                        bcma_mask32(cc, CHIPCREGOFFS(clk_ctl_st), ~CCS_FORCEHT);
                 }
                 break;
 
@@ -1799,11 +1022,6 @@ static bool _ai_clkctl_cc(struct si_info *sii, uint mode)
                 break;
         }
 
- done:
-        if (!fast) {
-                ai_setcoreidx(&sii->pub, origidx);
-                INTR_RESTORE(sii, intr_val);
-        }
         return mode == CLK_FAST;
 }
 
@@ -1822,46 +1040,25 @@ bool ai_clkctl_cc(struct si_pub *sih, uint mode)
         sii = (struct si_info *)sih;
 
         /* chipcommon cores prior to rev6 don't support dynamic clock control */
-        if (sih->ccrev < 6)
+        if (ai_get_ccrev(sih) < 6)
                 return false;
 
-        if (PCI_FORCEHT(sii))
+        if (PCI_FORCEHT(sih))
                 return mode == CLK_FAST;
 
         return _ai_clkctl_cc(sii, mode);
 }
 
-/* Build device path */
-int ai_devpath(struct si_pub *sih, char *path, int size)
-{
-        int slen;
-
-        if (!path || size <= 0)
-                return -1;
-
-        slen = snprintf(path, (size_t) size, "pci/%u/%u/",
-                ((struct si_info *)sih)->pbus->bus->number,
-                PCI_SLOT(((struct pci_dev *)
-                                (((struct si_info *)(sih))->pbus))->devfn));
-
-        if (slen < 0 || slen >= size) {
-                path[0] = '\0';
-                return -1;
-        }
-
-        return 0;
-}
-
 void ai_pci_up(struct si_pub *sih)
 {
         struct si_info *sii;
 
         sii = (struct si_info *)sih;
 
-        if (PCI_FORCEHT(sii))
+        if (PCI_FORCEHT(sih))
                 _ai_clkctl_cc(sii, CLK_FAST);
 
-        if (PCIE(sii))
+        if (PCIE(sih))
                 pcicore_up(sii->pch, SI_PCIUP);
 
 }
@@ -1884,7 +1081,7 @@ void ai_pci_down(struct si_pub *sih)
         sii = (struct si_info *)sih;
 
         /* release FORCEHT since chip is going to "down" state */
-        if (PCI_FORCEHT(sii))
+        if (PCI_FORCEHT(sih))
                 _ai_clkctl_cc(sii, CLK_DYNAMIC);
 
         pcicore_down(sii->pch, SI_PCIDOWN);
@@ -1897,42 +1094,23 @@ void ai_pci_down(struct si_pub *sih)
 void ai_pci_setup(struct si_pub *sih, uint coremask)
 {
         struct si_info *sii;
-        struct sbpciregs __iomem *regs = NULL;
-        u32 siflag = 0, w;
-        uint idx = 0;
+        u32 w;
 
         sii = (struct si_info *)sih;
 
-        if (PCI(sii)) {
-                /* get current core index */
-                idx = sii->curidx;
-
-                /* we interrupt on this backplane flag number */
-                siflag = ai_flag(sih);
-
-                /* switch over to pci core */
-                regs = ai_setcoreidx(sih, sii->pub.buscoreidx);
-        }
-
         /*
          * Enable sb->pci interrupts.  Assume
          * PCI rev 2.3 support was added in pci core rev 6 and things changed..
          */
-        if (PCIE(sii) || (PCI(sii) && ((sii->pub.buscorerev) >= 6))) {
+        if (PCIE(sih) || (PCI(sih) && (ai_get_buscorerev(sih) >= 6))) {
                 /* pci config write to set this core bit in PCIIntMask */
-                pci_read_config_dword(sii->pbus, PCI_INT_MASK, &w);
+                pci_read_config_dword(sii->pcibus, PCI_INT_MASK, &w);
                 w |= (coremask << PCI_SBIM_SHIFT);
-                pci_write_config_dword(sii->pbus, PCI_INT_MASK, w);
-        } else {
-                /* set sbintvec bit for our flag number */
-                ai_setint(sih, siflag);
+                pci_write_config_dword(sii->pcibus, PCI_INT_MASK, w);
         }
 
-        if (PCI(sii)) {
-                pcicore_pci_setup(sii->pch, regs);
-
-                /* switch back to previous core */
-                ai_setcoreidx(sih, idx);
+        if (PCI(sih)) {
+                pcicore_pci_setup(sii->pch);
         }
 }
 
@@ -1942,25 +1120,11 @@ void ai_pci_setup(struct si_pub *sih, uint coremask)
  */
 int ai_pci_fixcfg(struct si_pub *sih)
 {
-        uint origidx;
-        void __iomem *regs = NULL;
         struct si_info *sii = (struct si_info *)sih;
 
         /* Fixup PI in SROM shadow area to enable the correct PCI core access */
-        /* save the current index */
-        origidx = ai_coreidx(&sii->pub);
-
         /* check 'pi' is correct and fix it if not */
-        regs = ai_setcore(&sii->pub, sii->pub.buscoretype, 0);
-        if (sii->pub.buscoretype == PCIE_CORE_ID)
-                pcicore_fixcfg_pcie(sii->pch,
-                                    (struct sbpcieregs __iomem *)regs);
-        else if (sii->pub.buscoretype == PCI_CORE_ID)
-                pcicore_fixcfg_pci(sii->pch, (struct sbpciregs __iomem *)regs);
-
-        /* restore the original index */
-        ai_setcoreidx(&sii->pub, origidx);
-
+        pcicore_fixcfg(sii->pch);
         pcicore_hwup(sii->pch);
         return 0;
 }
@@ -1971,58 +1135,42 @@ u32 ai_gpiocontrol(struct si_pub *sih, u32 mask, u32 val, u8 priority)
         uint regoff;
 
         regoff = offsetof(struct chipcregs, gpiocontrol);
-        return ai_corereg(sih, SI_CC_IDX, regoff, mask, val);
+        return ai_cc_reg(sih, regoff, mask, val);
 }
 
 void ai_chipcontrl_epa4331(struct si_pub *sih, bool on)
 {
-        struct si_info *sii;
-        struct chipcregs __iomem *cc;
-        uint origidx;
+        struct bcma_device *cc;
         u32 val;
 
-        sii = (struct si_info *)sih;
-        origidx = ai_coreidx(sih);
-
-        cc = (struct chipcregs __iomem *) ai_setcore(sih, CC_CORE_ID, 0);
-
-        val = R_REG(&cc->chipcontrol);
+        cc = ai_findcore(sih, CC_CORE_ID, 0);
 
         if (on) {
-                if (sih->chippkg == 9 || sih->chippkg == 0xb)
+                if (ai_get_chippkg(sih) == 9 || ai_get_chippkg(sih) == 0xb)
                         /* Ext PA Controls for 4331 12x9 Package */
-                        W_REG(&cc->chipcontrol, val |
-                              CCTRL4331_EXTPA_EN |
-                              CCTRL4331_EXTPA_ON_GPIO2_5);
+                        bcma_set32(cc, CHIPCREGOFFS(chipcontrol),
+                                   CCTRL4331_EXTPA_EN |
+                                   CCTRL4331_EXTPA_ON_GPIO2_5);
                 else
                         /* Ext PA Controls for 4331 12x12 Package */
-                        W_REG(&cc->chipcontrol,
-                              val | CCTRL4331_EXTPA_EN);
+                        bcma_set32(cc, CHIPCREGOFFS(chipcontrol),
+                                   CCTRL4331_EXTPA_EN);
         } else {
                 val &= ~(CCTRL4331_EXTPA_EN | CCTRL4331_EXTPA_ON_GPIO2_5);
-                W_REG(&cc->chipcontrol, val);
+                bcma_mask32(cc, CHIPCREGOFFS(chipcontrol),
+                            ~(CCTRL4331_EXTPA_EN | CCTRL4331_EXTPA_ON_GPIO2_5));
         }
-
-        ai_setcoreidx(sih, origidx);
 }
 
 /* Enable BT-COEX & Ex-PA for 4313 */
 void ai_epa_4313war(struct si_pub *sih)
 {
-        struct si_info *sii;
-        struct chipcregs __iomem *cc;
-        uint origidx;
+        struct bcma_device *cc;
 
-        sii = (struct si_info *)sih;
-        origidx = ai_coreidx(sih);
-
-        cc = ai_setcore(sih, CC_CORE_ID, 0);
+        cc = ai_findcore(sih, CC_CORE_ID, 0);
 
         /* EPA Fix */
-        W_REG(&cc->gpiocontrol,
-              R_REG(&cc->gpiocontrol) | GPIO_CTRL_EPA_EN_MASK);
-
-        ai_setcoreidx(sih, origidx);
+        bcma_set32(cc, CHIPCREGOFFS(gpiocontrol), GPIO_CTRL_EPA_EN_MASK);
 }
 
 /* check if the device is removed */
@@ -2033,7 +1181,7 @@ bool ai_deviceremoved(struct si_pub *sih)
 
         sii = (struct si_info *)sih;
 
-        pci_read_config_dword(sii->pbus, PCI_VENDOR_ID, &w);
+        pci_read_config_dword(sii->pcibus, PCI_VENDOR_ID, &w);
         if ((w & 0xFFFF) != PCI_VENDOR_ID_BROADCOM)
                 return true;
 
@@ -2042,26 +1190,23 @@ bool ai_deviceremoved(struct si_pub *sih)
 
 bool ai_is_sprom_available(struct si_pub *sih)
 {
-        if (sih->ccrev >= 31) {
-                struct si_info *sii;
-                uint origidx;
-                struct chipcregs __iomem *cc;
+        struct si_info *sii = (struct si_info *)sih;
+
+        if (ai_get_ccrev(sih) >= 31) {
+                struct bcma_device *cc;
                 u32 sromctrl;
 
-                if ((sih->cccaps & CC_CAP_SROM) == 0)
+                if ((ai_get_cccaps(sih) & CC_CAP_SROM) == 0)
                         return false;
 
-                sii = (struct si_info *)sih;
-                origidx = sii->curidx;
-                cc = ai_setcoreidx(sih, SI_CC_IDX);
-                sromctrl = R_REG(&cc->sromcontrol);
-                ai_setcoreidx(sih, origidx);
+                cc = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
+                sromctrl = bcma_read32(cc, CHIPCREGOFFS(sromcontrol));
                 return sromctrl & SRC_PRESENT;
         }
 
-        switch (sih->chip) {
+        switch (ai_get_chip_id(sih)) {
         case BCM4313_CHIP_ID:
-                return (sih->chipst & CST4313_SPROM_PRESENT) != 0;
+                return (sii->chipst & CST4313_SPROM_PRESENT) != 0;
         default:
                 return true;
         }
@@ -2069,9 +1214,11 @@ bool ai_is_sprom_available(struct si_pub *sih)
 
 bool ai_is_otp_disabled(struct si_pub *sih)
 {
-        switch (sih->chip) {
+        struct si_info *sii = (struct si_info *)sih;
+
+        switch (ai_get_chip_id(sih)) {
         case BCM4313_CHIP_ID:
-                return (sih->chipst & CST4313_OTP_PRESENT) == 0;
+                return (sii->chipst & CST4313_OTP_PRESENT) == 0;
                 /* These chips always have their OTP on */
         case BCM43224_CHIP_ID:
         case BCM43225_CHIP_ID:
@@ -2079,3 +1226,15 @@ bool ai_is_otp_disabled(struct si_pub *sih)
                 return false;
         }
 }
+
+uint ai_get_buscoretype(struct si_pub *sih)
+{
+        struct si_info *sii = (struct si_info *)sih;
+        return sii->buscore->id.id;
+}
+
+uint ai_get_buscorerev(struct si_pub *sih)
+{
+        struct si_info *sii = (struct si_info *)sih;
+        return sii->buscore->id.rev;
+}
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
index b51d1e421e24..f84c6f781692 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
@@ -17,6 +17,8 @@
 #ifndef _BRCM_AIUTILS_H_
 #define _BRCM_AIUTILS_H_
 
+#include <linux/bcma/bcma.h>
+
 #include "types.h"
 
 /*
@@ -144,26 +146,15 @@
  *   public (read-only) portion of aiutils handle returned by si_attach()
  */
 struct si_pub {
-        uint buscoretype;       /* PCI_CORE_ID, PCIE_CORE_ID, PCMCIA_CORE_ID */
-        uint buscorerev;        /* buscore rev */
-        uint buscoreidx;        /* buscore index */
         int ccrev;              /* chip common core rev */
         u32 cccaps;             /* chip common capabilities */
-        u32 cccaps_ext; /* chip common capabilities extension */
         int pmurev;             /* pmu core rev */
         u32 pmucaps;            /* pmu capabilities */
         uint boardtype;         /* board type */
         uint boardvendor;       /* board vendor */
-        uint boardflags;        /* board flags */
-        uint boardflags2;       /* board flags2 */
         uint chip;              /* chip number */
         uint chiprev;           /* chip revision */
         uint chippkg;           /* chip package option */
-        u32 chipst;             /* chip status */
-        bool issim;             /* chip is in simulation or emulation */
-        uint socirev;           /* SOC interconnect rev */
-        bool pci_pr32414;
-
 };
 
 struct pci_dev;
@@ -179,38 +170,13 @@ struct gpioh_item {
 /* misc si info needed by some of the routines */
 struct si_info {
         struct si_pub pub;      /* back plane public state (must be first) */
-        struct pci_dev *pbus;   /* handle to pci bus */
-        uint dev_coreid;        /* the core provides driver functions */
-        void *intr_arg;         /* interrupt callback function arg */
-        u32 (*intrsoff_fn) (void *intr_arg); /* turns chip interrupts off */
-        /* restore chip interrupts */
-        void (*intrsrestore_fn) (void *intr_arg, u32 arg);
-        /* check if interrupts are enabled */
-        bool (*intrsenabled_fn) (void *intr_arg);
-
+        struct bcma_bus *icbus; /* handle to soc interconnect bus */
+        struct pci_dev *pcibus; /* handle to pci bus */
         struct pcicore_info *pch; /* PCI/E core handle */
-
+        struct bcma_device *buscore;
         struct list_head var_list; /* list of srom variables */
 
-        void __iomem *curmap;                   /* current regs va */
-        void __iomem *regs[SI_MAXCORES];        /* other regs va */
-
-        uint curidx;            /* current core index */
-        uint numcores;          /* # discovered cores */
-        uint coreid[SI_MAXCORES]; /* id of each core */
-        u32 coresba[SI_MAXCORES]; /* backplane address of each core */
-        void *regs2[SI_MAXCORES]; /* 2nd virtual address per core (usbh20) */
-        u32 coresba2[SI_MAXCORES]; /* 2nd phys address per core (usbh20) */
-        u32 coresba_size[SI_MAXCORES]; /* backplane address space size */
-        u32 coresba2_size[SI_MAXCORES]; /* second address space size */
-
-        void *curwrap;          /* current wrapper va */
-        void *wrappers[SI_MAXCORES];    /* other cores wrapper va */
-        u32 wrapba[SI_MAXCORES];        /* address of controlling wrapper */
-
-        u32 cia[SI_MAXCORES];   /* erom cia entry for each core */
-        u32 cib[SI_MAXCORES];   /* erom cia entry for each core */
-        u32 oob_router; /* oob router registers for axi */
+        u32 chipst;             /* chip status */
 };
 
 /*
@@ -223,52 +189,15 @@ struct si_info {
 
 
 /* AMBA Interconnect exported externs */
-extern uint ai_flag(struct si_pub *sih);
-extern void ai_setint(struct si_pub *sih, int siflag);
-extern uint ai_coreidx(struct si_pub *sih);
-extern uint ai_corevendor(struct si_pub *sih);
-extern uint ai_corerev(struct si_pub *sih);
-extern bool ai_iscoreup(struct si_pub *sih);
-extern u32 ai_core_cflags(struct si_pub *sih, u32 mask, u32 val);
-extern void ai_core_cflags_wo(struct si_pub *sih, u32 mask, u32 val);
-extern u32 ai_core_sflags(struct si_pub *sih, u32 mask, u32 val);
-extern uint ai_corereg(struct si_pub *sih, uint coreidx, uint regoff, uint mask,
-                       uint val);
-extern void ai_core_reset(struct si_pub *sih, u32 bits, u32 resetbits);
-extern void ai_core_disable(struct si_pub *sih, u32 bits);
-extern int ai_numaddrspaces(struct si_pub *sih);
-extern u32 ai_addrspace(struct si_pub *sih, uint asidx);
-extern u32 ai_addrspacesize(struct si_pub *sih, uint asidx);
-extern void ai_write_wrap_reg(struct si_pub *sih, u32 offset, u32 val);
+extern struct bcma_device *ai_findcore(struct si_pub *sih,
+                                       u16 coreid, u16 coreunit);
+extern u32 ai_core_cflags(struct bcma_device *core, u32 mask, u32 val);
 
 /* === exported functions === */
-extern struct si_pub *ai_attach(void __iomem *regs, struct pci_dev *sdh);
+extern struct si_pub *ai_attach(struct bcma_bus *pbus);
 extern void ai_detach(struct si_pub *sih);
-extern uint ai_coreid(struct si_pub *sih);
-extern uint ai_corerev(struct si_pub *sih);
-extern uint ai_corereg(struct si_pub *sih, uint coreidx, uint regoff, uint mask,
-                uint val);
-extern void ai_write_wrapperreg(struct si_pub *sih, u32 offset, u32 val);
-extern u32 ai_core_cflags(struct si_pub *sih, u32 mask, u32 val);
-extern u32 ai_core_sflags(struct si_pub *sih, u32 mask, u32 val);
-extern bool ai_iscoreup(struct si_pub *sih);
-extern uint ai_findcoreidx(struct si_pub *sih, uint coreid, uint coreunit);
-extern void __iomem *ai_setcoreidx(struct si_pub *sih, uint coreidx);
-extern void __iomem *ai_setcore(struct si_pub *sih, uint coreid, uint coreunit);
-extern void __iomem *ai_switch_core(struct si_pub *sih, uint coreid,
-                                    uint *origidx, uint *intr_val);
-extern void ai_restore_core(struct si_pub *sih, uint coreid, uint intr_val);
-extern void ai_core_reset(struct si_pub *sih, u32 bits, u32 resetbits);
-extern void ai_core_disable(struct si_pub *sih, u32 bits);
-extern u32 ai_alp_clock(struct si_pub *sih);
-extern u32 ai_ilp_clock(struct si_pub *sih);
+extern uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val);
 extern void ai_pci_setup(struct si_pub *sih, uint coremask);
-extern void ai_setint(struct si_pub *sih, int siflag);
-extern bool ai_backplane64(struct si_pub *sih);
-extern void ai_register_intr_callback(struct si_pub *sih, void *intrsoff_fn,
-                                      void *intrsrestore_fn,
-                                      void *intrsenabled_fn, void *intr_arg);
-extern void ai_deregister_intr_callback(struct si_pub *sih);
 extern void ai_clkctl_init(struct si_pub *sih);
 extern u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih);
 extern bool ai_clkctl_cc(struct si_pub *sih, uint mode);
@@ -283,13 +212,6 @@ extern bool ai_is_otp_disabled(struct si_pub *sih);
 /* SPROM availability */
 extern bool ai_is_sprom_available(struct si_pub *sih);
 
-/*
- * Build device path. Path size must be >= SI_DEVPATH_BUFSZ.
- * The returned path is NULL terminated and has trailing '/'.
- * Return 0 on success, nonzero otherwise.
- */
-extern int ai_devpath(struct si_pub *sih, char *path, int size);
-
 extern void ai_pci_sleep(struct si_pub *sih);
 extern void ai_pci_down(struct si_pub *sih);
 extern void ai_pci_up(struct si_pub *sih);
@@ -299,4 +221,52 @@ extern void ai_chipcontrl_epa4331(struct si_pub *sih, bool on);
 /* Enable Ex-PA for 4313 */
 extern void ai_epa_4313war(struct si_pub *sih);
 
+extern uint ai_get_buscoretype(struct si_pub *sih);
+extern uint ai_get_buscorerev(struct si_pub *sih);
+
+static inline int ai_get_ccrev(struct si_pub *sih)
+{
+        return sih->ccrev;
+}
+
+static inline u32 ai_get_cccaps(struct si_pub *sih)
+{
+        return sih->cccaps;
+}
+
+static inline int ai_get_pmurev(struct si_pub *sih)
+{
+        return sih->pmurev;
+}
+
+static inline u32 ai_get_pmucaps(struct si_pub *sih)
+{
+        return sih->pmucaps;
+}
+
+static inline uint ai_get_boardtype(struct si_pub *sih)
+{
+        return sih->boardtype;
+}
+
+static inline uint ai_get_boardvendor(struct si_pub *sih)
+{
+        return sih->boardvendor;
+}
+
+static inline uint ai_get_chip_id(struct si_pub *sih)
+{
+        return sih->chip;
+}
+
+static inline uint ai_get_chiprev(struct si_pub *sih)
+{
+        return sih->chiprev;
+}
+
+static inline uint ai_get_chippkg(struct si_pub *sih)
+{
+        return sih->chippkg;
+}
+
 #endif                          /* _BRCM_AIUTILS_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
index 43f7a724dda8..90911eec0cf5 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
@@ -1118,14 +1118,17 @@ brcms_c_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb,
                 u8 status_delay = 0;
 
                 /* wait till the next 8 bytes of txstatus is available */
-                while (((s1 = R_REG(&wlc->regs->frmtxstatus)) & TXS_V) == 0) {
+                s1 = bcma_read32(wlc->hw->d11core, D11REGOFFS(frmtxstatus));
+                while ((s1 & TXS_V) == 0) {
                         udelay(1);
                         status_delay++;
                         if (status_delay > 10)
                                 return; /* error condition */
+                        s1 = bcma_read32(wlc->hw->d11core,
+                                         D11REGOFFS(frmtxstatus));
                 }
 
-                s2 = R_REG(&wlc->regs->frmtxstatus2);
+                s2 = bcma_read32(wlc->hw->d11core, D11REGOFFS(frmtxstatus2));
         }
 
         if (scb) {
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/d11.h b/drivers/net/wireless/brcm80211/brcmsmac/d11.h
index ed51616abc85..1948cb2771e9 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/d11.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/d11.h
@@ -430,6 +430,9 @@ struct d11regs {
         u16 PAD[0x380]; /* 0x800 - 0xEFE */
 };
 
+/* d11 register field offset */
+#define D11REGOFFS(field)       offsetof(struct d11regs, field)
+
 #define PIHR_BASE       0x0400  /* byte address of packed IHR region */
 
 /* biststatus */
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
index 0bb8c37e979e..b4cf617276c9 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
@@ -27,6 +27,13 @@
 #include "soc.h"
 
 /*
+ * dma register field offset calculation
+ */
+#define DMA64REGOFFS(field)             offsetof(struct dma64regs, field)
+#define DMA64TXREGOFFS(di, field)       (di->d64txregbase + DMA64REGOFFS(field))
+#define DMA64RXREGOFFS(di, field)       (di->d64rxregbase + DMA64REGOFFS(field))
+
+/*
  * DMA hardware requires each descriptor ring to be 8kB aligned, and fit within
  * a contiguous 8kB physical address.
  */
@@ -220,15 +227,16 @@ struct dma_info {
         uint *msg_level;        /* message level pointer */
         char name[MAXNAMEL];    /* callers name for diag msgs */
 
-        struct pci_dev *pbus;           /* bus handle */
+        struct bcma_device *core;
+        struct device *dmadev;
 
         bool dma64;     /* this dma engine is operating in 64-bit mode */
         bool addrext;   /* this dma engine supports DmaExtendedAddrChanges */
 
         /* 64-bit dma tx engine registers */
-        struct dma64regs __iomem *d64txregs;
+        uint d64txregbase;
         /* 64-bit dma rx engine registers */
-        struct dma64regs __iomem *d64rxregs;
+        uint d64rxregbase;
         /* pointer to dma64 tx descriptor ring */
         struct dma64desc *txd64;
         /* pointer to dma64 rx descriptor ring */
@@ -375,15 +383,16 @@ static uint _dma_ctrlflags(struct dma_info *di, uint mask, uint flags)
         if (dmactrlflags & DMA_CTRL_PEN) {
                 u32 control;
 
-                control = R_REG(&di->d64txregs->control);
-                W_REG(&di->d64txregs->control,
+                control = bcma_read32(di->core, DMA64TXREGOFFS(di, control));
+                bcma_write32(di->core, DMA64TXREGOFFS(di, control),
                       control | D64_XC_PD);
-                if (R_REG(&di->d64txregs->control) & D64_XC_PD)
+                if (bcma_read32(di->core, DMA64TXREGOFFS(di, control)) &
+                    D64_XC_PD)
                         /* We *can* disable it so it is supported,
                          * restore control register
                          */
-                        W_REG(&di->d64txregs->control,
-                        control);
+                        bcma_write32(di->core, DMA64TXREGOFFS(di, control),
+                                     control);
                 else
                         /* Not supported, don't allow it to be enabled */
                         dmactrlflags &= ~DMA_CTRL_PEN;
@@ -394,12 +403,12 @@ static uint _dma_ctrlflags(struct dma_info *di, uint mask, uint flags)
         return dmactrlflags;
 }
 
-static bool _dma64_addrext(struct dma64regs __iomem *dma64regs)
+static bool _dma64_addrext(struct dma_info *di, uint ctrl_offset)
 {
         u32 w;
-        OR_REG(&dma64regs->control, D64_XC_AE);
-        w = R_REG(&dma64regs->control);
-        AND_REG(&dma64regs->control, ~D64_XC_AE);
+        bcma_set32(di->core, ctrl_offset, D64_XC_AE);
+        w = bcma_read32(di->core, ctrl_offset);
+        bcma_mask32(di->core, ctrl_offset, ~D64_XC_AE);
         return (w & D64_XC_AE) == D64_XC_AE;
 }
 
@@ -412,13 +421,13 @@ static bool _dma_isaddrext(struct dma_info *di)
         /* DMA64 supports full 32- or 64-bit operation. AE is always valid */
 
         /* not all tx or rx channel are available */
-        if (di->d64txregs != NULL) {
-                if (!_dma64_addrext(di->d64txregs))
+        if (di->d64txregbase != 0) {
+                if (!_dma64_addrext(di, DMA64TXREGOFFS(di, control)))
                         DMA_ERROR("%s: DMA64 tx doesn't have AE set\n",
                                   di->name);
                 return true;
-        } else if (di->d64rxregs != NULL) {
-                if (!_dma64_addrext(di->d64rxregs))
+        } else if (di->d64rxregbase != 0) {
+                if (!_dma64_addrext(di, DMA64RXREGOFFS(di, control)))
                         DMA_ERROR("%s: DMA64 rx doesn't have AE set\n",
                                   di->name);
                 return true;
@@ -432,14 +441,14 @@ static bool _dma_descriptor_align(struct dma_info *di)
         u32 addrl;
 
         /* Check to see if the descriptors need to be aligned on 4K/8K or not */
-        if (di->d64txregs != NULL) {
-                W_REG(&di->d64txregs->addrlow, 0xff0);
-                addrl = R_REG(&di->d64txregs->addrlow);
+        if (di->d64txregbase != 0) {
+                bcma_write32(di->core, DMA64TXREGOFFS(di, addrlow), 0xff0);
+                addrl = bcma_read32(di->core, DMA64TXREGOFFS(di, addrlow));
                 if (addrl != 0)
                         return false;
-        } else if (di->d64rxregs != NULL) {
-                W_REG(&di->d64rxregs->addrlow, 0xff0);
-                addrl = R_REG(&di->d64rxregs->addrlow);
+        } else if (di->d64rxregbase != 0) {
+                bcma_write32(di->core, DMA64RXREGOFFS(di, addrlow), 0xff0);
+                addrl = bcma_read32(di->core, DMA64RXREGOFFS(di, addrlow));
                 if (addrl != 0)
                         return false;
         }
@@ -450,7 +459,7 @@ static bool _dma_descriptor_align(struct dma_info *di)
  * Descriptor table must start at the DMA hardware dictated alignment, so
  * allocated memory must be large enough to support this requirement.
  */
-static void *dma_alloc_consistent(struct pci_dev *pdev, uint size,
+static void *dma_alloc_consistent(struct dma_info *di, uint size,
                                   u16 align_bits, uint *alloced,
                                   dma_addr_t *pap)
 {
@@ -460,7 +469,7 @@ static void *dma_alloc_consistent(struct pci_dev *pdev, uint size,
                         size += align;
                 *alloced = size;
         }
-        return pci_alloc_consistent(pdev, size, pap);
+        return dma_alloc_coherent(di->dmadev, size, pap, GFP_ATOMIC);
 }
 
 static
@@ -486,7 +495,7 @@ static void *dma_ringalloc(struct dma_info *di, u32 boundary, uint size,
         u32 desc_strtaddr;
         u32 alignbytes = 1 << *alignbits;
 
-        va = dma_alloc_consistent(di->pbus, size, *alignbits, alloced, descpa);
+        va = dma_alloc_consistent(di, size, *alignbits, alloced, descpa);
 
         if (NULL == va)
                 return NULL;
@@ -495,8 +504,8 @@ static void *dma_ringalloc(struct dma_info *di, u32 boundary, uint size,
         if (((desc_strtaddr + size - 1) & boundary) != (desc_strtaddr
                                                         & boundary)) {
                 *alignbits = dma_align_sizetobits(size);
-                pci_free_consistent(di->pbus, size, va, *descpa);
-                va = dma_alloc_consistent(di->pbus, size, *alignbits,
+                dma_free_coherent(di->dmadev, size, va, *descpa);
+                va = dma_alloc_consistent(di, size, *alignbits,
                         alloced, descpa);
         }
         return va;
@@ -556,12 +565,13 @@ static bool _dma_alloc(struct dma_info *di, uint direction)
 }
 
 struct dma_pub *dma_attach(char *name, struct si_pub *sih,
-                     void __iomem *dmaregstx, void __iomem *dmaregsrx,
-                     uint ntxd, uint nrxd,
-                     uint rxbufsize, int rxextheadroom,
-                     uint nrxpost, uint rxoffset, uint *msg_level)
+                           struct bcma_device *core,
+                           uint txregbase, uint rxregbase, uint ntxd, uint nrxd,
+                           uint rxbufsize, int rxextheadroom,
+                           uint nrxpost, uint rxoffset, uint *msg_level)
 {
         struct dma_info *di;
+        u8 rev = core->id.rev;
         uint size;
 
         /* allocate private info structure */
@@ -572,11 +582,13 @@ struct dma_pub *dma_attach(char *name, struct si_pub *sih,
         di->msg_level = msg_level ? msg_level : &dma_msg_level;
 
 
-        di->dma64 = ((ai_core_sflags(sih, 0, 0) & SISF_DMA64) == SISF_DMA64);
+        di->dma64 =
+                ((bcma_aread32(core, BCMA_IOST) & SISF_DMA64) == SISF_DMA64);
 
-        /* init dma reg pointer */
-        di->d64txregs = (struct dma64regs __iomem *) dmaregstx;
-        di->d64rxregs = (struct dma64regs __iomem *) dmaregsrx;
+        /* init dma reg info */
+        di->core = core;
+        di->d64txregbase = txregbase;
+        di->d64rxregbase = rxregbase;
 
         /*
          * Default flags (which can be changed by the driver calling
@@ -585,16 +597,17 @@ struct dma_pub *dma_attach(char *name, struct si_pub *sih,
          */
         _dma_ctrlflags(di, DMA_CTRL_ROC | DMA_CTRL_PEN, 0);
 
-        DMA_TRACE("%s: %s flags 0x%x ntxd %d nrxd %d rxbufsize %d rxextheadroom %d nrxpost %d rxoffset %d dmaregstx %p dmaregsrx %p\n",
-                  name, "DMA64",
+        DMA_TRACE("%s: %s flags 0x%x ntxd %d nrxd %d "
+                  "rxbufsize %d rxextheadroom %d nrxpost %d rxoffset %d "
+                  "txregbase %u rxregbase %u\n", name, "DMA64",
                   di->dma.dmactrlflags, ntxd, nrxd, rxbufsize,
-                  rxextheadroom, nrxpost, rxoffset, dmaregstx, dmaregsrx);
+                  rxextheadroom, nrxpost, rxoffset, txregbase, rxregbase);
 
         /* make a private copy of our callers name */
         strncpy(di->name, name, MAXNAMEL);
         di->name[MAXNAMEL - 1] = '\0';
 
-        di->pbus = ((struct si_info *)sih)->pbus;
+        di->dmadev = core->dma_dev;
 
         /* save tunables */
         di->ntxd = (u16) ntxd;
@@ -626,11 +639,11 @@ struct dma_pub *dma_attach(char *name, struct si_pub *sih,
         di->dataoffsetlow = di->ddoffsetlow;
         di->dataoffsethigh = di->ddoffsethigh;
         /* WAR64450 : DMACtl.Addr ext fields are not supported in SDIOD core. */
-        if ((ai_coreid(sih) == SDIOD_CORE_ID)
-            && ((ai_corerev(sih) > 0) && (ai_corerev(sih) <= 2)))
+        if ((core->id.id == SDIOD_CORE_ID)
+            && ((rev > 0) && (rev <= 2)))
                 di->addrext = 0;
-        else if ((ai_coreid(sih) == I2S_CORE_ID) &&
-                 ((ai_corerev(sih) == 0) || (ai_corerev(sih) == 1)))
+        else if ((core->id.id == I2S_CORE_ID) &&
+                 ((rev == 0) || (rev == 1)))
                 di->addrext = 0;
         else
                 di->addrext = _dma_isaddrext(di);
@@ -749,13 +762,13 @@ void dma_detach(struct dma_pub *pub)
 
         /* free dma descriptor rings */
         if (di->txd64)
-                pci_free_consistent(di->pbus, di->txdalloc,
-                                    ((s8 *)di->txd64 - di->txdalign),
-                                    (di->txdpaorig));
+                dma_free_coherent(di->dmadev, di->txdalloc,
+                                  ((s8 *)di->txd64 - di->txdalign),
+                                  (di->txdpaorig));
         if (di->rxd64)
-                pci_free_consistent(di->pbus, di->rxdalloc,
-                                    ((s8 *)di->rxd64 - di->rxdalign),
-                                    (di->rxdpaorig));
+                dma_free_coherent(di->dmadev, di->rxdalloc,
+                                  ((s8 *)di->rxd64 - di->rxdalign),
+                                  (di->rxdpaorig));
 
         /* free packet pointer vectors */
         kfree(di->txp);
@@ -780,11 +793,15 @@ _dma_ddtable_init(struct dma_info *di, uint direction, dma_addr_t pa)
         if ((di->ddoffsetlow == 0)
             || !(pa & PCI32ADDR_HIGH)) {
                 if (direction == DMA_TX) {
-                        W_REG(&di->d64txregs->addrlow, pa + di->ddoffsetlow);
-                        W_REG(&di->d64txregs->addrhigh, di->ddoffsethigh);
+                        bcma_write32(di->core, DMA64TXREGOFFS(di, addrlow),
+                                     pa + di->ddoffsetlow);
+                        bcma_write32(di->core, DMA64TXREGOFFS(di, addrhigh),
+                                     di->ddoffsethigh);
                 } else {
-                        W_REG(&di->d64rxregs->addrlow, pa + di->ddoffsetlow);
-                        W_REG(&di->d64rxregs->addrhigh, di->ddoffsethigh);
+                        bcma_write32(di->core, DMA64RXREGOFFS(di, addrlow),
+                                     pa + di->ddoffsetlow);
+                        bcma_write32(di->core, DMA64RXREGOFFS(di, addrhigh),
+                                     di->ddoffsethigh);
                 }
         } else {
                 /* DMA64 32bits address extension */
@@ -795,15 +812,19 @@ _dma_ddtable_init(struct dma_info *di, uint direction, dma_addr_t pa)
                 pa &= ~PCI32ADDR_HIGH;
 
                 if (direction == DMA_TX) {
-                        W_REG(&di->d64txregs->addrlow, pa + di->ddoffsetlow);
-                        W_REG(&di->d64txregs->addrhigh, di->ddoffsethigh);
-                        SET_REG(&di->d64txregs->control,
-                                D64_XC_AE, (ae << D64_XC_AE_SHIFT));
+                        bcma_write32(di->core, DMA64TXREGOFFS(di, addrlow),
+                                     pa + di->ddoffsetlow);
+                        bcma_write32(di->core, DMA64TXREGOFFS(di, addrhigh),
+                                     di->ddoffsethigh);
+                        bcma_maskset32(di->core, DMA64TXREGOFFS(di, control),
+                                       D64_XC_AE, (ae << D64_XC_AE_SHIFT));
                 } else {
-                        W_REG(&di->d64rxregs->addrlow, pa + di->ddoffsetlow);
-                        W_REG(&di->d64rxregs->addrhigh, di->ddoffsethigh);
-                        SET_REG(&di->d64rxregs->control,
-                                D64_RC_AE, (ae << D64_RC_AE_SHIFT));
+                        bcma_write32(di->core, DMA64RXREGOFFS(di, addrlow),
+                                     pa + di->ddoffsetlow);
+                        bcma_write32(di->core, DMA64RXREGOFFS(di, addrhigh),
+                                     di->ddoffsethigh);
+                        bcma_maskset32(di->core, DMA64RXREGOFFS(di, control),
+                                       D64_RC_AE, (ae << D64_RC_AE_SHIFT));
                 }
         }
 }
@@ -815,9 +836,9 @@ static void _dma_rxenable(struct dma_info *di)
 
         DMA_TRACE("%s:\n", di->name);
 
-        control =
-            (R_REG(&di->d64rxregs->control) & D64_RC_AE) |
-            D64_RC_RE;
+        control = D64_RC_RE | (bcma_read32(di->core,
+                                           DMA64RXREGOFFS(di, control)) &
+                               D64_RC_AE);
 
         if ((dmactrlflags & DMA_CTRL_PEN) == 0)
                 control |= D64_RC_PD;
@@ -825,7 +846,7 @@ static void _dma_rxenable(struct dma_info *di)
         if (dmactrlflags & DMA_CTRL_ROC)
                 control |= D64_RC_OC;
 
-        W_REG(&di->d64rxregs->control,
+        bcma_write32(di->core, DMA64RXREGOFFS(di, control),
                 ((di->rxoffset << D64_RC_RO_SHIFT) | control));
 }
 
@@ -868,7 +889,8 @@ static struct sk_buff *dma64_getnextrxp(struct dma_info *di, bool forceall)
                 return NULL;
 
         curr =
-            B2I(((R_REG(&di->d64rxregs->status0) & D64_RS0_CD_MASK) -
+            B2I(((bcma_read32(di->core,
+                              DMA64RXREGOFFS(di, status0)) & D64_RS0_CD_MASK) -
                  di->rcvptrbase) & D64_RS0_CD_MASK, struct dma64desc);
 
         /* ignore curr if forceall */
@@ -882,7 +904,7 @@ static struct sk_buff *dma64_getnextrxp(struct dma_info *di, bool forceall)
         pa = le32_to_cpu(di->rxd64[i].addrlow) - di->dataoffsetlow;
 
         /* clear this packet from the descriptor ring */
-        pci_unmap_single(di->pbus, pa, di->rxbufsize, PCI_DMA_FROMDEVICE);
+        dma_unmap_single(di->dmadev, pa, di->rxbufsize, DMA_FROM_DEVICE);
 
         di->rxd64[i].addrlow = cpu_to_le32(0xdeadbeef);
         di->rxd64[i].addrhigh = cpu_to_le32(0xdeadbeef);
@@ -950,12 +972,12 @@ int dma_rx(struct dma_pub *pub, struct sk_buff_head *skb_list)
                 if (resid > 0) {
                         uint cur;
                         cur =
-                            B2I(((R_REG(&di->d64rxregs->status0) &
-                                  D64_RS0_CD_MASK) -
-                                 di->rcvptrbase) & D64_RS0_CD_MASK,
-                                struct dma64desc);
+                            B2I(((bcma_read32(di->core,
+                                              DMA64RXREGOFFS(di, status0)) &
+                                  D64_RS0_CD_MASK) - di->rcvptrbase) &
+                                D64_RS0_CD_MASK, struct dma64desc);
                         DMA_ERROR("rxin %d rxout %d, hw_curr %d\n",
-                                  di->rxin, di->rxout, cur);
+                                   di->rxin, di->rxout, cur);
                 }
 #endif                          /* BCMDBG */
 
@@ -983,8 +1005,10 @@ static bool dma64_rxidle(struct dma_info *di)
         if (di->nrxd == 0)
                 return true;
 
-        return ((R_REG(&di->d64rxregs->status0) & D64_RS0_CD_MASK) ==
-                (R_REG(&di->d64rxregs->ptr) & D64_RS0_CD_MASK));
+        return ((bcma_read32(di->core,
+                             DMA64RXREGOFFS(di, status0)) & D64_RS0_CD_MASK) ==
+                (bcma_read32(di->core, DMA64RXREGOFFS(di, ptr)) &
+                 D64_RS0_CD_MASK));
 }
 
 /*
@@ -1048,8 +1072,8 @@ bool dma_rxfill(struct dma_pub *pub)
                  */
                 *(u32 *) (p->data) = 0;
 
-                pa = pci_map_single(di->pbus, p->data,
-                        di->rxbufsize, PCI_DMA_FROMDEVICE);
+                pa = dma_map_single(di->dmadev, p->data, di->rxbufsize,
+                                    DMA_FROM_DEVICE);
 
                 /* save the free packet pointer */
                 di->rxp[rxout] = p;
@@ -1067,7 +1091,7 @@ bool dma_rxfill(struct dma_pub *pub)
         di->rxout = rxout;
 
         /* update the chip lastdscr pointer */
-        W_REG(&di->d64rxregs->ptr,
+        bcma_write32(di->core, DMA64RXREGOFFS(di, ptr),
               di->rcvptrbase + I2B(rxout, struct dma64desc));
 
         return ring_empty;
@@ -1128,7 +1152,7 @@ void dma_txinit(struct dma_pub *pub)
 
         if ((di->dma.dmactrlflags & DMA_CTRL_PEN) == 0)
                 control |= D64_XC_PD;
-        OR_REG(&di->d64txregs->control, control);
+        bcma_set32(di->core, DMA64TXREGOFFS(di, control), control);
 
         /* DMA engine with alignment requirement requires table to be inited
          * before enabling the engine
@@ -1146,7 +1170,7 @@ void dma_txsuspend(struct dma_pub *pub)
         if (di->ntxd == 0)
                 return;
 
-        OR_REG(&di->d64txregs->control, D64_XC_SE);
+        bcma_set32(di->core, DMA64TXREGOFFS(di, control), D64_XC_SE);
 }
 
 void dma_txresume(struct dma_pub *pub)
@@ -1158,7 +1182,7 @@ void dma_txresume(struct dma_pub *pub)
         if (di->ntxd == 0)
                 return;
 
-        AND_REG(&di->d64txregs->control, ~D64_XC_SE);
+        bcma_mask32(di->core, DMA64TXREGOFFS(di, control), ~D64_XC_SE);
 }
 
 bool dma_txsuspended(struct dma_pub *pub)
@@ -1166,8 +1190,9 @@ bool dma_txsuspended(struct dma_pub *pub)
         struct dma_info *di = (struct dma_info *)pub;
 
         return (di->ntxd == 0) ||
-            ((R_REG(&di->d64txregs->control) & D64_XC_SE) ==
-             D64_XC_SE);
+               ((bcma_read32(di->core,
+                             DMA64TXREGOFFS(di, control)) & D64_XC_SE) ==
+                D64_XC_SE);
 }
 
 void dma_txreclaim(struct dma_pub *pub, enum txd_range range)
@@ -1200,16 +1225,17 @@ bool dma_txreset(struct dma_pub *pub)
                 return true;
 
         /* suspend tx DMA first */
-        W_REG(&di->d64txregs->control, D64_XC_SE);
+        bcma_write32(di->core, DMA64TXREGOFFS(di, control), D64_XC_SE);
         SPINWAIT(((status =
-                   (R_REG(&di->d64txregs->status0) & D64_XS0_XS_MASK))
-                  != D64_XS0_XS_DISABLED) && (status != D64_XS0_XS_IDLE)
-                 && (status != D64_XS0_XS_STOPPED), 10000);
+                   (bcma_read32(di->core, DMA64TXREGOFFS(di, status0)) &
+                    D64_XS0_XS_MASK)) != D64_XS0_XS_DISABLED) &&
+                  (status != D64_XS0_XS_IDLE) && (status != D64_XS0_XS_STOPPED),
+                 10000);
 
-        W_REG(&di->d64txregs->control, 0);
+        bcma_write32(di->core, DMA64TXREGOFFS(di, control), 0);
         SPINWAIT(((status =
-                   (R_REG(&di->d64txregs->status0) & D64_XS0_XS_MASK))
-                  != D64_XS0_XS_DISABLED), 10000);
+                   (bcma_read32(di->core, DMA64TXREGOFFS(di, status0)) &
+                    D64_XS0_XS_MASK)) != D64_XS0_XS_DISABLED), 10000);
 
         /* wait for the last transaction to complete */
         udelay(300);
@@ -1225,10 +1251,10 @@ bool dma_rxreset(struct dma_pub *pub)
         if (di->nrxd == 0)
                 return true;
 
-        W_REG(&di->d64rxregs->control, 0);
+        bcma_write32(di->core, DMA64RXREGOFFS(di, control), 0);
         SPINWAIT(((status =
-                   (R_REG(&di->d64rxregs->status0) & D64_RS0_RS_MASK))
-                  != D64_RS0_RS_DISABLED), 10000);
+                   (bcma_read32(di->core, DMA64RXREGOFFS(di, status0)) &
+                    D64_RS0_RS_MASK)) != D64_RS0_RS_DISABLED), 10000);
 
         return status == D64_RS0_RS_DISABLED;
 }
@@ -1239,10 +1265,9 @@ bool dma_rxreset(struct dma_pub *pub)
  *   the error(toss frames) could be fatal and cause many subsequent hard
  *   to debug problems
  */
-int dma_txfast(struct dma_pub *pub, struct sk_buff *p0, bool commit)
+int dma_txfast(struct dma_pub *pub, struct sk_buff *p, bool commit)
 {
         struct dma_info *di = (struct dma_info *)pub;
-        struct sk_buff *p, *next;
         unsigned char *data;
         uint len;
         u16 txout;
@@ -1254,57 +1279,44 @@ int dma_txfast(struct dma_pub *pub, struct sk_buff *p0, bool commit)
         txout = di->txout;
 
         /*
-         * Walk the chain of packet buffers
-         * allocating and initializing transmit descriptor entries.
+         * obtain and initialize transmit descriptor entry.
          */
-        for (p = p0; p; p = next) {
-                data = p->data;
-                len = p->len;
-                next = p->next;
-
-                /* return nonzero if out of tx descriptors */
-                if (nexttxd(di, txout) == di->txin)
-                        goto outoftxd;
-
-                if (len == 0)
-                        continue;
+        data = p->data;
+        len = p->len;
 
-                /* get physical address of buffer start */
-                pa = pci_map_single(di->pbus, data, len, PCI_DMA_TODEVICE);
+        /* no use to transmit a zero length packet */
+        if (len == 0)
+                return 0;
 
-                flags = 0;
-                if (p == p0)
-                        flags |= D64_CTRL1_SOF;
+        /* return nonzero if out of tx descriptors */
+        if (nexttxd(di, txout) == di->txin)
+                goto outoftxd;
 
-                /* With a DMA segment list, Descriptor table is filled
-                 * using the segment list instead of looping over
-                 * buffers in multi-chain DMA. Therefore, EOF for SGLIST
-                 * is when end of segment list is reached.
-                 */
-                if (next == NULL)
-                        flags |= (D64_CTRL1_IOC | D64_CTRL1_EOF);
-                if (txout == (di->ntxd - 1))
-                        flags |= D64_CTRL1_EOT;
+        /* get physical address of buffer start */
+        pa = dma_map_single(di->dmadev, data, len, DMA_TO_DEVICE);
 
-                dma64_dd_upd(di, di->txd64, pa, txout, &flags, len);
+        /* With a DMA segment list, Descriptor table is filled
+         * using the segment list instead of looping over
+         * buffers in multi-chain DMA. Therefore, EOF for SGLIST
+         * is when end of segment list is reached.
+         */
+        flags = D64_CTRL1_SOF | D64_CTRL1_IOC | D64_CTRL1_EOF;
+        if (txout == (di->ntxd - 1))
+                flags |= D64_CTRL1_EOT;
 
-                txout = nexttxd(di, txout);
-        }
+        dma64_dd_upd(di, di->txd64, pa, txout, &flags, len);
 
-        /* if last txd eof not set, fix it */
-        if (!(flags & D64_CTRL1_EOF))
-                di->txd64[prevtxd(di, txout)].ctrl1 =
-                     cpu_to_le32(flags | D64_CTRL1_IOC | D64_CTRL1_EOF);
+        txout = nexttxd(di, txout);
 
         /* save the packet */
-        di->txp[prevtxd(di, txout)] = p0;
+        di->txp[prevtxd(di, txout)] = p;
 
         /* bump the tx descriptor index */
         di->txout = txout;
 
         /* kick the chip */
         if (commit)
-                W_REG(&di->d64txregs->ptr,
+                bcma_write32(di->core, DMA64TXREGOFFS(di, ptr),
                       di->xmtptrbase + I2B(txout, struct dma64desc));
 
         /* tx flow control */
@@ -1314,7 +1326,7 @@ int dma_txfast(struct dma_pub *pub, struct sk_buff *p0, bool commit)
 
  outoftxd:
         DMA_ERROR("%s: out of txds !!!\n", di->name);
-        brcmu_pkt_buf_free_skb(p0);
+        brcmu_pkt_buf_free_skb(p);
         di->dma.txavail = 0;
         di->dma.txnobuf++;
         return -1;
@@ -1352,16 +1364,15 @@ struct sk_buff *dma_getnexttxp(struct dma_pub *pub, enum txd_range range)
         if (range == DMA_RANGE_ALL)
                 end = di->txout;
         else {
-                struct dma64regs __iomem *dregs = di->d64txregs;
-
-                end = (u16) (B2I(((R_REG(&dregs->status0) &
-                                 D64_XS0_CD_MASK) -
-                                 di->xmtptrbase) & D64_XS0_CD_MASK,
-                                 struct dma64desc));
+                end = (u16) (B2I(((bcma_read32(di->core,
+                                               DMA64TXREGOFFS(di, status0)) &
+                                   D64_XS0_CD_MASK) - di->xmtptrbase) &
+                                 D64_XS0_CD_MASK, struct dma64desc));
 
                 if (range == DMA_RANGE_TRANSFERED) {
                         active_desc =
-                            (u16) (R_REG(&dregs->status1) &
+                                (u16)(bcma_read32(di->core,
+                                                  DMA64TXREGOFFS(di, status1)) &
                                       D64_XS1_AD_MASK);
                         active_desc =
                             (active_desc - di->xmtptrbase) & D64_XS0_CD_MASK;
@@ -1390,7 +1401,7 @@ struct sk_buff *dma_getnexttxp(struct dma_pub *pub, enum txd_range range)
                 txp = di->txp[i];
                 di->txp[i] = NULL;
 
-                pci_unmap_single(di->pbus, pa, size, PCI_DMA_TODEVICE);
+                dma_unmap_single(di->dmadev, pa, size, DMA_TO_DEVICE);
         }
 
         di->txin = i;
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.h b/drivers/net/wireless/brcm80211/brcmsmac/dma.h
index d317c7c12f91..cc269ee5c499 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/dma.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.h
@@ -75,10 +75,11 @@ struct dma_pub {
 };
 
 extern struct dma_pub *dma_attach(char *name, struct si_pub *sih,
-                            void __iomem *dmaregstx, void __iomem *dmaregsrx,
-                            uint ntxd, uint nrxd,
-                            uint rxbufsize, int rxextheadroom,
-                            uint nrxpost, uint rxoffset, uint *msg_level);
+                                  struct bcma_device *d11core,
+                                  uint txregbase, uint rxregbase,
+                                  uint ntxd, uint nrxd,
+                                  uint rxbufsize, int rxextheadroom,
+                                  uint nrxpost, uint rxoffset, uint *msg_level);
 
 void dma_rxinit(struct dma_pub *pub);
 int dma_rx(struct dma_pub *pub, struct sk_buff_head *skb_list);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 6d3c7b6c5aa0..77fdc45b43ef 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -17,10 +17,11 @@
 #define __UNDEF_NO_VERSION__
 
 #include <linux/etherdevice.h>
-#include <linux/pci.h>
 #include <linux/sched.h>
 #include <linux/firmware.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/bcma/bcma.h>
 #include <net/mac80211.h>
 #include <defs.h>
 #include "nicpci.h"
@@ -39,10 +40,10 @@
 #define MAC_FILTERS (FIF_PROMISC_IN_BSS | \
         FIF_ALLMULTI | \
         FIF_FCSFAIL | \
-        FIF_PLCPFAIL | \
         FIF_CONTROL | \
         FIF_OTHER_BSS | \
-        FIF_BCN_PRBRESP_PROMISC)
+        FIF_BCN_PRBRESP_PROMISC | \
+        FIF_PSPOLL)
 
 #define CHAN2GHZ(channel, freqency, chflags)  { \
         .band = IEEE80211_BAND_2GHZ, \
@@ -86,16 +87,14 @@ MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver.");
 MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN cards");
 MODULE_LICENSE("Dual BSD/GPL");
 
-/* recognized PCI IDs */
-static DEFINE_PCI_DEVICE_TABLE(brcms_pci_id_table) = {
-        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) }, /* 43225 2G */
-        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) }, /* 43224 DUAL */
-        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) }, /* 4313 DUAL */
-        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) }, /* 43224 Ven */
-        {0}
-};
 
-MODULE_DEVICE_TABLE(pci, brcms_pci_id_table);
+/* recognized BCMA Core IDs */
+static struct bcma_device_id brcms_coreid_table[] = {
+        BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 23, BCMA_ANY_CLASS),
+        BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 24, BCMA_ANY_CLASS),
+        BCMA_CORETABLE_END
+};
+MODULE_DEVICE_TABLE(bcma, brcms_coreid_table);
 
 #ifdef BCMDBG
 static int msglevel = 0xdeadbeef;
@@ -372,7 +371,7 @@ static int brcms_ops_config(struct ieee80211_hw *hw, u32 changed)
                                                    conf->listen_interval);
         }
         if (changed & IEEE80211_CONF_CHANGE_MONITOR)
-                wiphy_err(wiphy, "%s: change monitor mode: %s (implement)\n",
+                wiphy_dbg(wiphy, "%s: change monitor mode: %s\n",
                           __func__, conf->flags & IEEE80211_CONF_MONITOR ?
                           "true" : "false");
         if (changed & IEEE80211_CONF_CHANGE_PS)
@@ -549,29 +548,25 @@ brcms_ops_configure_filter(struct ieee80211_hw *hw,
 
         changed_flags &= MAC_FILTERS;
         *total_flags &= MAC_FILTERS;
+
         if (changed_flags & FIF_PROMISC_IN_BSS)
-                wiphy_err(wiphy, "FIF_PROMISC_IN_BSS\n");
+                wiphy_dbg(wiphy, "FIF_PROMISC_IN_BSS\n");
         if (changed_flags & FIF_ALLMULTI)
-                wiphy_err(wiphy, "FIF_ALLMULTI\n");
+                wiphy_dbg(wiphy, "FIF_ALLMULTI\n");
         if (changed_flags & FIF_FCSFAIL)
-                wiphy_err(wiphy, "FIF_FCSFAIL\n");
-        if (changed_flags & FIF_PLCPFAIL)
-                wiphy_err(wiphy, "FIF_PLCPFAIL\n");
+                wiphy_dbg(wiphy, "FIF_FCSFAIL\n");
         if (changed_flags & FIF_CONTROL)
-                wiphy_err(wiphy, "FIF_CONTROL\n");
+                wiphy_dbg(wiphy, "FIF_CONTROL\n");
         if (changed_flags & FIF_OTHER_BSS)
-                wiphy_err(wiphy, "FIF_OTHER_BSS\n");
-        if (changed_flags & FIF_BCN_PRBRESP_PROMISC) {
-                spin_lock_bh(&wl->lock);
-                if (*total_flags & FIF_BCN_PRBRESP_PROMISC) {
-                        wl->pub->mac80211_state |= MAC80211_PROMISC_BCNS;
-                        brcms_c_mac_bcn_promisc_change(wl->wlc, 1);
-                } else {
-                        brcms_c_mac_bcn_promisc_change(wl->wlc, 0);
-                        wl->pub->mac80211_state &= ~MAC80211_PROMISC_BCNS;
-                }
-                spin_unlock_bh(&wl->lock);
-        }
+                wiphy_dbg(wiphy, "FIF_OTHER_BSS\n");
+        if (changed_flags & FIF_PSPOLL)
+                wiphy_dbg(wiphy, "FIF_PSPOLL\n");
+        if (changed_flags & FIF_BCN_PRBRESP_PROMISC)
+                wiphy_dbg(wiphy, "FIF_BCN_PRBRESP_PROMISC\n");
+
+        spin_lock_bh(&wl->lock);
+        brcms_c_mac_promisc(wl->wlc, *total_flags);
+        spin_unlock_bh(&wl->lock);
         return;
 }
 
@@ -727,7 +722,7 @@ static const struct ieee80211_ops brcms_ops = {
 };
 
 /*
- * is called in brcms_pci_probe() context, therefore no locking required.
+ * is called in brcms_bcma_probe() context, therefore no locking required.
  */
 static int brcms_set_hint(struct brcms_info *wl, char *abbrev)
 {
@@ -867,25 +862,15 @@ static void brcms_free(struct brcms_info *wl)
 #endif
                 kfree(t);
         }
-
-        /*
-         * unregister_netdev() calls get_stats() which may read chip
-         * registers so we cannot unmap the chip registers until
-         * after calling unregister_netdev() .
-         */
-        if (wl->regsva)
-                iounmap(wl->regsva);
-
-        wl->regsva = NULL;
 }
 
 /*
 * called from both kernel as from this kernel module (error flow on attach)
 * precondition: perimeter lock is not acquired.
 */
-static void brcms_remove(struct pci_dev *pdev)
+static void brcms_remove(struct bcma_device *pdev)
 {
-        struct ieee80211_hw *hw = pci_get_drvdata(pdev);
+        struct ieee80211_hw *hw = bcma_get_drvdata(pdev);
         struct brcms_info *wl = hw->priv;
 
         if (wl->wlc) {
@@ -893,11 +878,10 @@ static void brcms_remove(struct pci_dev *pdev)
                 wiphy_rfkill_stop_polling(wl->pub->ieee_hw->wiphy);
                 ieee80211_unregister_hw(hw);
         }
-        pci_disable_device(pdev);
 
         brcms_free(wl);
 
-        pci_set_drvdata(pdev, NULL);
+        bcma_set_drvdata(pdev, NULL);
         ieee80211_free_hw(hw);
 }
 
@@ -1005,11 +989,9 @@ static int ieee_hw_init(struct ieee80211_hw *hw)
  * it as static.
  *
  *
- * is called in brcms_pci_probe() context, therefore no locking required.
+ * is called in brcms_bcma_probe() context, therefore no locking required.
  */
-static struct brcms_info *brcms_attach(u16 vendor, u16 device,
-                                       resource_size_t regs,
-                                       struct pci_dev *btparam, uint irq)
+static struct brcms_info *brcms_attach(struct bcma_device *pdev)
 {
         struct brcms_info *wl = NULL;
         int unit, err;
@@ -1023,7 +1005,7 @@ static struct brcms_info *brcms_attach(u16 vendor, u16 device,
                 return NULL;
 
         /* allocate private info */
-        hw = pci_get_drvdata(btparam);  /* btparam == pdev */
+        hw = bcma_get_drvdata(pdev);
         if (hw != NULL)
                 wl = hw->priv;
         if (WARN_ON(hw == NULL) || WARN_ON(wl == NULL))
@@ -1035,26 +1017,20 @@ static struct brcms_info *brcms_attach(u16 vendor, u16 device,
         /* setup the bottom half handler */
         tasklet_init(&wl->tasklet, brcms_dpc, (unsigned long) wl);
 
-        wl->regsva = ioremap_nocache(regs, PCI_BAR0_WINSZ);
-        if (wl->regsva == NULL) {
-                wiphy_err(wl->wiphy, "wl%d: ioremap() failed\n", unit);
-                goto fail;
-        }
         spin_lock_init(&wl->lock);
         spin_lock_init(&wl->isr_lock);
 
         /* prepare ucode */
-        if (brcms_request_fw(wl, btparam) < 0) {
+        if (brcms_request_fw(wl, pdev->bus->host_pci) < 0) {
                 wiphy_err(wl->wiphy, "%s: Failed to find firmware usually in "
                           "%s\n", KBUILD_MODNAME, "/lib/firmware/brcm");
                 brcms_release_fw(wl);
-                brcms_remove(btparam);
+                brcms_remove(pdev);
                 return NULL;
         }
 
         /* common load-time initialization */
-        wl->wlc = brcms_c_attach(wl, vendor, device, unit, false,
-                                 wl->regsva, btparam, &err);
+        wl->wlc = brcms_c_attach((void *)wl, pdev, unit, false, &err);
         brcms_release_fw(wl);
         if (!wl->wlc) {
                 wiphy_err(wl->wiphy, "%s: attach() failed with code %d\n",
@@ -1066,11 +1042,12 @@ static struct brcms_info *brcms_attach(u16 vendor, u16 device,
         wl->pub->ieee_hw = hw;
 
         /* register our interrupt handler */
-        if (request_irq(irq, brcms_isr, IRQF_SHARED, KBUILD_MODNAME, wl)) {
+        if (request_irq(pdev->bus->host_pci->irq, brcms_isr,
+                        IRQF_SHARED, KBUILD_MODNAME, wl)) {
                 wiphy_err(wl->wiphy, "wl%d: request_irq() failed\n", unit);
                 goto fail;
         }
-        wl->irq = irq;
+        wl->irq = pdev->bus->host_pci->irq;
 
         /* register module */
         brcms_c_module_register(wl->pub, "linux", wl, NULL);
@@ -1117,37 +1094,18 @@ fail:
  *
  * Perimeter lock is initialized in the course of this function.
  */
-static int __devinit
-brcms_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int __devinit brcms_bcma_probe(struct bcma_device *pdev)
 {
-        int rc;
         struct brcms_info *wl;
         struct ieee80211_hw *hw;
-        u32 val;
-
-        dev_info(&pdev->dev, "bus %d slot %d func %d irq %d\n",
-               pdev->bus->number, PCI_SLOT(pdev->devfn),
-               PCI_FUNC(pdev->devfn), pdev->irq);
 
-        if ((pdev->vendor != PCI_VENDOR_ID_BROADCOM) ||
-            ((pdev->device != 0x0576) &&
-             ((pdev->device & 0xff00) != 0x4300) &&
-             ((pdev->device & 0xff00) != 0x4700) &&
-             ((pdev->device < 43000) || (pdev->device > 43999))))
-                return -ENODEV;
+        dev_info(&pdev->dev, "mfg %x core %x rev %d class %d irq %d\n",
+                 pdev->id.manuf, pdev->id.id, pdev->id.rev, pdev->id.class,
+                 pdev->bus->host_pci->irq);
 
-        rc = pci_enable_device(pdev);
-        if (rc) {
-                pr_err("%s: Cannot enable device %d-%d_%d\n",
-                       __func__, pdev->bus->number, PCI_SLOT(pdev->devfn),
-                       PCI_FUNC(pdev->devfn));
+        if ((pdev->id.manuf != BCMA_MANUF_BCM) ||
+            (pdev->id.id != BCMA_CORE_80211))
                 return -ENODEV;
-        }
-        pci_set_master(pdev);
-
-        pci_read_config_dword(pdev, 0x40, &val);
-        if ((val & 0x0000ff00) != 0)
-                pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
 
         hw = ieee80211_alloc_hw(sizeof(struct brcms_info), &brcms_ops);
         if (!hw) {
@@ -1157,14 +1115,11 @@ brcms_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         SET_IEEE80211_DEV(hw, &pdev->dev);
 
-        pci_set_drvdata(pdev, hw);
+        bcma_set_drvdata(pdev, hw);
 
         memset(hw->priv, 0, sizeof(*wl));
 
-        wl = brcms_attach(pdev->vendor, pdev->device,
-                          pci_resource_start(pdev, 0), pdev,
-                          pdev->irq);
-
+        wl = brcms_attach(pdev);
         if (!wl) {
                 pr_err("%s: %s: brcms_attach failed!\n", KBUILD_MODNAME,
                        __func__);
@@ -1173,16 +1128,23 @@ brcms_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         return 0;
 }
 
-static int brcms_suspend(struct pci_dev *pdev, pm_message_t state)
+static int brcms_pci_suspend(struct pci_dev *pdev)
+{
+        pci_save_state(pdev);
+        pci_disable_device(pdev);
+        return pci_set_power_state(pdev, PCI_D3hot);
+}
+
+static int brcms_suspend(struct bcma_device *pdev, pm_message_t state)
 {
         struct brcms_info *wl;
         struct ieee80211_hw *hw;
 
-        hw = pci_get_drvdata(pdev);
+        hw = bcma_get_drvdata(pdev);
         wl = hw->priv;
         if (!wl) {
                 wiphy_err(wl->wiphy,
-                          "brcms_suspend: pci_get_drvdata failed\n");
+                          "brcms_suspend: bcma_get_drvdata failed\n");
                 return -ENODEV;
         }
 
@@ -1191,25 +1153,14 @@ static int brcms_suspend(struct pci_dev *pdev, pm_message_t state)
         wl->pub->hw_up = false;
         spin_unlock_bh(&wl->lock);
 
-        pci_save_state(pdev);
-        pci_disable_device(pdev);
-        return pci_set_power_state(pdev, PCI_D3hot);
+        /* temporarily do suspend ourselves */
+        return brcms_pci_suspend(pdev->bus->host_pci);
 }
 
-static int brcms_resume(struct pci_dev *pdev)
+static int brcms_pci_resume(struct pci_dev *pdev)
 {
-        struct brcms_info *wl;
-        struct ieee80211_hw *hw;
         int err = 0;
-        u32 val;
-
-        hw = pci_get_drvdata(pdev);
-        wl = hw->priv;
-        if (!wl) {
-                wiphy_err(wl->wiphy,
-                          "wl: brcms_resume: pci_get_drvdata failed\n");
-                return -ENODEV;
-        }
+        uint val;
 
         err = pci_set_power_state(pdev, PCI_D0);
         if (err)
@@ -1227,24 +1178,28 @@ static int brcms_resume(struct pci_dev *pdev)
         if ((val & 0x0000ff00) != 0)
                 pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
 
+        return 0;
+}
+
+static int brcms_resume(struct bcma_device *pdev)
+{
         /*
-        *  done. driver will be put in up state
-        *  in brcms_ops_add_interface() call.
+        *  just do pci resume for now until bcma supports it.
         */
-        return err;
+        return brcms_pci_resume(pdev->bus->host_pci);
 }
 
-static struct pci_driver brcms_pci_driver = {
+static struct bcma_driver brcms_bcma_driver = {
         .name     = KBUILD_MODNAME,
-        .probe    = brcms_pci_probe,
+        .probe    = brcms_bcma_probe,
         .suspend  = brcms_suspend,
         .resume   = brcms_resume,
         .remove   = __devexit_p(brcms_remove),
-        .id_table = brcms_pci_id_table,
+        .id_table = brcms_coreid_table,
 };
 
 /**
- * This is the main entry point for the WL driver.
+ * This is the main entry point for the brcmsmac driver.
  *
  * This function determines if a device pointed to by pdev is a WL device,
  * and if so, performs a brcms_attach() on it.
@@ -1259,26 +1214,24 @@ static int __init brcms_module_init(void)
                 brcm_msg_level = msglevel;
 #endif                          /* BCMDBG */
 
-        error = pci_register_driver(&brcms_pci_driver);
+        error = bcma_driver_register(&brcms_bcma_driver);
+        printk(KERN_ERR "%s: register returned %d\n", __func__, error);
         if (!error)
                 return 0;
 
-
-
         return error;
 }
 
 /**
- * This function unloads the WL driver from the system.
+ * This function unloads the brcmsmac driver from the system.
  *
- * This function unconditionally unloads the WL driver module from the
+ * This function unconditionally unloads the brcmsmac driver module from the
  * system.
  *
  */
 static void __exit brcms_module_exit(void)
 {
-        pci_unregister_driver(&brcms_pci_driver);
-
+        bcma_driver_unregister(&brcms_bcma_driver);
 }
 
 module_init(brcms_module_init);
@@ -1549,11 +1502,10 @@ int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, u32 idx)
                         if (le32_to_cpu(hdr->idx) == idx) {
                                 pdata = wl->fw.fw_bin[i]->data +
                                         le32_to_cpu(hdr->offset);
-                                *pbuf = kmalloc(len, GFP_ATOMIC);
+                                *pbuf = kmemdup(pdata, len, GFP_ATOMIC);
                                 if (*pbuf == NULL)
                                         goto fail;
 
-                                memcpy(*pbuf, pdata, len);
                                 return 0;
                         }
                 }
@@ -1566,7 +1518,7 @@ fail:
 }
 
 /*
- * Precondition: Since this function is called in brcms_pci_probe() context,
+ * Precondition: Since this function is called in brcms_bcma_probe() context,
  * no locking is required.
  */
 int brcms_ucode_init_uint(struct brcms_info *wl, size_t *n_bytes, u32 idx)
@@ -1606,7 +1558,7 @@ void brcms_ucode_free_buf(void *p)
 /*
  * checks validity of all firmware images loaded from user space
  *
- * Precondition: Since this function is called in brcms_pci_probe() context,
+ * Precondition: Since this function is called in brcms_bcma_probe() context,
  * no locking is required.
  */
 int brcms_check_firmwares(struct brcms_info *wl)
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
index 6242f188b717..8f60419c37bf 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
@@ -68,8 +68,6 @@ struct brcms_info {
         spinlock_t lock;        /* per-device perimeter lock */
         spinlock_t isr_lock;    /* per-device ISR synchronization lock */
 
-        /* regsva for unmap in brcms_free() */
-        void __iomem *regsva;   /* opaque chip registers virtual address */
 
         /* timer related fields */
         atomic_t callbacks;     /* # outstanding callback functions */
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 36e3e0638300..f7ed34034f88 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -388,10 +388,13 @@ static u16 get_sifs(struct brcms_band *band)
  */
 static bool brcms_deviceremoved(struct brcms_c_info *wlc)
 {
+        u32 macctrl;
+
         if (!wlc->hw->clk)
                 return ai_deviceremoved(wlc->hw->sih);
-        return (R_REG(&wlc->hw->regs->maccontrol) &
-                (MCTL_PSM_JMP_0 | MCTL_IHR_EN)) != MCTL_IHR_EN;
+        macctrl = bcma_read32(wlc->hw->d11core,
+                              D11REGOFFS(maccontrol));
+        return (macctrl & (MCTL_PSM_JMP_0 | MCTL_IHR_EN)) != MCTL_IHR_EN;
 }
 
 /* sum the individual fifo tx pending packet counts */
@@ -582,17 +585,15 @@ brcms_c_attach_malloc(uint unit, uint *err, uint devid)
 static void brcms_b_update_slot_timing(struct brcms_hardware *wlc_hw,
                                         bool shortslot)
 {
-        struct d11regs __iomem *regs;
-
-        regs = wlc_hw->regs;
+        struct bcma_device *core = wlc_hw->d11core;
 
         if (shortslot) {
                 /* 11g short slot: 11a timing */
-                W_REG(&regs->ifs_slot, 0x0207); /* APHY_SLOT_TIME */
+                bcma_write16(core, D11REGOFFS(ifs_slot), 0x0207);
                 brcms_b_write_shm(wlc_hw, M_DOT11_SLOT, APHY_SLOT_TIME);
         } else {
                 /* 11g long slot: 11b timing */
-                W_REG(&regs->ifs_slot, 0x0212); /* BPHY_SLOT_TIME */
+                bcma_write16(core, D11REGOFFS(ifs_slot), 0x0212);
                 brcms_b_write_shm(wlc_hw, M_DOT11_SLOT, BPHY_SLOT_TIME);
         }
 }
@@ -672,24 +673,22 @@ static uint brcms_c_calc_frame_time(struct brcms_c_info *wlc, u32 ratespec,
 static void brcms_c_write_inits(struct brcms_hardware *wlc_hw,
                                 const struct d11init *inits)
 {
+        struct bcma_device *core = wlc_hw->d11core;
         int i;
-        u8 __iomem *base;
-        u8 __iomem *addr;
+        uint offset;
         u16 size;
         u32 value;
 
         BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
 
-        base = (u8 __iomem *)wlc_hw->regs;
-
         for (i = 0; inits[i].addr != cpu_to_le16(0xffff); i++) {
                 size = le16_to_cpu(inits[i].size);
-                addr = base + le16_to_cpu(inits[i].addr);
+                offset = le16_to_cpu(inits[i].addr);
                 value = le32_to_cpu(inits[i].value);
                 if (size == 2)
-                        W_REG((u16 __iomem *)addr, value);
+                        bcma_write16(core, offset, value);
                 else if (size == 4)
-                        W_REG((u32 __iomem *)addr, value);
+                        bcma_write32(core, offset, value);
                 else
                         break;
         }
@@ -739,6 +738,14 @@ static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw)
         }
 }
 
+static void brcms_b_core_ioctl(struct brcms_hardware *wlc_hw, u32 m, u32 v)
+{
+        struct bcma_device *core = wlc_hw->d11core;
+        u32 ioctl = bcma_aread32(core, BCMA_IOCTL) & ~m;
+
+        bcma_awrite32(core, BCMA_IOCTL, ioctl | v);
+}
+
 static void brcms_b_core_phy_clk(struct brcms_hardware *wlc_hw, bool clk)
 {
         BCMMSG(wlc_hw->wlc->wiphy, "wl%d: clk %d\n", wlc_hw->unit, clk);
@@ -747,17 +754,17 @@ static void brcms_b_core_phy_clk(struct brcms_hardware *wlc_hw, bool clk)
 
         if (OFF == clk) {       /* clear gmode bit, put phy into reset */
 
-                ai_core_cflags(wlc_hw->sih, (SICF_PRST | SICF_FGC | SICF_GMODE),
-                               (SICF_PRST | SICF_FGC));
+                brcms_b_core_ioctl(wlc_hw, (SICF_PRST | SICF_FGC | SICF_GMODE),
+                                   (SICF_PRST | SICF_FGC));
                 udelay(1);
-                ai_core_cflags(wlc_hw->sih, (SICF_PRST | SICF_FGC), SICF_PRST);
+                brcms_b_core_ioctl(wlc_hw, (SICF_PRST | SICF_FGC), SICF_PRST);
                 udelay(1);
 
         } else {                /* take phy out of reset */
 
-                ai_core_cflags(wlc_hw->sih, (SICF_PRST | SICF_FGC), SICF_FGC);
+                brcms_b_core_ioctl(wlc_hw, (SICF_PRST | SICF_FGC), SICF_FGC);
                 udelay(1);
-                ai_core_cflags(wlc_hw->sih, (SICF_FGC), 0);
+                brcms_b_core_ioctl(wlc_hw, SICF_FGC, 0);
                 udelay(1);
 
         }
@@ -778,9 +785,14 @@ static void brcms_c_setxband(struct brcms_hardware *wlc_hw, uint bandunit)
         wlc_hw->wlc->band = wlc_hw->wlc->bandstate[bandunit];
 
         /* set gmode core flag */
-        if (wlc_hw->sbclk && !wlc_hw->noreset)
-                ai_core_cflags(wlc_hw->sih, SICF_GMODE,
-                               ((bandunit == 0) ? SICF_GMODE : 0));
+        if (wlc_hw->sbclk && !wlc_hw->noreset) {
+                u32 gmode = 0;
+
+                if (bandunit == 0)
+                        gmode = SICF_GMODE;
+
+                brcms_b_core_ioctl(wlc_hw, SICF_GMODE, gmode);
+        }
 }
 
 /* switch to new band but leave it inactive */
@@ -788,10 +800,12 @@ static u32 brcms_c_setband_inact(struct brcms_c_info *wlc, uint bandunit)
 {
         struct brcms_hardware *wlc_hw = wlc->hw;
         u32 macintmask;
+        u32 macctrl;
 
         BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-        WARN_ON((R_REG(&wlc_hw->regs->maccontrol) & MCTL_EN_MAC) != 0);
+        macctrl = bcma_read32(wlc_hw->d11core,
+                              D11REGOFFS(maccontrol));
+        WARN_ON((macctrl & MCTL_EN_MAC) != 0);
 
         /* disable interrupts */
         macintmask = brcms_intrsoff(wlc->wl);
@@ -955,8 +969,6 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs)
         brcms_c_txfifo_complete(wlc, queue, 1);
 
         if (lastframe) {
-                p->next = NULL;
-                p->prev = NULL;
                 /* remove PLCP & Broadcom tx descriptor header */
                 skb_pull(p, D11_PHY_HDR_LEN);
                 skb_pull(p, D11_TXH_LEN);
@@ -984,7 +996,7 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal)
 {
         bool morepending = false;
         struct brcms_c_info *wlc = wlc_hw->wlc;
-        struct d11regs __iomem *regs;
+        struct bcma_device *core;
         struct tx_status txstatus, *txs;
         u32 s1, s2;
         uint n = 0;
@@ -997,18 +1009,18 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal)
         BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
 
         txs = &txstatus;
-        regs = wlc_hw->regs;
+        core = wlc_hw->d11core;
         *fatal = false;
+        s1 = bcma_read32(core, D11REGOFFS(frmtxstatus));
         while (!(*fatal)
-               && (s1 = R_REG(&regs->frmtxstatus)) & TXS_V) {
+               && (s1 & TXS_V)) {
 
                 if (s1 == 0xffffffff) {
                         wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n",
                                 wlc_hw->unit, __func__);
                         return morepending;
                 }
-
-                s2 = R_REG(&regs->frmtxstatus2);
+                s2 = bcma_read32(core, D11REGOFFS(frmtxstatus2));
 
                 txs->status = s1 & TXS_STATUS_MASK;
                 txs->frameid = (s1 & TXS_FID_MASK) >> TXS_FID_SHIFT;
@@ -1021,6 +1033,7 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal)
                 /* !give others some time to run! */
                 if (++n >= max_tx_num)
                         break;
+                s1 = bcma_read32(core, D11REGOFFS(frmtxstatus));
         }
 
         if (*fatal)
@@ -1065,12 +1078,12 @@ brcms_c_mhfdef(struct brcms_c_info *wlc, u16 *mhfs, u16 mhf2_init)
         }
 }
 
-static struct dma64regs __iomem *
-dmareg(struct brcms_hardware *hw, uint direction, uint fifonum)
+static uint
+dmareg(uint direction, uint fifonum)
 {
         if (direction == DMA_TX)
-                return &(hw->regs->fifo64regs[fifonum].dmaxmt);
-        return &(hw->regs->fifo64regs[fifonum].dmarcv);
+                return offsetof(struct d11regs, fifo64regs[fifonum].dmaxmt);
+        return offsetof(struct d11regs, fifo64regs[fifonum].dmarcv);
 }
 
 static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)
@@ -1096,9 +1109,9 @@ static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)
                  * TX: TX_AC_BK_FIFO (TX AC Background data packets)
                  * RX: RX_FIFO (RX data packets)
                  */
-                wlc_hw->di[0] = dma_attach(name, wlc_hw->sih,
-                                           (wme ? dmareg(wlc_hw, DMA_TX, 0) :
-                                            NULL), dmareg(wlc_hw, DMA_RX, 0),
+                wlc_hw->di[0] = dma_attach(name, wlc_hw->sih, wlc_hw->d11core,
+                                           (wme ? dmareg(DMA_TX, 0) : 0),
+                                           dmareg(DMA_RX, 0),
                                            (wme ? NTXD : 0), NRXD,
                                            RXBUFSZ, -1, NRXBUFPOST,
                                            BRCMS_HWRXOFF, &brcm_msg_level);
@@ -1110,8 +1123,8 @@ static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)
                  *   (legacy) TX_DATA_FIFO (TX data packets)
                  * RX: UNUSED
                  */
-                wlc_hw->di[1] = dma_attach(name, wlc_hw->sih,
-                                           dmareg(wlc_hw, DMA_TX, 1), NULL,
+                wlc_hw->di[1] = dma_attach(name, wlc_hw->sih, wlc_hw->d11core,
+                                           dmareg(DMA_TX, 1), 0,
                                            NTXD, 0, 0, -1, 0, 0,
                                            &brcm_msg_level);
                 dma_attach_err |= (NULL == wlc_hw->di[1]);
@@ -1121,8 +1134,8 @@ static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)
                  * TX: TX_AC_VI_FIFO (TX AC Video data packets)
                  * RX: UNUSED
                  */
-                wlc_hw->di[2] = dma_attach(name, wlc_hw->sih,
-                                           dmareg(wlc_hw, DMA_TX, 2), NULL,
+                wlc_hw->di[2] = dma_attach(name, wlc_hw->sih, wlc_hw->d11core,
+                                           dmareg(DMA_TX, 2), 0,
                                            NTXD, 0, 0, -1, 0, 0,
                                            &brcm_msg_level);
                 dma_attach_err |= (NULL == wlc_hw->di[2]);
@@ -1131,9 +1144,9 @@ static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)
                  * TX: TX_AC_VO_FIFO (TX AC Voice data packets)
                  *   (legacy) TX_CTL_FIFO (TX control & mgmt packets)
                  */
-                wlc_hw->di[3] = dma_attach(name, wlc_hw->sih,
-                                           dmareg(wlc_hw, DMA_TX, 3),
-                                           NULL, NTXD, 0, 0, -1,
+                wlc_hw->di[3] = dma_attach(name, wlc_hw->sih, wlc_hw->d11core,
+                                           dmareg(DMA_TX, 3),
+                                           0, NTXD, 0, 0, -1,
                                            0, 0, &brcm_msg_level);
                 dma_attach_err |= (NULL == wlc_hw->di[3]);
 /* Cleaner to leave this as if with AP defined */
@@ -1207,7 +1220,7 @@ static void brcms_b_wait_for_wake(struct brcms_hardware *wlc_hw)
 /* control chip clock to save power, enable dynamic clock or force fast clock */
 static void brcms_b_clkctl_clk(struct brcms_hardware *wlc_hw, uint mode)
 {
-        if (wlc_hw->sih->cccaps & CC_CAP_PMU) {
+        if (ai_get_cccaps(wlc_hw->sih) & CC_CAP_PMU) {
                 /* new chips with PMU, CCS_FORCEHT will distribute the HT clock
                  * on backplane, but mac core will still run on ALP(not HT) when
                  * it enters powersave mode, which means the FCA bit may not be
@@ -1216,29 +1229,33 @@ static void brcms_b_clkctl_clk(struct brcms_hardware *wlc_hw, uint mode)
 
                 if (wlc_hw->clk) {
                         if (mode == CLK_FAST) {
-                                OR_REG(&wlc_hw->regs->clk_ctl_st,
-                                       CCS_FORCEHT);
+                                bcma_set32(wlc_hw->d11core,
+                                           D11REGOFFS(clk_ctl_st),
+                                           CCS_FORCEHT);
 
                                 udelay(64);
 
-                                SPINWAIT(((R_REG
-                                           (&wlc_hw->regs->
-                                            clk_ctl_st) & CCS_HTAVAIL) == 0),
-                                         PMU_MAX_TRANSITION_DLY);
-                                WARN_ON(!(R_REG
-                                          (&wlc_hw->regs->
-                                           clk_ctl_st) & CCS_HTAVAIL));
+                                SPINWAIT(
+                                    ((bcma_read32(wlc_hw->d11core,
+                                      D11REGOFFS(clk_ctl_st)) &
+                                      CCS_HTAVAIL) == 0),
+                                      PMU_MAX_TRANSITION_DLY);
+                                WARN_ON(!(bcma_read32(wlc_hw->d11core,
+                                        D11REGOFFS(clk_ctl_st)) &
+                                        CCS_HTAVAIL));
                         } else {
-                                if ((wlc_hw->sih->pmurev == 0) &&
-                                    (R_REG
-                                     (&wlc_hw->regs->
-                                      clk_ctl_st) & (CCS_FORCEHT | CCS_HTAREQ)))
-                                        SPINWAIT(((R_REG
-                                                   (&wlc_hw->regs->
-                                                    clk_ctl_st) & CCS_HTAVAIL)
-                                                  == 0),
-                                                 PMU_MAX_TRANSITION_DLY);
-                                AND_REG(&wlc_hw->regs->clk_ctl_st,
+                                if ((ai_get_pmurev(wlc_hw->sih) == 0) &&
+                                    (bcma_read32(wlc_hw->d11core,
+                                        D11REGOFFS(clk_ctl_st)) &
+                                        (CCS_FORCEHT | CCS_HTAREQ)))
+                                        SPINWAIT(
+                                            ((bcma_read32(wlc_hw->d11core,
+                                              offsetof(struct d11regs,
+                                                       clk_ctl_st)) &
+                                              CCS_HTAVAIL) == 0),
+                                              PMU_MAX_TRANSITION_DLY);
+                                bcma_mask32(wlc_hw->d11core,
+                                        D11REGOFFS(clk_ctl_st),
                                         ~CCS_FORCEHT);
                         }
                 }
@@ -1253,7 +1270,7 @@ static void brcms_b_clkctl_clk(struct brcms_hardware *wlc_hw, uint mode)
 
                 /* check fast clock is available (if core is not in reset) */
                 if (wlc_hw->forcefastclk && wlc_hw->clk)
-                        WARN_ON(!(ai_core_sflags(wlc_hw->sih, 0, 0) &
+                        WARN_ON(!(bcma_aread32(wlc_hw->d11core, BCMA_IOST) &
                                   SISF_FCLKA));
 
                 /*
@@ -1370,7 +1387,8 @@ static void brcms_c_mctrl_write(struct brcms_hardware *wlc_hw)
                 maccontrol |= MCTL_INFRA;
         }
 
-        W_REG(&wlc_hw->regs->maccontrol, maccontrol);
+        bcma_write32(wlc_hw->d11core, D11REGOFFS(maccontrol),
+                     maccontrol);
 }
 
 /* set or clear maccontrol bits */
@@ -1464,7 +1482,7 @@ static void
 brcms_b_set_addrmatch(struct brcms_hardware *wlc_hw, int match_reg_offset,
                        const u8 *addr)
 {
-        struct d11regs __iomem *regs;
+        struct bcma_device *core = wlc_hw->d11core;
         u16 mac_l;
         u16 mac_m;
         u16 mac_h;
@@ -1472,38 +1490,36 @@ brcms_b_set_addrmatch(struct brcms_hardware *wlc_hw, int match_reg_offset,
         BCMMSG(wlc_hw->wlc->wiphy, "wl%d: brcms_b_set_addrmatch\n",
                  wlc_hw->unit);
 
-        regs = wlc_hw->regs;
         mac_l = addr[0] | (addr[1] << 8);
         mac_m = addr[2] | (addr[3] << 8);
         mac_h = addr[4] | (addr[5] << 8);
 
         /* enter the MAC addr into the RXE match registers */
-        W_REG(&regs->rcm_ctl, RCM_INC_DATA | match_reg_offset);
-        W_REG(&regs->rcm_mat_data, mac_l);
-        W_REG(&regs->rcm_mat_data, mac_m);
-        W_REG(&regs->rcm_mat_data, mac_h);
-
+        bcma_write16(core, D11REGOFFS(rcm_ctl),
+                     RCM_INC_DATA | match_reg_offset);
+        bcma_write16(core, D11REGOFFS(rcm_mat_data), mac_l);
+        bcma_write16(core, D11REGOFFS(rcm_mat_data), mac_m);
+        bcma_write16(core, D11REGOFFS(rcm_mat_data), mac_h);
 }
 
 void
 brcms_b_write_template_ram(struct brcms_hardware *wlc_hw, int offset, int len,
                             void *buf)
 {
-        struct d11regs __iomem *regs;
+        struct bcma_device *core = wlc_hw->d11core;
         u32 word;
         __le32 word_le;
         __be32 word_be;
         bool be_bit;
         BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
 
-        regs = wlc_hw->regs;
-        W_REG(&regs->tplatewrptr, offset);
+        bcma_write32(core, D11REGOFFS(tplatewrptr), offset);
 
         /* if MCTL_BIGEND bit set in mac control register,
          * the chip swaps data in fifo, as well as data in
          * template ram
          */
-        be_bit = (R_REG(&regs->maccontrol) & MCTL_BIGEND) != 0;
+        be_bit = (bcma_read32(core, D11REGOFFS(maccontrol)) & MCTL_BIGEND) != 0;
 
         while (len > 0) {
                 memcpy(&word, buf, sizeof(u32));
@@ -1516,7 +1532,7 @@ brcms_b_write_template_ram(struct brcms_hardware *wlc_hw, int offset, int len,
                         word = *(u32 *)&word_le;
                 }
 
-                W_REG(&regs->tplatewrdata, word);
+                bcma_write32(core, D11REGOFFS(tplatewrdata), word);
 
                 buf = (u8 *) buf + sizeof(u32);
                 len -= sizeof(u32);
@@ -1527,18 +1543,20 @@ static void brcms_b_set_cwmin(struct brcms_hardware *wlc_hw, u16 newmin)
 {
         wlc_hw->band->CWmin = newmin;
 
-        W_REG(&wlc_hw->regs->objaddr, OBJADDR_SCR_SEL | S_DOT11_CWMIN);
-        (void)R_REG(&wlc_hw->regs->objaddr);
-        W_REG(&wlc_hw->regs->objdata, newmin);
+        bcma_write32(wlc_hw->d11core, D11REGOFFS(objaddr),
+                     OBJADDR_SCR_SEL | S_DOT11_CWMIN);
+        (void)bcma_read32(wlc_hw->d11core, D11REGOFFS(objaddr));
+        bcma_write32(wlc_hw->d11core, D11REGOFFS(objdata), newmin);
 }
 
 static void brcms_b_set_cwmax(struct brcms_hardware *wlc_hw, u16 newmax)
 {
         wlc_hw->band->CWmax = newmax;
 
-        W_REG(&wlc_hw->regs->objaddr, OBJADDR_SCR_SEL | S_DOT11_CWMAX);
-        (void)R_REG(&wlc_hw->regs->objaddr);
-        W_REG(&wlc_hw->regs->objdata, newmax);
+        bcma_write32(wlc_hw->d11core, D11REGOFFS(objaddr),
+                     OBJADDR_SCR_SEL | S_DOT11_CWMAX);
+        (void)bcma_read32(wlc_hw->d11core, D11REGOFFS(objaddr));
+        bcma_write32(wlc_hw->d11core, D11REGOFFS(objdata), newmax);
 }
 
 void brcms_b_bw_set(struct brcms_hardware *wlc_hw, u16 bw)
@@ -1704,17 +1722,17 @@ void brcms_b_core_phypll_reset(struct brcms_hardware *wlc_hw)
 {
         BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
 
-        ai_corereg(wlc_hw->sih, SI_CC_IDX,
-                   offsetof(struct chipcregs, chipcontrol_addr), ~0, 0);
+        ai_cc_reg(wlc_hw->sih, offsetof(struct chipcregs, chipcontrol_addr),
+                  ~0, 0);
         udelay(1);
-        ai_corereg(wlc_hw->sih, SI_CC_IDX,
-                   offsetof(struct chipcregs, chipcontrol_data), 0x4, 0);
+        ai_cc_reg(wlc_hw->sih, offsetof(struct chipcregs, chipcontrol_data),
+                  0x4, 0);
         udelay(1);
-        ai_corereg(wlc_hw->sih, SI_CC_IDX,
-                   offsetof(struct chipcregs, chipcontrol_data), 0x4, 4);
+        ai_cc_reg(wlc_hw->sih, offsetof(struct chipcregs, chipcontrol_data),
+                  0x4, 4);
         udelay(1);
-        ai_corereg(wlc_hw->sih, SI_CC_IDX,
-                   offsetof(struct chipcregs, chipcontrol_data), 0x4, 0);
+        ai_cc_reg(wlc_hw->sih, offsetof(struct chipcregs, chipcontrol_data),
+                  0x4, 0);
         udelay(1);
 }
 
@@ -1728,18 +1746,18 @@ void brcms_b_phyclk_fgc(struct brcms_hardware *wlc_hw, bool clk)
                 return;
 
         if (ON == clk)
-                ai_core_cflags(wlc_hw->sih, SICF_FGC, SICF_FGC);
+                brcms_b_core_ioctl(wlc_hw, SICF_FGC, SICF_FGC);
         else
-                ai_core_cflags(wlc_hw->sih, SICF_FGC, 0);
+                brcms_b_core_ioctl(wlc_hw, SICF_FGC, 0);
 
 }
 
 void brcms_b_macphyclk_set(struct brcms_hardware *wlc_hw, bool clk)
 {
         if (ON == clk)
-                ai_core_cflags(wlc_hw->sih, SICF_MPCLKE, SICF_MPCLKE);
+                brcms_b_core_ioctl(wlc_hw, SICF_MPCLKE, SICF_MPCLKE);
         else
-                ai_core_cflags(wlc_hw->sih, SICF_MPCLKE, 0);
+                brcms_b_core_ioctl(wlc_hw, SICF_MPCLKE, 0);
 }
 
 void brcms_b_phy_reset(struct brcms_hardware *wlc_hw)
@@ -1759,7 +1777,7 @@ void brcms_b_phy_reset(struct brcms_hardware *wlc_hw)
         if (BRCMS_ISNPHY(wlc_hw->band) && NREV_GE(wlc_hw->band->phyrev, 3) &&
             NREV_LE(wlc_hw->band->phyrev, 4)) {
                 /* Set the PHY bandwidth */
-                ai_core_cflags(wlc_hw->sih, SICF_BWMASK, phy_bw_clkbits);
+                brcms_b_core_ioctl(wlc_hw, SICF_BWMASK, phy_bw_clkbits);
 
                 udelay(1);
 
@@ -1767,13 +1785,13 @@ void brcms_b_phy_reset(struct brcms_hardware *wlc_hw)
                 brcms_b_core_phypll_reset(wlc_hw);
 
                 /* reset the PHY */
-                ai_core_cflags(wlc_hw->sih, (SICF_PRST | SICF_PCLKE),
-                               (SICF_PRST | SICF_PCLKE));
+                brcms_b_core_ioctl(wlc_hw, (SICF_PRST | SICF_PCLKE),
+                                   (SICF_PRST | SICF_PCLKE));
                 phy_in_reset = true;
         } else {
-                ai_core_cflags(wlc_hw->sih,
-                               (SICF_PRST | SICF_PCLKE | SICF_BWMASK),
-                               (SICF_PRST | SICF_PCLKE | phy_bw_clkbits));
+                brcms_b_core_ioctl(wlc_hw,
+                                   (SICF_PRST | SICF_PCLKE | SICF_BWMASK),
+                                   (SICF_PRST | SICF_PCLKE | phy_bw_clkbits));
         }
 
         udelay(2);
@@ -1790,8 +1808,8 @@ static void brcms_b_setband(struct brcms_hardware *wlc_hw, uint bandunit,
         u32 macintmask;
 
         /* Enable the d11 core before accessing it */
-        if (!ai_iscoreup(wlc_hw->sih)) {
-                ai_core_reset(wlc_hw->sih, 0, 0);
+        if (!bcma_core_is_enabled(wlc_hw->d11core)) {
+                bcma_core_enable(wlc_hw->d11core, 0);
                 brcms_c_mctrl_reset(wlc_hw);
         }
 
@@ -1817,7 +1835,8 @@ static void brcms_b_setband(struct brcms_hardware *wlc_hw, uint bandunit,
         brcms_intrsrestore(wlc->wl, macintmask);
 
         /* ucode should still be suspended.. */
-        WARN_ON((R_REG(&wlc_hw->regs->maccontrol) & MCTL_EN_MAC) != 0);
+        WARN_ON((bcma_read32(wlc_hw->d11core, D11REGOFFS(maccontrol)) &
+                 MCTL_EN_MAC) != 0);
 }
 
 static bool brcms_c_isgoodchip(struct brcms_hardware *wlc_hw)
@@ -1845,7 +1864,7 @@ static bool brcms_c_validboardtype(struct brcms_hardware *wlc_hw)
         uint b2 = boardrev & 0xf;
 
         /* voards from other vendors are always considered valid */
-        if (wlc_hw->sih->boardvendor != PCI_VENDOR_ID_BROADCOM)
+        if (ai_get_boardvendor(wlc_hw->sih) != PCI_VENDOR_ID_BROADCOM)
                 return true;
 
         /* do some boardrev sanity checks when boardvendor is Broadcom */
@@ -1917,7 +1936,7 @@ static void brcms_b_xtal(struct brcms_hardware *wlc_hw, bool want)
 static bool brcms_b_radio_read_hwdisabled(struct brcms_hardware *wlc_hw)
 {
         bool v, clk, xtal;
-        u32 resetbits = 0, flags = 0;
+        u32 flags = 0;
 
         xtal = wlc_hw->sbclk;
         if (!xtal)
@@ -1934,22 +1953,22 @@ static bool brcms_b_radio_read_hwdisabled(struct brcms_hardware *wlc_hw)
                 flags |= SICF_PCLKE;
 
                 /*
+                 * TODO: test suspend/resume
+                 *
                  * AI chip doesn't restore bar0win2 on
                  * hibernation/resume, need sw fixup
                  */
-                if ((wlc_hw->sih->chip == BCM43224_CHIP_ID) ||
-                    (wlc_hw->sih->chip == BCM43225_CHIP_ID))
-                        wlc_hw->regs = (struct d11regs __iomem *)
-                                        ai_setcore(wlc_hw->sih, D11_CORE_ID, 0);
-                ai_core_reset(wlc_hw->sih, flags, resetbits);
+
+                bcma_core_enable(wlc_hw->d11core, flags);
                 brcms_c_mctrl_reset(wlc_hw);
         }
 
-        v = ((R_REG(&wlc_hw->regs->phydebug) & PDBG_RFD) != 0);
+        v = ((bcma_read32(wlc_hw->d11core,
+                          D11REGOFFS(phydebug)) & PDBG_RFD) != 0);
 
         /* put core back into reset */
         if (!clk)
-                ai_core_disable(wlc_hw->sih, 0);
+                bcma_core_disable(wlc_hw->d11core, 0);
 
         if (!xtal)
                 brcms_b_xtal(wlc_hw, OFF);
@@ -1973,25 +1992,21 @@ static bool wlc_dma_rxreset(struct brcms_hardware *wlc_hw, uint fifo)
  */
 void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags)
 {
-        struct d11regs __iomem *regs;
         uint i;
         bool fastclk;
-        u32 resetbits = 0;
 
         if (flags == BRCMS_USE_COREFLAGS)
                 flags = (wlc_hw->band->pi ? wlc_hw->band->core_flags : 0);
 
         BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
 
-        regs = wlc_hw->regs;
-
         /* request FAST clock if not on  */
         fastclk = wlc_hw->forcefastclk;
         if (!fastclk)
                 brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
 
         /* reset the dma engines except first time thru */
-        if (ai_iscoreup(wlc_hw->sih)) {
+        if (bcma_core_is_enabled(wlc_hw->d11core)) {
                 for (i = 0; i < NFIFO; i++)
                         if ((wlc_hw->di[i]) && (!dma_txreset(wlc_hw->di[i])))
                                 wiphy_err(wlc_hw->wlc->wiphy, "wl%d: %s: "
@@ -2029,14 +2044,14 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags)
          * they may touch chipcommon as well.
          */
         wlc_hw->clk = false;
-        ai_core_reset(wlc_hw->sih, flags, resetbits);
+        bcma_core_enable(wlc_hw->d11core, flags);
         wlc_hw->clk = true;
         if (wlc_hw->band && wlc_hw->band->pi)
                 wlc_phy_hw_clk_state_upd(wlc_hw->band->pi, true);
 
         brcms_c_mctrl_reset(wlc_hw);
 
-        if (wlc_hw->sih->cccaps & CC_CAP_PMU)
+        if (ai_get_cccaps(wlc_hw->sih) & CC_CAP_PMU)
                 brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
 
         brcms_b_phy_reset(wlc_hw);
@@ -2057,7 +2072,7 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags)
  */
 static void brcms_b_corerev_fifofixup(struct brcms_hardware *wlc_hw)
 {
-        struct d11regs __iomem *regs = wlc_hw->regs;
+        struct bcma_device *core = wlc_hw->d11core;
         u16 fifo_nu;
         u16 txfifo_startblk = TXFIFO_START_BLK, txfifo_endblk;
         u16 txfifo_def, txfifo_def1;
@@ -2078,11 +2093,11 @@ static void brcms_b_corerev_fifofixup(struct brcms_hardware *wlc_hw)
                 txfifo_cmd =
                     TXFIFOCMD_RESET_MASK | (fifo_nu << TXFIFOCMD_FIFOSEL_SHIFT);
 
-                W_REG(&regs->xmtfifocmd, txfifo_cmd);
-                W_REG(&regs->xmtfifodef, txfifo_def);
-                W_REG(&regs->xmtfifodef1, txfifo_def1);
+                bcma_write16(core, D11REGOFFS(xmtfifocmd), txfifo_cmd);
+                bcma_write16(core, D11REGOFFS(xmtfifodef), txfifo_def);
+                bcma_write16(core, D11REGOFFS(xmtfifodef1), txfifo_def1);
 
-                W_REG(&regs->xmtfifocmd, txfifo_cmd);
+                bcma_write16(core, D11REGOFFS(xmtfifocmd), txfifo_cmd);
 
                 txfifo_startblk += wlc_hw->xmtfifo_sz[fifo_nu];
         }
@@ -2117,27 +2132,27 @@ static void brcms_b_corerev_fifofixup(struct brcms_hardware *wlc_hw)
 
 void brcms_b_switch_macfreq(struct brcms_hardware *wlc_hw, u8 spurmode)
 {
-        struct d11regs __iomem *regs = wlc_hw->regs;
+        struct bcma_device *core = wlc_hw->d11core;
 
-        if ((wlc_hw->sih->chip == BCM43224_CHIP_ID) ||
-            (wlc_hw->sih->chip == BCM43225_CHIP_ID)) {
+        if ((ai_get_chip_id(wlc_hw->sih) == BCM43224_CHIP_ID) ||
+            (ai_get_chip_id(wlc_hw->sih) == BCM43225_CHIP_ID)) {
                 if (spurmode == WL_SPURAVOID_ON2) {     /* 126Mhz */
-                        W_REG(&regs->tsf_clk_frac_l, 0x2082);
-                        W_REG(&regs->tsf_clk_frac_h, 0x8);
+                        bcma_write16(core, D11REGOFFS(tsf_clk_frac_l), 0x2082);
+                        bcma_write16(core, D11REGOFFS(tsf_clk_frac_h), 0x8);
                 } else if (spurmode == WL_SPURAVOID_ON1) {      /* 123Mhz */
-                        W_REG(&regs->tsf_clk_frac_l, 0x5341);
-                        W_REG(&regs->tsf_clk_frac_h, 0x8);
+                        bcma_write16(core, D11REGOFFS(tsf_clk_frac_l), 0x5341);
+                        bcma_write16(core, D11REGOFFS(tsf_clk_frac_h), 0x8);
                 } else {        /* 120Mhz */
-                        W_REG(&regs->tsf_clk_frac_l, 0x8889);
-                        W_REG(&regs->tsf_clk_frac_h, 0x8);
+                        bcma_write16(core, D11REGOFFS(tsf_clk_frac_l), 0x8889);
+                        bcma_write16(core, D11REGOFFS(tsf_clk_frac_h), 0x8);
                 }
         } else if (BRCMS_ISLCNPHY(wlc_hw->band)) {
                 if (spurmode == WL_SPURAVOID_ON1) {     /* 82Mhz */
-                        W_REG(&regs->tsf_clk_frac_l, 0x7CE0);
-                        W_REG(&regs->tsf_clk_frac_h, 0xC);
+                        bcma_write16(core, D11REGOFFS(tsf_clk_frac_l), 0x7CE0);
+                        bcma_write16(core, D11REGOFFS(tsf_clk_frac_h), 0xC);
                 } else {        /* 80Mhz */
-                        W_REG(&regs->tsf_clk_frac_l, 0xCCCD);
-                        W_REG(&regs->tsf_clk_frac_h, 0xC);
+                        bcma_write16(core, D11REGOFFS(tsf_clk_frac_l), 0xCCCD);
+                        bcma_write16(core, D11REGOFFS(tsf_clk_frac_h), 0xC);
                 }
         }
 }
@@ -2146,11 +2161,8 @@ void brcms_b_switch_macfreq(struct brcms_hardware *wlc_hw, u8 spurmode)
 static void brcms_c_gpio_init(struct brcms_c_info *wlc)
 {
         struct brcms_hardware *wlc_hw = wlc->hw;
-        struct d11regs __iomem *regs;
         u32 gc, gm;
 
-        regs = wlc_hw->regs;
-
         /* use GPIO select 0 to get all gpio signals from the gpio out reg */
         brcms_b_mctrl(wlc_hw, MCTL_GPOUT_SEL_MASK, 0);
 
@@ -2181,10 +2193,10 @@ static void brcms_c_gpio_init(struct brcms_c_info *wlc)
                  * The board itself is powered by these GPIOs
                  * (when not sending pattern) so set them high
                  */
-                OR_REG(&regs->psm_gpio_oe,
-                       (BOARD_GPIO_12 | BOARD_GPIO_13));
-                OR_REG(&regs->psm_gpio_out,
-                       (BOARD_GPIO_12 | BOARD_GPIO_13));
+                bcma_set16(wlc_hw->d11core, D11REGOFFS(psm_gpio_oe),
+                           (BOARD_GPIO_12 | BOARD_GPIO_13));
+                bcma_set16(wlc_hw->d11core, D11REGOFFS(psm_gpio_out),
+                           (BOARD_GPIO_12 | BOARD_GPIO_13));
 
                 /* Enable antenna diversity, use 2x4 mode */
                 brcms_b_mhf(wlc_hw, MHF3, MHF3_ANTSEL_EN,
@@ -2211,7 +2223,7 @@ static void brcms_c_gpio_init(struct brcms_c_info *wlc)
 static void brcms_ucode_write(struct brcms_hardware *wlc_hw,
                               const __le32 ucode[], const size_t nbytes)
 {
-        struct d11regs __iomem *regs = wlc_hw->regs;
+        struct bcma_device *core = wlc_hw->d11core;
         uint i;
         uint count;
 
@@ -2219,10 +2231,11 @@ static void brcms_ucode_write(struct brcms_hardware *wlc_hw,
 
         count = (nbytes / sizeof(u32));
 
-        W_REG(&regs->objaddr, (OBJADDR_AUTO_INC | OBJADDR_UCM_SEL));
-        (void)R_REG(&regs->objaddr);
+        bcma_write32(core, D11REGOFFS(objaddr),
+                     OBJADDR_AUTO_INC | OBJADDR_UCM_SEL);
+        (void)bcma_read32(core, D11REGOFFS(objaddr));
         for (i = 0; i < count; i++)
-                W_REG(&regs->objdata, le32_to_cpu(ucode[i]));
+                bcma_write32(core, D11REGOFFS(objdata), le32_to_cpu(ucode[i]));
 
 }
 
@@ -2288,7 +2301,7 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)
         bool fatal = false;
         uint unit;
         uint intstatus, idx;
-        struct d11regs __iomem *regs = wlc_hw->regs;
+        struct bcma_device *core = wlc_hw->d11core;
         struct wiphy *wiphy = wlc_hw->wlc->wiphy;
 
         unit = wlc_hw->unit;
@@ -2296,7 +2309,9 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)
         for (idx = 0; idx < NFIFO; idx++) {
                 /* read intstatus register and ignore any non-error bits */
                 intstatus =
-                    R_REG(&regs->intctrlregs[idx].intstatus) & I_ERRORS;
+                        bcma_read32(core,
+                                    D11REGOFFS(intctrlregs[idx].intstatus)) &
+                        I_ERRORS;
                 if (!intstatus)
                         continue;
 
@@ -2341,8 +2356,9 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)
                         brcms_fatal_error(wlc_hw->wlc->wl); /* big hammer */
                         break;
                 } else
-                        W_REG(&regs->intctrlregs[idx].intstatus,
-                              intstatus);
+                        bcma_write32(core,
+                                     D11REGOFFS(intctrlregs[idx].intstatus),
+                                     intstatus);
         }
 }
 
@@ -2350,28 +2366,7 @@ void brcms_c_intrson(struct brcms_c_info *wlc)
 {
         struct brcms_hardware *wlc_hw = wlc->hw;
         wlc->macintmask = wlc->defmacintmask;
-        W_REG(&wlc_hw->regs->macintmask, wlc->macintmask);
-}
-
-/*
- * callback for siutils.c, which has only wlc handler, no wl they both check
- * up, not only because there is no need to off/restore d11 interrupt but also
- * because per-port code may require sync with valid interrupt.
- */
-static u32 brcms_c_wlintrsoff(struct brcms_c_info *wlc)
-{
-        if (!wlc->hw->up)
-                return 0;
-
-        return brcms_intrsoff(wlc->wl);
-}
-
-static void brcms_c_wlintrsrestore(struct brcms_c_info *wlc, u32 macintmask)
-{
-        if (!wlc->hw->up)
-                return;
-
-        brcms_intrsrestore(wlc->wl, macintmask);
+        bcma_write32(wlc_hw->d11core, D11REGOFFS(macintmask), wlc->macintmask);
 }
 
 u32 brcms_c_intrsoff(struct brcms_c_info *wlc)
@@ -2384,8 +2379,8 @@ u32 brcms_c_intrsoff(struct brcms_c_info *wlc)
 
         macintmask = wlc->macintmask;   /* isr can still happen */
 
-        W_REG(&wlc_hw->regs->macintmask, 0);
-        (void)R_REG(&wlc_hw->regs->macintmask); /* sync readback */
+        bcma_write32(wlc_hw->d11core, D11REGOFFS(macintmask), 0);
+        (void)bcma_read32(wlc_hw->d11core, D11REGOFFS(macintmask));
         udelay(1);              /* ensure int line is no longer driven */
         wlc->macintmask = 0;
 
@@ -2400,7 +2395,7 @@ void brcms_c_intrsrestore(struct brcms_c_info *wlc, u32 macintmask)
                 return;
 
         wlc->macintmask = macintmask;
-        W_REG(&wlc_hw->regs->macintmask, wlc->macintmask);
+        bcma_write32(wlc_hw->d11core, D11REGOFFS(macintmask), wlc->macintmask);
 }
 
 /* assumes that the d11 MAC is enabled */
@@ -2512,11 +2507,11 @@ brcms_c_mute(struct brcms_c_info *wlc, bool mute_tx)
 static inline u32 wlc_intstatus(struct brcms_c_info *wlc, bool in_isr)
 {
         struct brcms_hardware *wlc_hw = wlc->hw;
-        struct d11regs __iomem *regs = wlc_hw->regs;
+        struct bcma_device *core = wlc_hw->d11core;
         u32 macintstatus;
 
         /* macintstatus includes a DMA interrupt summary bit */
-        macintstatus = R_REG(&regs->macintstatus);
+        macintstatus = bcma_read32(core, D11REGOFFS(macintstatus));
 
         BCMMSG(wlc->wiphy, "wl%d: macintstatus: 0x%x\n", wlc_hw->unit,
                  macintstatus);
@@ -2543,12 +2538,12 @@ static inline u32 wlc_intstatus(struct brcms_c_info *wlc, bool in_isr)
          * consequences
          */
         /* turn off the interrupts */
-        W_REG(&regs->macintmask, 0);
-        (void)R_REG(&regs->macintmask); /* sync readback */
+        bcma_write32(core, D11REGOFFS(macintmask), 0);
+        (void)bcma_read32(core, D11REGOFFS(macintmask));
         wlc->macintmask = 0;
 
         /* clear device interrupts */
-        W_REG(&regs->macintstatus, macintstatus);
+        bcma_write32(core, D11REGOFFS(macintstatus), macintstatus);
 
         /* MI_DMAINT is indication of non-zero intstatus */
         if (macintstatus & MI_DMAINT)
@@ -2557,8 +2552,8 @@ static inline u32 wlc_intstatus(struct brcms_c_info *wlc, bool in_isr)
                  * RX_FIFO. If MI_DMAINT is set, assume it
                  * is set and clear the interrupt.
                  */
-                W_REG(&regs->intctrlregs[RX_FIFO].intstatus,
-                      DEF_RXINTMASK);
+                bcma_write32(core, D11REGOFFS(intctrlregs[RX_FIFO].intstatus),
+                             DEF_RXINTMASK);
 
         return macintstatus;
 }
@@ -2621,7 +2616,7 @@ bool brcms_c_isr(struct brcms_c_info *wlc, bool *wantdpc)
 void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
 {
         struct brcms_hardware *wlc_hw = wlc->hw;
-        struct d11regs __iomem *regs = wlc_hw->regs;
+        struct bcma_device *core = wlc_hw->d11core;
         u32 mc, mi;
         struct wiphy *wiphy = wlc->wiphy;
 
@@ -2638,7 +2633,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
         /* force the core awake */
         brcms_c_ucode_wake_override_set(wlc_hw, BRCMS_WAKE_OVERRIDE_MACSUSPEND);
 
-        mc = R_REG(&regs->maccontrol);
+        mc = bcma_read32(core, D11REGOFFS(maccontrol));
 
         if (mc == 0xffffffff) {
                 wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
@@ -2650,7 +2645,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
         WARN_ON(!(mc & MCTL_PSM_RUN));
         WARN_ON(!(mc & MCTL_EN_MAC));
 
-        mi = R_REG(&regs->macintstatus);
+        mi = bcma_read32(core, D11REGOFFS(macintstatus));
         if (mi == 0xffffffff) {
                 wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
                           __func__);
@@ -2661,21 +2656,21 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
 
         brcms_b_mctrl(wlc_hw, MCTL_EN_MAC, 0);
 
-        SPINWAIT(!(R_REG(&regs->macintstatus) & MI_MACSSPNDD),
+        SPINWAIT(!(bcma_read32(core, D11REGOFFS(macintstatus)) & MI_MACSSPNDD),
                  BRCMS_MAX_MAC_SUSPEND);
 
-        if (!(R_REG(&regs->macintstatus) & MI_MACSSPNDD)) {
+        if (!(bcma_read32(core, D11REGOFFS(macintstatus)) & MI_MACSSPNDD)) {
                 wiphy_err(wiphy, "wl%d: wlc_suspend_mac_and_wait: waited %d uS"
                           " and MI_MACSSPNDD is still not on.\n",
                           wlc_hw->unit, BRCMS_MAX_MAC_SUSPEND);
                 wiphy_err(wiphy, "wl%d: psmdebug 0x%08x, phydebug 0x%08x, "
                           "psm_brc 0x%04x\n", wlc_hw->unit,
-                          R_REG(&regs->psmdebug),
-                          R_REG(&regs->phydebug),
-                          R_REG(&regs->psm_brc));
+                          bcma_read32(core, D11REGOFFS(psmdebug)),
+                          bcma_read32(core, D11REGOFFS(phydebug)),
+                          bcma_read16(core, D11REGOFFS(psm_brc)));
         }
 
-        mc = R_REG(&regs->maccontrol);
+        mc = bcma_read32(core, D11REGOFFS(maccontrol));
         if (mc == 0xffffffff) {
                 wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
                           __func__);
@@ -2690,7 +2685,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
 void brcms_c_enable_mac(struct brcms_c_info *wlc)
 {
         struct brcms_hardware *wlc_hw = wlc->hw;
-        struct d11regs __iomem *regs = wlc_hw->regs;
+        struct bcma_device *core = wlc_hw->d11core;
         u32 mc, mi;
 
         BCMMSG(wlc->wiphy, "wl%d: bandunit %d\n", wlc_hw->unit,
@@ -2703,20 +2698,20 @@ void brcms_c_enable_mac(struct brcms_c_info *wlc)
         if (wlc_hw->mac_suspend_depth > 0)
                 return;
 
-        mc = R_REG(&regs->maccontrol);
+        mc = bcma_read32(core, D11REGOFFS(maccontrol));
         WARN_ON(mc & MCTL_PSM_JMP_0);
         WARN_ON(mc & MCTL_EN_MAC);
         WARN_ON(!(mc & MCTL_PSM_RUN));
 
         brcms_b_mctrl(wlc_hw, MCTL_EN_MAC, MCTL_EN_MAC);
-        W_REG(&regs->macintstatus, MI_MACSSPNDD);
+        bcma_write32(core, D11REGOFFS(macintstatus), MI_MACSSPNDD);
 
-        mc = R_REG(&regs->maccontrol);
+        mc = bcma_read32(core, D11REGOFFS(maccontrol));
         WARN_ON(mc & MCTL_PSM_JMP_0);
         WARN_ON(!(mc & MCTL_EN_MAC));
         WARN_ON(!(mc & MCTL_PSM_RUN));
 
-        mi = R_REG(&regs->macintstatus);
+        mi = bcma_read32(core, D11REGOFFS(macintstatus));
         WARN_ON(mi & MI_MACSSPNDD);
 
         brcms_c_ucode_wake_override_clear(wlc_hw,
@@ -2733,55 +2728,53 @@ void brcms_b_band_stf_ss_set(struct brcms_hardware *wlc_hw, u8 stf_mode)
 
 static bool brcms_b_validate_chip_access(struct brcms_hardware *wlc_hw)
 {
-        struct d11regs __iomem *regs;
+        struct bcma_device *core = wlc_hw->d11core;
         u32 w, val;
         struct wiphy *wiphy = wlc_hw->wlc->wiphy;
 
         BCMMSG(wiphy, "wl%d\n", wlc_hw->unit);
 
-        regs = wlc_hw->regs;
-
         /* Validate dchip register access */
 
-        W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
-        (void)R_REG(&regs->objaddr);
-        w = R_REG(&regs->objdata);
+        bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);
+        (void)bcma_read32(core, D11REGOFFS(objaddr));
+        w = bcma_read32(core, D11REGOFFS(objdata));
 
         /* Can we write and read back a 32bit register? */
-        W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
-        (void)R_REG(&regs->objaddr);
-        W_REG(&regs->objdata, (u32) 0xaa5555aa);
+        bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);
+        (void)bcma_read32(core, D11REGOFFS(objaddr));
+        bcma_write32(core, D11REGOFFS(objdata), (u32) 0xaa5555aa);
 
-        W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
-        (void)R_REG(&regs->objaddr);
-        val = R_REG(&regs->objdata);
+        bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);
+        (void)bcma_read32(core, D11REGOFFS(objaddr));
+        val = bcma_read32(core, D11REGOFFS(objdata));
         if (val != (u32) 0xaa5555aa) {
                 wiphy_err(wiphy, "wl%d: validate_chip_access: SHM = 0x%x, "
                           "expected 0xaa5555aa\n", wlc_hw->unit, val);
                 return false;
         }
 
-        W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
-        (void)R_REG(&regs->objaddr);
-        W_REG(&regs->objdata, (u32) 0x55aaaa55);
+        bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);
+        (void)bcma_read32(core, D11REGOFFS(objaddr));
+        bcma_write32(core, D11REGOFFS(objdata), (u32) 0x55aaaa55);
 
-        W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
-        (void)R_REG(&regs->objaddr);
-        val = R_REG(&regs->objdata);
+        bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);
+        (void)bcma_read32(core, D11REGOFFS(objaddr));
+        val = bcma_read32(core, D11REGOFFS(objdata));
         if (val != (u32) 0x55aaaa55) {
                 wiphy_err(wiphy, "wl%d: validate_chip_access: SHM = 0x%x, "
                           "expected 0x55aaaa55\n", wlc_hw->unit, val);
                 return false;
         }
 
-        W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
-        (void)R_REG(&regs->objaddr);
-        W_REG(&regs->objdata, w);
+        bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);
+        (void)bcma_read32(core, D11REGOFFS(objaddr));
+        bcma_write32(core, D11REGOFFS(objdata), w);
 
         /* clear CFPStart */
-        W_REG(&regs->tsf_cfpstart, 0);
+        bcma_write32(core, D11REGOFFS(tsf_cfpstart), 0);
 
-        w = R_REG(&regs->maccontrol);
+        w = bcma_read32(core, D11REGOFFS(maccontrol));
         if ((w != (MCTL_IHR_EN | MCTL_WAKE)) &&
             (w != (MCTL_IHR_EN | MCTL_GMODE | MCTL_WAKE))) {
                 wiphy_err(wiphy, "wl%d: validate_chip_access: maccontrol = "
@@ -2798,38 +2791,38 @@ static bool brcms_b_validate_chip_access(struct brcms_hardware *wlc_hw)
 
 void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on)
 {
-        struct d11regs __iomem *regs;
+        struct bcma_device *core = wlc_hw->d11core;
         u32 tmp;
 
         BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
 
         tmp = 0;
-        regs = wlc_hw->regs;
 
         if (on) {
-                if ((wlc_hw->sih->chip == BCM4313_CHIP_ID)) {
-                        OR_REG(&regs->clk_ctl_st,
-                               (CCS_ERSRC_REQ_HT | CCS_ERSRC_REQ_D11PLL |
-                                CCS_ERSRC_REQ_PHYPLL));
-                        SPINWAIT((R_REG(&regs->clk_ctl_st) &
-                                  (CCS_ERSRC_AVAIL_HT)) != (CCS_ERSRC_AVAIL_HT),
+                if ((ai_get_chip_id(wlc_hw->sih) == BCM4313_CHIP_ID)) {
+                        bcma_set32(core, D11REGOFFS(clk_ctl_st),
+                                   CCS_ERSRC_REQ_HT |
+                                   CCS_ERSRC_REQ_D11PLL |
+                                   CCS_ERSRC_REQ_PHYPLL);
+                        SPINWAIT((bcma_read32(core, D11REGOFFS(clk_ctl_st)) &
+                                  CCS_ERSRC_AVAIL_HT) != CCS_ERSRC_AVAIL_HT,
                                  PHYPLL_WAIT_US);
 
-                        tmp = R_REG(&regs->clk_ctl_st);
-                        if ((tmp & (CCS_ERSRC_AVAIL_HT)) !=
-                            (CCS_ERSRC_AVAIL_HT))
+                        tmp = bcma_read32(core, D11REGOFFS(clk_ctl_st));
+                        if ((tmp & CCS_ERSRC_AVAIL_HT) != CCS_ERSRC_AVAIL_HT)
                                 wiphy_err(wlc_hw->wlc->wiphy, "%s: turn on PHY"
                                           " PLL failed\n", __func__);
                 } else {
-                        OR_REG(&regs->clk_ctl_st,
-                               (CCS_ERSRC_REQ_D11PLL | CCS_ERSRC_REQ_PHYPLL));
-                        SPINWAIT((R_REG(&regs->clk_ctl_st) &
+                        bcma_set32(core, D11REGOFFS(clk_ctl_st),
+                                   tmp | CCS_ERSRC_REQ_D11PLL |
+                                   CCS_ERSRC_REQ_PHYPLL);
+                        SPINWAIT((bcma_read32(core, D11REGOFFS(clk_ctl_st)) &
                                   (CCS_ERSRC_AVAIL_D11PLL |
                                    CCS_ERSRC_AVAIL_PHYPLL)) !=
                                  (CCS_ERSRC_AVAIL_D11PLL |
                                   CCS_ERSRC_AVAIL_PHYPLL), PHYPLL_WAIT_US);
 
-                        tmp = R_REG(&regs->clk_ctl_st);
+                        tmp = bcma_read32(core, D11REGOFFS(clk_ctl_st));
                         if ((tmp &
                              (CCS_ERSRC_AVAIL_D11PLL | CCS_ERSRC_AVAIL_PHYPLL))
                             !=
@@ -2843,8 +2836,9 @@ void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on)
                  * be requesting it; so we'll deassert the request but
                  * not wait for status to comply.
                  */
-                AND_REG(&regs->clk_ctl_st, ~CCS_ERSRC_REQ_PHYPLL);
-                tmp = R_REG(&regs->clk_ctl_st);
+                bcma_mask32(core, D11REGOFFS(clk_ctl_st),
+                            ~CCS_ERSRC_REQ_PHYPLL);
+                (void)bcma_read32(core, D11REGOFFS(clk_ctl_st));
         }
 }
 
@@ -2872,7 +2866,7 @@ static void brcms_c_coredisable(struct brcms_hardware *wlc_hw)
         brcms_b_core_phypll_ctl(wlc_hw, false);
 
         wlc_hw->clk = false;
-        ai_core_disable(wlc_hw->sih, 0);
+        bcma_core_disable(wlc_hw->d11core, 0);
         wlc_phy_hw_clk_state_upd(wlc_hw->band->pi, false);
 }
 
@@ -2896,35 +2890,31 @@ static void brcms_c_flushqueues(struct brcms_c_info *wlc)
 static u16
 brcms_b_read_objmem(struct brcms_hardware *wlc_hw, uint offset, u32 sel)
 {
-        struct d11regs __iomem *regs = wlc_hw->regs;
-        u16 __iomem *objdata_lo = (u16 __iomem *)&regs->objdata;
-        u16 __iomem *objdata_hi = objdata_lo + 1;
-        u16 v;
+        struct bcma_device *core = wlc_hw->d11core;
+        u16 objoff = D11REGOFFS(objdata);
 
-        W_REG(&regs->objaddr, sel | (offset >> 2));
-        (void)R_REG(&regs->objaddr);
+        bcma_write32(core, D11REGOFFS(objaddr), sel | (offset >> 2));
+        (void)bcma_read32(core, D11REGOFFS(objaddr));
         if (offset & 2)
-                v = R_REG(objdata_hi);
-        else
-                v = R_REG(objdata_lo);
+                objoff += 2;
 
-        return v;
+        return bcma_read16(core, objoff);
+;
 }
 
 static void
 brcms_b_write_objmem(struct brcms_hardware *wlc_hw, uint offset, u16 v,
                      u32 sel)
 {
-        struct d11regs __iomem *regs = wlc_hw->regs;
-        u16 __iomem *objdata_lo = (u16 __iomem *)&regs->objdata;
-        u16 __iomem *objdata_hi = objdata_lo + 1;
+        struct bcma_device *core = wlc_hw->d11core;
+        u16 objoff = D11REGOFFS(objdata);
 
-        W_REG(&regs->objaddr, sel | (offset >> 2));
-        (void)R_REG(&regs->objaddr);
+        bcma_write32(core, D11REGOFFS(objaddr), sel | (offset >> 2));
+        (void)bcma_read32(core, D11REGOFFS(objaddr));
         if (offset & 2)
-                W_REG(objdata_hi, v);
-        else
-                W_REG(objdata_lo, v);
+                objoff += 2;
+
+        bcma_write16(core, objoff, v);
 }
 
 /*
@@ -3010,14 +3000,14 @@ static void brcms_b_retrylimit_upd(struct brcms_hardware *wlc_hw,
 
         /* write retry limit to SCR, shouldn't need to suspend */
         if (wlc_hw->up) {
-                W_REG(&wlc_hw->regs->objaddr,
-                      OBJADDR_SCR_SEL | S_DOT11_SRC_LMT);
-                (void)R_REG(&wlc_hw->regs->objaddr);
-                W_REG(&wlc_hw->regs->objdata, wlc_hw->SRL);
-                W_REG(&wlc_hw->regs->objaddr,
-                      OBJADDR_SCR_SEL | S_DOT11_LRC_LMT);
-                (void)R_REG(&wlc_hw->regs->objaddr);
-                W_REG(&wlc_hw->regs->objdata, wlc_hw->LRL);
+                bcma_write32(wlc_hw->d11core, D11REGOFFS(objaddr),
+                             OBJADDR_SCR_SEL | S_DOT11_SRC_LMT);
+                (void)bcma_read32(wlc_hw->d11core, D11REGOFFS(objaddr));
+                bcma_write32(wlc_hw->d11core, D11REGOFFS(objdata), wlc_hw->SRL);
+                bcma_write32(wlc_hw->d11core, D11REGOFFS(objaddr),
+                             OBJADDR_SCR_SEL | S_DOT11_LRC_LMT);
+                (void)bcma_read32(wlc_hw->d11core, D11REGOFFS(objaddr));
+                bcma_write32(wlc_hw->d11core, D11REGOFFS(objdata), wlc_hw->LRL);
         }
 }
 
@@ -3064,7 +3054,7 @@ static bool brcms_c_ps_allowed(struct brcms_c_info *wlc)
                 return false;
 
         /* disallow PS when one of these meets when not scanning */
-        if (wlc->monitor)
+        if (wlc->filter_flags & FIF_PROMISC_IN_BSS)
                 return false;
 
         if (cfg->associated) {
@@ -3199,9 +3189,9 @@ void brcms_c_init_scb(struct scb *scb)
 static void brcms_b_coreinit(struct brcms_c_info *wlc)
 {
         struct brcms_hardware *wlc_hw = wlc->hw;
-        struct d11regs __iomem *regs;
+        struct bcma_device *core = wlc_hw->d11core;
         u32 sflags;
-        uint bcnint_us;
+        u32 bcnint_us;
         uint i = 0;
         bool fifosz_fixup = false;
         int err = 0;
@@ -3209,8 +3199,6 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
         struct wiphy *wiphy = wlc->wiphy;
         struct brcms_ucode *ucode = &wlc_hw->wlc->wl->ucode;
 
-        regs = wlc_hw->regs;
-
         BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
 
         /* reset PSM */
@@ -3223,20 +3211,20 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
         fifosz_fixup = true;
 
         /* let the PSM run to the suspended state, set mode to BSS STA */
-        W_REG(&regs->macintstatus, -1);
+        bcma_write32(core, D11REGOFFS(macintstatus), -1);
         brcms_b_mctrl(wlc_hw, ~0,
                        (MCTL_IHR_EN | MCTL_INFRA | MCTL_PSM_RUN | MCTL_WAKE));
 
         /* wait for ucode to self-suspend after auto-init */
-        SPINWAIT(((R_REG(&regs->macintstatus) & MI_MACSSPNDD) == 0),
-                 1000 * 1000);
-        if ((R_REG(&regs->macintstatus) & MI_MACSSPNDD) == 0)
+        SPINWAIT(((bcma_read32(core, D11REGOFFS(macintstatus)) &
+                   MI_MACSSPNDD) == 0), 1000 * 1000);
+        if ((bcma_read32(core, D11REGOFFS(macintstatus)) & MI_MACSSPNDD) == 0)
                 wiphy_err(wiphy, "wl%d: wlc_coreinit: ucode did not self-"
                           "suspend!\n", wlc_hw->unit);
 
         brcms_c_gpio_init(wlc);
 
-        sflags = ai_core_sflags(wlc_hw->sih, 0, 0);
+        sflags = bcma_aread32(core, BCMA_IOST);
 
         if (D11REV_IS(wlc_hw->corerev, 23)) {
                 if (BRCMS_ISNPHY(wlc_hw->band))
@@ -3300,7 +3288,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
                           wlc_hw->xmtfifo_sz[i], i);
 
         /* make sure we can still talk to the mac */
-        WARN_ON(R_REG(&regs->maccontrol) == 0xffffffff);
+        WARN_ON(bcma_read32(core, D11REGOFFS(maccontrol)) == 0xffffffff);
 
         /* band-specific inits done by wlc_bsinit() */
 
@@ -3309,7 +3297,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
         brcms_b_write_shm(wlc_hw, M_MAX_ANTCNT, ANTCNT);
 
         /* enable one rx interrupt per received frame */
-        W_REG(&regs->intrcvlazy[0], (1 << IRL_FC_SHIFT));
+        bcma_write32(core, D11REGOFFS(intrcvlazy[0]), (1 << IRL_FC_SHIFT));
 
         /* set the station mode (BSS STA) */
         brcms_b_mctrl(wlc_hw,
@@ -3318,19 +3306,21 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
 
         /* set up Beacon interval */
         bcnint_us = 0x8000 << 10;
-        W_REG(&regs->tsf_cfprep, (bcnint_us << CFPREP_CBI_SHIFT));
-        W_REG(&regs->tsf_cfpstart, bcnint_us);
-        W_REG(&regs->macintstatus, MI_GP1);
+        bcma_write32(core, D11REGOFFS(tsf_cfprep),
+                     (bcnint_us << CFPREP_CBI_SHIFT));
+        bcma_write32(core, D11REGOFFS(tsf_cfpstart), bcnint_us);
+        bcma_write32(core, D11REGOFFS(macintstatus), MI_GP1);
 
         /* write interrupt mask */
-        W_REG(&regs->intctrlregs[RX_FIFO].intmask, DEF_RXINTMASK);
+        bcma_write32(core, D11REGOFFS(intctrlregs[RX_FIFO].intmask),
+                     DEF_RXINTMASK);
 
         /* allow the MAC to control the PHY clock (dynamic on/off) */
         brcms_b_macphyclk_set(wlc_hw, ON);
 
         /* program dynamic clock control fast powerup delay register */
         wlc->fastpwrup_dly = ai_clkctl_fast_pwrup_delay(wlc_hw->sih);
-        W_REG(&regs->scc_fastpwrup_dly, wlc->fastpwrup_dly);
+        bcma_write16(core, D11REGOFFS(scc_fastpwrup_dly), wlc->fastpwrup_dly);
 
         /* tell the ucode the corerev */
         brcms_b_write_shm(wlc_hw, M_MACHW_VER, (u16) wlc_hw->corerev);
@@ -3343,19 +3333,21 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
                                       machwcap >> 16) & 0xffff));
 
         /* write retry limits to SCR, this done after PSM init */
-        W_REG(&regs->objaddr, OBJADDR_SCR_SEL | S_DOT11_SRC_LMT);
-        (void)R_REG(&regs->objaddr);
-        W_REG(&regs->objdata, wlc_hw->SRL);
-        W_REG(&regs->objaddr, OBJADDR_SCR_SEL | S_DOT11_LRC_LMT);
-        (void)R_REG(&regs->objaddr);
-        W_REG(&regs->objdata, wlc_hw->LRL);
+        bcma_write32(core, D11REGOFFS(objaddr),
+                     OBJADDR_SCR_SEL | S_DOT11_SRC_LMT);
+        (void)bcma_read32(core, D11REGOFFS(objaddr));
+        bcma_write32(core, D11REGOFFS(objdata), wlc_hw->SRL);
+        bcma_write32(core, D11REGOFFS(objaddr),
+                     OBJADDR_SCR_SEL | S_DOT11_LRC_LMT);
+        (void)bcma_read32(core, D11REGOFFS(objaddr));
+        bcma_write32(core, D11REGOFFS(objdata), wlc_hw->LRL);
 
         /* write rate fallback retry limits */
         brcms_b_write_shm(wlc_hw, M_SFRMTXCNTFBRTHSD, wlc_hw->SFBL);
         brcms_b_write_shm(wlc_hw, M_LFRMTXCNTFBRTHSD, wlc_hw->LFBL);
 
-        AND_REG(&regs->ifs_ctl, 0x0FFF);
-        W_REG(&regs->ifs_aifsn, EDCF_AIFSN_MIN);
+        bcma_mask16(core, D11REGOFFS(ifs_ctl), 0x0FFF);
+        bcma_write16(core, D11REGOFFS(ifs_aifsn), EDCF_AIFSN_MIN);
 
         /* init the tx dma engines */
         for (i = 0; i < NFIFO; i++) {
@@ -3584,29 +3576,31 @@ static void brcms_c_bandinit_ordered(struct brcms_c_info *wlc,
 }
 
 /*
- * Set or clear maccontrol bits MCTL_PROMISC, MCTL_BCNS_PROMISC and
- * MCTL_KEEPCONTROL
+ * Set or clear filtering related maccontrol bits based on
+ * specified filter flags
  */
-static void brcms_c_mac_promisc(struct brcms_c_info *wlc)
+void brcms_c_mac_promisc(struct brcms_c_info *wlc, uint filter_flags)
 {
         u32 promisc_bits = 0;
 
-        if (wlc->bcnmisc_monitor)
+        wlc->filter_flags = filter_flags;
+
+        if (filter_flags & (FIF_PROMISC_IN_BSS | FIF_OTHER_BSS))
+                promisc_bits |= MCTL_PROMISC;
+
+        if (filter_flags & FIF_BCN_PRBRESP_PROMISC)
                 promisc_bits |= MCTL_BCNS_PROMISC;
 
-        if (wlc->monitor)
-                promisc_bits |=
-                        MCTL_PROMISC | MCTL_BCNS_PROMISC | MCTL_KEEPCONTROL;
+        if (filter_flags & FIF_FCSFAIL)
+                promisc_bits |= MCTL_KEEPBADFCS;
 
-        brcms_b_mctrl(wlc->hw,
-                        MCTL_PROMISC | MCTL_BCNS_PROMISC | MCTL_KEEPCONTROL,
-                        promisc_bits);
-}
+        if (filter_flags & (FIF_CONTROL | FIF_PSPOLL))
+                promisc_bits |= MCTL_KEEPCONTROL;
 
-void brcms_c_mac_bcn_promisc_change(struct brcms_c_info *wlc, bool promisc)
-{
-        wlc->bcnmisc_monitor = promisc;
-        brcms_c_mac_promisc(wlc);
+        brcms_b_mctrl(wlc->hw,
+                MCTL_PROMISC | MCTL_BCNS_PROMISC |
+                MCTL_KEEPCONTROL | MCTL_KEEPBADFCS,
+                promisc_bits);
 }
 
 /*
@@ -3636,9 +3630,6 @@ static void brcms_c_ucode_mac_upd(struct brcms_c_info *wlc)
         } else {
                 /* disable an active IBSS if we are not on the home channel */
         }
-
-        /* update the various promisc bits */
-        brcms_c_mac_promisc(wlc);
 }
 
 static void brcms_c_write_rate_shm(struct brcms_c_info *wlc, u8 rate,
@@ -3813,7 +3804,7 @@ static void brcms_c_set_ps_ctrl(struct brcms_c_info *wlc)
 
         BCMMSG(wlc->wiphy, "wl%d: hps %d\n", wlc->pub->unit, hps);
 
-        v1 = R_REG(&wlc->regs->maccontrol);
+        v1 = bcma_read32(wlc->hw->d11core, D11REGOFFS(maccontrol));
         v2 = MCTL_WAKE;
         if (hps)
                 v2 |= MCTL_HPS;
@@ -4132,7 +4123,8 @@ void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci,
                 acp_shm.cwmax = params->cw_max;
                 acp_shm.cwcur = acp_shm.cwmin;
                 acp_shm.bslots =
-                    R_REG(&wlc->regs->tsf_random) & acp_shm.cwcur;
+                        bcma_read16(wlc->hw->d11core, D11REGOFFS(tsf_random)) &
+                        acp_shm.cwcur;
                 acp_shm.reggap = acp_shm.bslots + acp_shm.aifs;
                 /* Indicate the new params to the ucode */
                 acp_shm.status = brcms_b_read_shm(wlc->hw, (M_EDCF_QINFO +
@@ -4440,21 +4432,21 @@ struct brcms_pub *brcms_c_pub(struct brcms_c_info *wlc)
  *    initialize software state for each core and band
  *    put the whole chip in reset(driver down state), no clock
  */
-static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,
-                          uint unit, bool piomode, void __iomem *regsva,
-                          struct pci_dev *btparam)
+static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core,
+                          uint unit, bool piomode)
 {
         struct brcms_hardware *wlc_hw;
-        struct d11regs __iomem *regs;
         char *macaddr = NULL;
         uint err = 0;
         uint j;
         bool wme = false;
         struct shared_phy_params sha_params;
         struct wiphy *wiphy = wlc->wiphy;
+        struct pci_dev *pcidev = core->bus->host_pci;
 
-        BCMMSG(wlc->wiphy, "wl%d: vendor 0x%x device 0x%x\n", unit, vendor,
-                device);
+        BCMMSG(wlc->wiphy, "wl%d: vendor 0x%x device 0x%x\n", unit,
+               pcidev->vendor,
+               pcidev->device);
 
         wme = true;
 
@@ -4471,7 +4463,7 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,
          * Do the hardware portion of the attach. Also initialize software
          * state that depends on the particular hardware we are running.
          */
-        wlc_hw->sih = ai_attach(regsva, btparam);
+        wlc_hw->sih = ai_attach(core->bus);
         if (wlc_hw->sih == NULL) {
                 wiphy_err(wiphy, "wl%d: brcms_b_attach: si_attach failed\n",
                           unit);
@@ -4480,25 +4472,19 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,
         }
 
         /* verify again the device is supported */
-        if (!brcms_c_chipmatch(vendor, device)) {
+        if (!brcms_c_chipmatch(pcidev->vendor, pcidev->device)) {
                 wiphy_err(wiphy, "wl%d: brcms_b_attach: Unsupported "
                         "vendor/device (0x%x/0x%x)\n",
-                         unit, vendor, device);
+                         unit, pcidev->vendor, pcidev->device);
                 err = 12;
                 goto fail;
         }
 
-        wlc_hw->vendorid = vendor;
-        wlc_hw->deviceid = device;
-
-        /* set bar0 window to point at D11 core */
-        wlc_hw->regs = (struct d11regs __iomem *)
-                                ai_setcore(wlc_hw->sih, D11_CORE_ID, 0);
-        wlc_hw->corerev = ai_corerev(wlc_hw->sih);
-
-        regs = wlc_hw->regs;
+        wlc_hw->vendorid = pcidev->vendor;
+        wlc_hw->deviceid = pcidev->device;
 
-        wlc->regs = wlc_hw->regs;
+        wlc_hw->d11core = core;
+        wlc_hw->corerev = core->id.rev;
 
         /* validate chip, chiprev and corerev */
         if (!brcms_c_isgoodchip(wlc_hw)) {
@@ -4533,8 +4519,9 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,
         wlc_hw->boardrev = (u16) j;
         if (!brcms_c_validboardtype(wlc_hw)) {
                 wiphy_err(wiphy, "wl%d: brcms_b_attach: Unsupported Broadcom "
-                        "board type (0x%x)" " or revision level (0x%x)\n",
-                         unit, wlc_hw->sih->boardtype, wlc_hw->boardrev);
+                          "board type (0x%x)" " or revision level (0x%x)\n",
+                          unit, ai_get_boardtype(wlc_hw->sih),
+                          wlc_hw->boardrev);
                 err = 15;
                 goto fail;
         }
@@ -4555,7 +4542,7 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,
         else
                 wlc_hw->_nbands = 1;
 
-        if ((wlc_hw->sih->chip == BCM43225_CHIP_ID))
+        if ((ai_get_chip_id(wlc_hw->sih) == BCM43225_CHIP_ID))
                 wlc_hw->_nbands = 1;
 
         /* BMAC_NOTE: remove init of pub values when brcms_c_attach()
@@ -4587,16 +4574,14 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,
         sha_params.corerev = wlc_hw->corerev;
         sha_params.vid = wlc_hw->vendorid;
         sha_params.did = wlc_hw->deviceid;
-        sha_params.chip = wlc_hw->sih->chip;
-        sha_params.chiprev = wlc_hw->sih->chiprev;
-        sha_params.chippkg = wlc_hw->sih->chippkg;
+        sha_params.chip = ai_get_chip_id(wlc_hw->sih);
+        sha_params.chiprev = ai_get_chiprev(wlc_hw->sih);
+        sha_params.chippkg = ai_get_chippkg(wlc_hw->sih);
         sha_params.sromrev = wlc_hw->sromrev;
-        sha_params.boardtype = wlc_hw->sih->boardtype;
+        sha_params.boardtype = ai_get_boardtype(wlc_hw->sih);
         sha_params.boardrev = wlc_hw->boardrev;
-        sha_params.boardvendor = wlc_hw->sih->boardvendor;
         sha_params.boardflags = wlc_hw->boardflags;
         sha_params.boardflags2 = wlc_hw->boardflags2;
-        sha_params.buscorerev = wlc_hw->sih->buscorerev;
 
         /* alloc and save pointer to shared phy state area */
         wlc_hw->phy_sh = wlc_phy_shared_attach(&sha_params);
@@ -4618,9 +4603,9 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,
                 wlc_hw->band->bandtype = j ? BRCM_BAND_5G : BRCM_BAND_2G;
                 wlc->band->bandunit = j;
                 wlc->band->bandtype = j ? BRCM_BAND_5G : BRCM_BAND_2G;
-                wlc->core->coreidx = ai_coreidx(wlc_hw->sih);
+                wlc->core->coreidx = core->core_index;
 
-                wlc_hw->machwcap = R_REG(&regs->machwcap);
+                wlc_hw->machwcap = bcma_read32(core, D11REGOFFS(machwcap));
                 wlc_hw->machwcap_backup = wlc_hw->machwcap;
 
                 /* init tx fifo size */
@@ -4629,7 +4614,7 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,
 
                 /* Get a phy for this band */
                 wlc_hw->band->pi =
-                        wlc_phy_attach(wlc_hw->phy_sh, regs,
+                        wlc_phy_attach(wlc_hw->phy_sh, core,
                                        wlc_hw->band->bandtype,
                                        wlc->wiphy);
                 if (wlc_hw->band->pi == NULL) {
@@ -4703,10 +4688,6 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,
         /* Match driver "down" state */
         ai_pci_down(wlc_hw->sih);
 
-        /* register sb interrupt callback functions */
-        ai_register_intr_callback(wlc_hw->sih, (void *)brcms_c_wlintrsoff,
-                                  (void *)brcms_c_wlintrsrestore, NULL, wlc);
-
         /* turn off pll and xtal to match driver "down" state */
         brcms_b_xtal(wlc_hw, OFF);
 
@@ -4737,10 +4718,9 @@ static int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,
                 goto fail;
         }
 
-        BCMMSG(wlc->wiphy,
-                 "deviceid 0x%x nbands %d board 0x%x macaddr: %s\n",
-                 wlc_hw->deviceid, wlc_hw->_nbands,
-                 wlc_hw->sih->boardtype, macaddr);
+        BCMMSG(wlc->wiphy, "deviceid 0x%x nbands %d board 0x%x macaddr: %s\n",
+               wlc_hw->deviceid, wlc_hw->_nbands, ai_get_boardtype(wlc_hw->sih),
+               macaddr);
 
         return err;
 
@@ -4978,7 +4958,6 @@ static int brcms_b_detach(struct brcms_c_info *wlc)
                  * and per-port interrupt object may has been freed. this must
                  * be done before sb core switch
                  */
-                ai_deregister_intr_callback(wlc_hw->sih);
                 ai_pci_sleep(wlc_hw->sih);
         }
 
@@ -5073,13 +5052,11 @@ static void brcms_b_hw_up(struct brcms_hardware *wlc_hw)
         ai_pci_fixcfg(wlc_hw->sih);
 
         /*
+         * TODO: test suspend/resume
+         *
          * AI chip doesn't restore bar0win2 on
          * hibernation/resume, need sw fixup
          */
-        if ((wlc_hw->sih->chip == BCM43224_CHIP_ID) ||
-            (wlc_hw->sih->chip == BCM43225_CHIP_ID))
-                wlc_hw->regs = (struct d11regs __iomem *)
-                                ai_setcore(wlc_hw->sih, D11_CORE_ID, 0);
 
         /*
          * Inform phy that a POR reset has occurred so
@@ -5091,7 +5068,7 @@ static void brcms_b_hw_up(struct brcms_hardware *wlc_hw)
         wlc_hw->wlc->pub->hw_up = true;
 
         if ((wlc_hw->boardflags & BFL_FEM)
-            && (wlc_hw->sih->chip == BCM4313_CHIP_ID)) {
+            && (ai_get_chip_id(wlc_hw->sih) == BCM4313_CHIP_ID)) {
                 if (!
                     (wlc_hw->boardrev >= 0x1250
                      && (wlc_hw->boardflags & BFL_FEM_BT)))
@@ -5186,7 +5163,7 @@ int brcms_c_up(struct brcms_c_info *wlc)
         }
 
         if ((wlc->pub->boardflags & BFL_FEM)
-            && (wlc->pub->sih->chip == BCM4313_CHIP_ID)) {
+            && (ai_get_chip_id(wlc->hw->sih) == BCM4313_CHIP_ID)) {
                 if (wlc->pub->boardrev >= 0x1250
                     && (wlc->pub->boardflags & BFL_FEM_BT))
                         brcms_b_mhf(wlc->hw, MHF5, MHF5_4313_GPIOCTRL,
@@ -5323,9 +5300,9 @@ static int brcms_b_down_finish(struct brcms_hardware *wlc_hw)
         } else {
 
                 /* Reset and disable the core */
-                if (ai_iscoreup(wlc_hw->sih)) {
-                        if (R_REG(&wlc_hw->regs->maccontrol) &
-                            MCTL_EN_MAC)
+                if (bcma_core_is_enabled(wlc_hw->d11core)) {
+                        if (bcma_read32(wlc_hw->d11core,
+                                        D11REGOFFS(maccontrol)) & MCTL_EN_MAC)
                                 brcms_c_suspend_mac_and_wait(wlc_hw->wlc);
                         callbacks += brcms_reset(wlc_hw->wlc->wl);
                         brcms_c_coredisable(wlc_hw);
@@ -7482,11 +7459,11 @@ static void
 brcms_b_read_tsf(struct brcms_hardware *wlc_hw, u32 *tsf_l_ptr,
                   u32 *tsf_h_ptr)
 {
-        struct d11regs __iomem *regs = wlc_hw->regs;
+        struct bcma_device *core = wlc_hw->d11core;
 
         /* read the tsf timer low, then high to get an atomic read */
-        *tsf_l_ptr = R_REG(&regs->tsf_timerlow);
-        *tsf_h_ptr = R_REG(&regs->tsf_timerhigh);
+        *tsf_l_ptr = bcma_read32(core, D11REGOFFS(tsf_timerlow));
+        *tsf_h_ptr = bcma_read32(core, D11REGOFFS(tsf_timerhigh));
 }
 
 /*
@@ -8074,14 +8051,8 @@ static void brcms_c_recv(struct brcms_c_info *wlc, struct sk_buff *p)
         len = p->len;
 
         if (rxh->RxStatus1 & RXS_FCSERR) {
-                if (wlc->pub->mac80211_state & MAC80211_PROMISC_BCNS) {
-                        wiphy_err(wlc->wiphy, "FCSERR while scanning******* -"
-                                  " tossing\n");
-                        goto toss;
-                } else {
-                        wiphy_err(wlc->wiphy, "RCSERR!!!\n");
+                if (!(wlc->filter_flags & FIF_FCSFAIL))
                         goto toss;
-                }
         }
 
         /* check received pkt has at least frame control field */
@@ -8165,7 +8136,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
 {
         u32 macintstatus;
         struct brcms_hardware *wlc_hw = wlc->hw;
-        struct d11regs __iomem *regs = wlc_hw->regs;
+        struct bcma_device *core = wlc_hw->d11core;
         struct wiphy *wiphy = wlc->wiphy;
 
         if (brcms_deviceremoved(wlc)) {
@@ -8201,7 +8172,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
         /* ATIM window end */
         if (macintstatus & MI_ATIMWINEND) {
                 BCMMSG(wlc->wiphy, "end of ATIM window\n");
-                OR_REG(&regs->maccommand, wlc->qvalid);
+                bcma_set32(core, D11REGOFFS(maccommand), wlc->qvalid);
                 wlc->qvalid = 0;
         }
 
@@ -8219,17 +8190,17 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
 
         if (macintstatus & MI_GP0) {
                 wiphy_err(wiphy, "wl%d: PSM microcode watchdog fired at %d "
-                        "(seconds). Resetting.\n", wlc_hw->unit, wlc_hw->now);
+                          "(seconds). Resetting.\n", wlc_hw->unit, wlc_hw->now);
 
                 printk_once("%s : PSM Watchdog, chipid 0x%x, chiprev 0x%x\n",
-                                        __func__, wlc_hw->sih->chip,
-                                        wlc_hw->sih->chiprev);
+                            __func__, ai_get_chip_id(wlc_hw->sih),
+                            ai_get_chiprev(wlc_hw->sih));
                 brcms_fatal_error(wlc_hw->wlc->wl);
         }
 
         /* gptimer timeout */
         if (macintstatus & MI_TO)
-                W_REG(&regs->gptimer, 0);
+                bcma_write32(core, D11REGOFFS(gptimer), 0);
 
         if (macintstatus & MI_RFDISABLE) {
                 BCMMSG(wlc->wiphy, "wl%d: BMAC Detected a change on the"
@@ -8251,13 +8222,11 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
 
 void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
 {
-        struct d11regs __iomem *regs;
+        struct bcma_device *core = wlc->hw->d11core;
         u16 chanspec;
 
         BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
 
-        regs = wlc->regs;
-
         /*
          * This will happen if a big-hammer was executed. In
          * that case, we want to go back to the channel that
@@ -8287,8 +8256,8 @@ void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
                  * update since init path would reset
                  * to default value
                  */
-                W_REG(&regs->tsf_cfprep,
-                      (bi << CFPREP_CBI_SHIFT));
+                bcma_write32(core, D11REGOFFS(tsf_cfprep),
+                             bi << CFPREP_CBI_SHIFT);
 
                 /* Update maccontrol PM related bits */
                 brcms_c_set_ps_ctrl(wlc);
@@ -8318,7 +8287,7 @@ void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
         brcms_c_bsinit(wlc);
 
         /* Enable EDCF mode (while the MAC is suspended) */
-        OR_REG(&regs->ifs_ctl, IFS_USEEDCF);
+        bcma_set16(core, D11REGOFFS(ifs_ctl), IFS_USEEDCF);
         brcms_c_edcf_setparams(wlc, false);
 
         /* Init precedence maps for empty FIFOs */
@@ -8342,7 +8311,7 @@ void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
         brcms_c_txflowcontrol_reset(wlc);
 
         /* enable the RF Disable Delay timer */
-        W_REG(&wlc->regs->rfdisabledly, RFDISABLE_DEFAULT);
+        bcma_write32(core, D11REGOFFS(rfdisabledly), RFDISABLE_DEFAULT);
 
         /*
          * Initialize WME parameters; if they haven't been set by some other
@@ -8362,9 +8331,8 @@ void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
  * The common driver entry routine. Error codes should be unique
  */
 struct brcms_c_info *
-brcms_c_attach(struct brcms_info *wl, u16 vendor, u16 device, uint unit,
-               bool piomode, void __iomem *regsva, struct pci_dev *btparam,
-               uint *perr)
+brcms_c_attach(struct brcms_info *wl, struct bcma_device *core, uint unit,
+               bool piomode, uint *perr)
 {
         struct brcms_c_info *wlc;
         uint err = 0;
@@ -8372,7 +8340,7 @@ brcms_c_attach(struct brcms_info *wl, u16 vendor, u16 device, uint unit,
         struct brcms_pub *pub;
 
         /* allocate struct brcms_c_info state and its substructures */
-        wlc = (struct brcms_c_info *) brcms_c_attach_malloc(unit, &err, device);
+        wlc = (struct brcms_c_info *) brcms_c_attach_malloc(unit, &err, 0);
         if (wlc == NULL)
                 goto fail;
         wlc->wiphy = wl->wiphy;
@@ -8399,8 +8367,7 @@ brcms_c_attach(struct brcms_info *wl, u16 vendor, u16 device, uint unit,
          * low level attach steps(all hw accesses go
          * inside, no more in rest of the attach)
          */
-        err = brcms_b_attach(wlc, vendor, device, unit, piomode, regsva,
-                             btparam);
+        err = brcms_b_attach(wlc, core, unit, piomode);
         if (err)
                 goto fail;
 
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.h b/drivers/net/wireless/brcm80211/brcmsmac/main.h
index 251c350b3164..adb136ec1f04 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.h
@@ -334,7 +334,7 @@ struct brcms_hardware {
         u32 machwcap_backup;    /* backup of machwcap */
 
         struct si_pub *sih;     /* SI handle (cookie for siutils calls) */
-        struct d11regs __iomem *regs;   /* pointer to device registers */
+        struct bcma_device *d11core;    /* pointer to 802.11 core */
         struct phy_shim_info *physhim; /* phy shim layer handler */
         struct shared_phy *phy_sh;      /* pointer to shared phy state */
         struct brcms_hw_band *band;/* pointer to active per-band state */
@@ -400,7 +400,6 @@ struct brcms_txq_info {
  *
  * pub: pointer to driver public state.
  * wl: pointer to specific private state.
- * regs: pointer to device registers.
  * hw: HW related state.
  * clkreq_override: setting for clkreq for PCIE : Auto, 0, 1.
  * fastpwrup_dly: time in us needed to bring up d11 fast clock.
@@ -477,7 +476,6 @@ struct brcms_txq_info {
 struct brcms_c_info {
         struct brcms_pub *pub;
         struct brcms_info *wl;
-        struct d11regs __iomem *regs;
         struct brcms_hardware *hw;
 
         /* clock */
@@ -519,8 +517,7 @@ struct brcms_c_info {
         struct brcms_timer *radio_timer;
 
         /* promiscuous */
-        bool monitor;
-        bool bcnmisc_monitor;
+        uint filter_flags;
 
         /* driver feature */
         bool _rifs;
@@ -658,8 +655,7 @@ extern void brcms_c_print_txdesc(struct d11txh *txh);
 #endif
 
 extern int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config);
-extern void brcms_c_mac_bcn_promisc_change(struct brcms_c_info *wlc,
-                                           bool promisc);
+extern void brcms_c_mac_promisc(struct brcms_c_info *wlc, uint filter_flags);
 extern void brcms_c_send_q(struct brcms_c_info *wlc);
 extern int brcms_c_prep_pdu(struct brcms_c_info *wlc, struct sk_buff *pdu,
                             uint *fifo);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c
index 0bcb26792046..7fad6dc19258 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.c
@@ -139,6 +139,9 @@
 #define SRSH_PI_MASK    0xf000  /* bit 15:12 */
 #define SRSH_PI_SHIFT   12      /* bit 15:12 */
 
+#define PCIREGOFFS(field)       offsetof(struct sbpciregs, field)
+#define PCIEREGOFFS(field)      offsetof(struct sbpcieregs, field)
+
 /* Sonics side: PCI core and host control registers */
 struct sbpciregs {
         u32 control;            /* PCI control */
@@ -205,11 +208,7 @@ struct sbpcieregs {
 };
 
 struct pcicore_info {
-        union {
-                struct sbpcieregs __iomem *pcieregs;
-                struct sbpciregs __iomem *pciregs;
-        } regs;                 /* Memory mapped register to the core */
-
+        struct bcma_device *core;
         struct si_pub *sih;     /* System interconnect handle */
         struct pci_dev *dev;
         u8 pciecap_lcreg_offset;/* PCIE capability LCreg offset
@@ -224,9 +223,9 @@ struct pcicore_info {
 };
 
 #define PCIE_ASPM(sih)                                                  \
-        (((sih)->buscoretype == PCIE_CORE_ID) &&                        \
-         (((sih)->buscorerev >= 3) &&                                   \
-          ((sih)->buscorerev <= 5)))
+        ((ai_get_buscoretype(sih) == PCIE_CORE_ID) &&                   \
+         ((ai_get_buscorerev(sih) >= 3) &&                              \
+          (ai_get_buscorerev(sih) <= 5)))
 
 
 /* delay needed between the mdio control/ mdiodata register data access */
@@ -238,8 +237,7 @@ static void pr28829_delay(void)
 /* Initialize the PCI core.
  * It's caller's responsibility to make sure that this is done only once
  */
-struct pcicore_info *pcicore_init(struct si_pub *sih, struct pci_dev *pdev,
-                                  void __iomem *regs)
+struct pcicore_info *pcicore_init(struct si_pub *sih, struct bcma_device *core)
 {
         struct pcicore_info *pi;
 
@@ -249,17 +247,15 @@ struct pcicore_info *pcicore_init(struct si_pub *sih, struct pci_dev *pdev,
                 return NULL;
 
         pi->sih = sih;
-        pi->dev = pdev;
+        pi->dev = core->bus->host_pci;
+        pi->core = core;
 
-        if (sih->buscoretype == PCIE_CORE_ID) {
+        if (core->id.id == PCIE_CORE_ID) {
                 u8 cap_ptr;
-                pi->regs.pcieregs = regs;
                 cap_ptr = pcicore_find_pci_capability(pi->dev, PCI_CAP_ID_EXP,
                                                       NULL, NULL);
                 pi->pciecap_lcreg_offset = cap_ptr + PCIE_CAP_LINKCTRL_OFFSET;
-        } else
-                pi->regs.pciregs = regs;
-
+        }
         return pi;
 }
 
@@ -334,37 +330,37 @@ end:
 
 /* ***** Register Access API */
 static uint
-pcie_readreg(struct sbpcieregs __iomem *pcieregs, uint addrtype, uint offset)
+pcie_readreg(struct bcma_device *core, uint addrtype, uint offset)
 {
         uint retval = 0xFFFFFFFF;
 
         switch (addrtype) {
         case PCIE_CONFIGREGS:
-                W_REG(&pcieregs->configaddr, offset);
-                (void)R_REG((&pcieregs->configaddr));
-                retval = R_REG(&pcieregs->configdata);
+                bcma_write32(core, PCIEREGOFFS(configaddr), offset);
+                (void)bcma_read32(core, PCIEREGOFFS(configaddr));
+                retval = bcma_read32(core, PCIEREGOFFS(configdata));
                 break;
         case PCIE_PCIEREGS:
-                W_REG(&pcieregs->pcieindaddr, offset);
-                (void)R_REG(&pcieregs->pcieindaddr);
-                retval = R_REG(&pcieregs->pcieinddata);
+                bcma_write32(core, PCIEREGOFFS(pcieindaddr), offset);
+                (void)bcma_read32(core, PCIEREGOFFS(pcieindaddr));
+                retval = bcma_read32(core, PCIEREGOFFS(pcieinddata));
                 break;
         }
 
         return retval;
 }
 
-static uint pcie_writereg(struct sbpcieregs __iomem *pcieregs, uint addrtype,
+static uint pcie_writereg(struct bcma_device *core, uint addrtype,
                           uint offset, uint val)
 {
         switch (addrtype) {
         case PCIE_CONFIGREGS:
-                W_REG((&pcieregs->configaddr), offset);
-                W_REG((&pcieregs->configdata), val);
+                bcma_write32(core, PCIEREGOFFS(configaddr), offset);
+                bcma_write32(core, PCIEREGOFFS(configdata), val);
                 break;
         case PCIE_PCIEREGS:
-                W_REG((&pcieregs->pcieindaddr), offset);
-                W_REG((&pcieregs->pcieinddata), val);
+                bcma_write32(core, PCIEREGOFFS(pcieindaddr), offset);
+                bcma_write32(core, PCIEREGOFFS(pcieinddata), val);
                 break;
         default:
                 break;
@@ -374,7 +370,6 @@ static uint pcie_writereg(struct sbpcieregs __iomem *pcieregs, uint addrtype,
 
 static bool pcie_mdiosetblock(struct pcicore_info *pi, uint blk)
 {
-        struct sbpcieregs __iomem *pcieregs = pi->regs.pcieregs;
         uint mdiodata, i = 0;
         uint pcie_serdes_spinwait = 200;
 
@@ -382,12 +377,13 @@ static bool pcie_mdiosetblock(struct pcicore_info *pi, uint blk)
                     (MDIODATA_DEV_ADDR << MDIODATA_DEVADDR_SHF) |
                     (MDIODATA_BLK_ADDR << MDIODATA_REGADDR_SHF) |
                     (blk << 4));
-        W_REG(&pcieregs->mdiodata, mdiodata);
+        bcma_write32(pi->core, PCIEREGOFFS(mdiodata), mdiodata);
 
         pr28829_delay();
         /* retry till the transaction is complete */
         while (i < pcie_serdes_spinwait) {
-                if (R_REG(&pcieregs->mdiocontrol) & MDIOCTL_ACCESS_DONE)
+                if (bcma_read32(pi->core, PCIEREGOFFS(mdiocontrol)) &
+                    MDIOCTL_ACCESS_DONE)
                         break;
 
                 udelay(1000);
@@ -404,15 +400,15 @@ static int
 pcie_mdioop(struct pcicore_info *pi, uint physmedia, uint regaddr, bool write,
             uint *val)
 {
-        struct sbpcieregs __iomem *pcieregs = pi->regs.pcieregs;
         uint mdiodata;
         uint i = 0;
         uint pcie_serdes_spinwait = 10;
 
         /* enable mdio access to SERDES */
-        W_REG(&pcieregs->mdiocontrol, MDIOCTL_PREAM_EN | MDIOCTL_DIVISOR_VAL);
+        bcma_write32(pi->core, PCIEREGOFFS(mdiocontrol),
+                     MDIOCTL_PREAM_EN | MDIOCTL_DIVISOR_VAL);
 
-        if (pi->sih->buscorerev >= 10) {
+        if (ai_get_buscorerev(pi->sih) >= 10) {
                 /* new serdes is slower in rw,
                  * using two layers of reg address mapping
                  */
@@ -432,20 +428,22 @@ pcie_mdioop(struct pcicore_info *pi, uint physmedia, uint regaddr, bool write,
                 mdiodata |= (MDIODATA_START | MDIODATA_WRITE | MDIODATA_TA |
                              *val);
 
-        W_REG(&pcieregs->mdiodata, mdiodata);
+        bcma_write32(pi->core, PCIEREGOFFS(mdiodata), mdiodata);
 
         pr28829_delay();
 
         /* retry till the transaction is complete */
         while (i < pcie_serdes_spinwait) {
-                if (R_REG(&pcieregs->mdiocontrol) & MDIOCTL_ACCESS_DONE) {
+                if (bcma_read32(pi->core, PCIEREGOFFS(mdiocontrol)) &
+                    MDIOCTL_ACCESS_DONE) {
                         if (!write) {
                                 pr28829_delay();
-                                *val = (R_REG(&pcieregs->mdiodata) &
+                                *val = (bcma_read32(pi->core,
+                                                    PCIEREGOFFS(mdiodata)) &
                                         MDIODATA_MASK);
                         }
                         /* Disable mdio access to SERDES */
-                        W_REG(&pcieregs->mdiocontrol, 0);
+                        bcma_write32(pi->core, PCIEREGOFFS(mdiocontrol), 0);
                         return 0;
                 }
                 udelay(1000);
@@ -453,7 +451,7 @@ pcie_mdioop(struct pcicore_info *pi, uint physmedia, uint regaddr, bool write,
         }
 
         /* Timed out. Disable mdio access to SERDES. */
-        W_REG(&pcieregs->mdiocontrol, 0);
+        bcma_write32(pi->core, PCIEREGOFFS(mdiocontrol), 0);
         return 1;
 }
 
@@ -502,18 +500,18 @@ static void pcie_extendL1timer(struct pcicore_info *pi, bool extend)
 {
         u32 w;
         struct si_pub *sih = pi->sih;
-        struct sbpcieregs __iomem *pcieregs = pi->regs.pcieregs;
 
-        if (sih->buscoretype != PCIE_CORE_ID || sih->buscorerev < 7)
+        if (ai_get_buscoretype(sih) != PCIE_CORE_ID ||
+            ai_get_buscorerev(sih) < 7)
                 return;
 
-        w = pcie_readreg(pcieregs, PCIE_PCIEREGS, PCIE_DLLP_PMTHRESHREG);
+        w = pcie_readreg(pi->core, PCIE_PCIEREGS, PCIE_DLLP_PMTHRESHREG);
         if (extend)
                 w |= PCIE_ASPMTIMER_EXTEND;
         else
                 w &= ~PCIE_ASPMTIMER_EXTEND;
-        pcie_writereg(pcieregs, PCIE_PCIEREGS, PCIE_DLLP_PMTHRESHREG, w);
-        w = pcie_readreg(pcieregs, PCIE_PCIEREGS, PCIE_DLLP_PMTHRESHREG);
+        pcie_writereg(pi->core, PCIE_PCIEREGS, PCIE_DLLP_PMTHRESHREG, w);
+        w = pcie_readreg(pi->core, PCIE_PCIEREGS, PCIE_DLLP_PMTHRESHREG);
 }
 
 /* centralized clkreq control policy */
@@ -527,25 +525,27 @@ static void pcie_clkreq_upd(struct pcicore_info *pi, uint state)
                         pcie_clkreq(pi, 1, 0);
                 break;
         case SI_PCIDOWN:
-                if (sih->buscorerev == 6) {     /* turn on serdes PLL down */
-                        ai_corereg(sih, SI_CC_IDX,
-                                   offsetof(struct chipcregs, chipcontrol_addr),
-                                   ~0, 0);
-                        ai_corereg(sih, SI_CC_IDX,
-                                   offsetof(struct chipcregs, chipcontrol_data),
-                                   ~0x40, 0);
+                /* turn on serdes PLL down */
+                if (ai_get_buscorerev(sih) == 6) {
+                        ai_cc_reg(sih,
+                                  offsetof(struct chipcregs, chipcontrol_addr),
+                                  ~0, 0);
+                        ai_cc_reg(sih,
+                                  offsetof(struct chipcregs, chipcontrol_data),
+                                  ~0x40, 0);
                 } else if (pi->pcie_pr42767) {
                         pcie_clkreq(pi, 1, 1);
                 }
                 break;
         case SI_PCIUP:
-                if (sih->buscorerev == 6) {     /* turn off serdes PLL down */
-                        ai_corereg(sih, SI_CC_IDX,
-                                   offsetof(struct chipcregs, chipcontrol_addr),
-                                   ~0, 0);
-                        ai_corereg(sih, SI_CC_IDX,
-                                   offsetof(struct chipcregs, chipcontrol_data),
-                                   ~0x40, 0x40);
+                /* turn off serdes PLL down */
+                if (ai_get_buscorerev(sih) == 6) {
+                        ai_cc_reg(sih,
+                                  offsetof(struct chipcregs, chipcontrol_addr),
+                                  ~0, 0);
+                        ai_cc_reg(sih,
+                                  offsetof(struct chipcregs, chipcontrol_data),
+                                  ~0x40, 0x40);
                 } else if (PCIE_ASPM(sih)) {    /* disable clkreq */
                         pcie_clkreq(pi, 1, 0);
                 }
@@ -562,7 +562,7 @@ static void pcie_war_polarity(struct pcicore_info *pi)
         if (pi->pcie_polarity != 0)
                 return;
 
-        w = pcie_readreg(pi->regs.pcieregs, PCIE_PCIEREGS, PCIE_PLP_STATUSREG);
+        w = pcie_readreg(pi->core, PCIE_PCIEREGS, PCIE_PLP_STATUSREG);
 
         /* Detect the current polarity at attach and force that polarity and
          * disable changing the polarity
@@ -581,18 +581,15 @@ static void pcie_war_polarity(struct pcicore_info *pi)
  */
 static void pcie_war_aspm_clkreq(struct pcicore_info *pi)
 {
-        struct sbpcieregs __iomem *pcieregs = pi->regs.pcieregs;
         struct si_pub *sih = pi->sih;
         u16 val16;
-        u16 __iomem *reg16;
         u32 w;
 
         if (!PCIE_ASPM(sih))
                 return;
 
         /* bypass this on QT or VSIM */
-        reg16 = &pcieregs->sprom[SRSH_ASPM_OFFSET];
-        val16 = R_REG(reg16);
+        val16 = bcma_read16(pi->core, PCIEREGOFFS(sprom[SRSH_ASPM_OFFSET]));
 
         val16 &= ~SRSH_ASPM_ENB;
         if (pi->pcie_war_aspm_ovr == PCIE_ASPM_ENAB)
@@ -602,15 +599,15 @@ static void pcie_war_aspm_clkreq(struct pcicore_info *pi)
         else if (pi->pcie_war_aspm_ovr == PCIE_ASPM_L0s_ENAB)
                 val16 |= SRSH_ASPM_L0s_ENB;
 
-        W_REG(reg16, val16);
+        bcma_write16(pi->core, PCIEREGOFFS(sprom[SRSH_ASPM_OFFSET]), val16);
 
         pci_read_config_dword(pi->dev, pi->pciecap_lcreg_offset, &w);
         w &= ~PCIE_ASPM_ENAB;
         w |= pi->pcie_war_aspm_ovr;
         pci_write_config_dword(pi->dev, pi->pciecap_lcreg_offset, w);
 
-        reg16 = &pcieregs->sprom[SRSH_CLKREQ_OFFSET_REV5];
-        val16 = R_REG(reg16);
+        val16 = bcma_read16(pi->core,
+                            PCIEREGOFFS(sprom[SRSH_CLKREQ_OFFSET_REV5]));
 
         if (pi->pcie_war_aspm_ovr != PCIE_ASPM_DISAB) {
                 val16 |= SRSH_CLKREQ_ENB;
@@ -618,7 +615,8 @@ static void pcie_war_aspm_clkreq(struct pcicore_info *pi)
         } else
                 val16 &= ~SRSH_CLKREQ_ENB;
 
-        W_REG(reg16, val16);
+        bcma_write16(pi->core, PCIEREGOFFS(sprom[SRSH_CLKREQ_OFFSET_REV5]),
+                     val16);
 }
 
 /* Apply the polarity determined at the start */
@@ -642,16 +640,15 @@ static void pcie_war_serdes(struct pcicore_info *pi)
 /* Needs to happen when coming out of 'standby'/'hibernate' */
 static void pcie_misc_config_fixup(struct pcicore_info *pi)
 {
-        struct sbpcieregs __iomem *pcieregs = pi->regs.pcieregs;
         u16 val16;
-        u16 __iomem *reg16;
 
-        reg16 = &pcieregs->sprom[SRSH_PCIE_MISC_CONFIG];
-        val16 = R_REG(reg16);
+        val16 = bcma_read16(pi->core,
+                            PCIEREGOFFS(sprom[SRSH_PCIE_MISC_CONFIG]));
 
         if ((val16 & SRSH_L23READY_EXIT_NOPERST) == 0) {
                 val16 |= SRSH_L23READY_EXIT_NOPERST;
-                W_REG(reg16, val16);
+                bcma_write16(pi->core,
+                             PCIEREGOFFS(sprom[SRSH_PCIE_MISC_CONFIG]), val16);
         }
 }
 
@@ -659,62 +656,57 @@ static void pcie_misc_config_fixup(struct pcicore_info *pi)
 /* Needs to happen when coming out of 'standby'/'hibernate' */
 static void pcie_war_noplldown(struct pcicore_info *pi)
 {
-        struct sbpcieregs __iomem *pcieregs = pi->regs.pcieregs;
-        u16 __iomem *reg16;
-
         /* turn off serdes PLL down */
-        ai_corereg(pi->sih, SI_CC_IDX, offsetof(struct chipcregs, chipcontrol),
-                   CHIPCTRL_4321_PLL_DOWN, CHIPCTRL_4321_PLL_DOWN);
+        ai_cc_reg(pi->sih, offsetof(struct chipcregs, chipcontrol),
+                  CHIPCTRL_4321_PLL_DOWN, CHIPCTRL_4321_PLL_DOWN);
 
         /* clear srom shadow backdoor */
-        reg16 = &pcieregs->sprom[SRSH_BD_OFFSET];
-        W_REG(reg16, 0);
+        bcma_write16(pi->core, PCIEREGOFFS(sprom[SRSH_BD_OFFSET]), 0);
 }
 
 /* Needs to happen when coming out of 'standby'/'hibernate' */
 static void pcie_war_pci_setup(struct pcicore_info *pi)
 {
         struct si_pub *sih = pi->sih;
-        struct sbpcieregs __iomem *pcieregs = pi->regs.pcieregs;
         u32 w;
 
-        if (sih->buscorerev == 0 || sih->buscorerev == 1) {
-                w = pcie_readreg(pcieregs, PCIE_PCIEREGS,
+        if (ai_get_buscorerev(sih) == 0 || ai_get_buscorerev(sih) == 1) {
+                w = pcie_readreg(pi->core, PCIE_PCIEREGS,
                                  PCIE_TLP_WORKAROUNDSREG);
                 w |= 0x8;
-                pcie_writereg(pcieregs, PCIE_PCIEREGS,
+                pcie_writereg(pi->core, PCIE_PCIEREGS,
                               PCIE_TLP_WORKAROUNDSREG, w);
         }
 
-        if (sih->buscorerev == 1) {
-                w = pcie_readreg(pcieregs, PCIE_PCIEREGS, PCIE_DLLP_LCREG);
+        if (ai_get_buscorerev(sih) == 1) {
+                w = pcie_readreg(pi->core, PCIE_PCIEREGS, PCIE_DLLP_LCREG);
                 w |= 0x40;
-                pcie_writereg(pcieregs, PCIE_PCIEREGS, PCIE_DLLP_LCREG, w);
+                pcie_writereg(pi->core, PCIE_PCIEREGS, PCIE_DLLP_LCREG, w);
         }
 
-        if (sih->buscorerev == 0) {
+        if (ai_get_buscorerev(sih) == 0) {
                 pcie_mdiowrite(pi, MDIODATA_DEV_RX, SERDES_RX_TIMER1, 0x8128);
                 pcie_mdiowrite(pi, MDIODATA_DEV_RX, SERDES_RX_CDR, 0x0100);
                 pcie_mdiowrite(pi, MDIODATA_DEV_RX, SERDES_RX_CDRBW, 0x1466);
         } else if (PCIE_ASPM(sih)) {
                 /* Change the L1 threshold for better performance */
-                w = pcie_readreg(pcieregs, PCIE_PCIEREGS,
+                w = pcie_readreg(pi->core, PCIE_PCIEREGS,
                                  PCIE_DLLP_PMTHRESHREG);
                 w &= ~PCIE_L1THRESHOLDTIME_MASK;
                 w |= PCIE_L1THRESHOLD_WARVAL << PCIE_L1THRESHOLDTIME_SHIFT;
-                pcie_writereg(pcieregs, PCIE_PCIEREGS,
+                pcie_writereg(pi->core, PCIE_PCIEREGS,
                               PCIE_DLLP_PMTHRESHREG, w);
 
                 pcie_war_serdes(pi);
 
                 pcie_war_aspm_clkreq(pi);
-        } else if (pi->sih->buscorerev == 7)
+        } else if (ai_get_buscorerev(pi->sih) == 7)
                 pcie_war_noplldown(pi);
 
         /* Note that the fix is actually in the SROM,
          * that's why this is open-ended
          */
-        if (pi->sih->buscorerev >= 6)
+        if (ai_get_buscorerev(pi->sih) >= 6)
                 pcie_misc_config_fixup(pi);
 }
 
@@ -745,7 +737,7 @@ void pcicore_attach(struct pcicore_info *pi, int state)
 
 void pcicore_hwup(struct pcicore_info *pi)
 {
-        if (!pi || pi->sih->buscoretype != PCIE_CORE_ID)
+        if (!pi || ai_get_buscoretype(pi->sih) != PCIE_CORE_ID)
                 return;
 
         pcie_war_pci_setup(pi);
@@ -753,7 +745,7 @@ void pcicore_hwup(struct pcicore_info *pi)
 
 void pcicore_up(struct pcicore_info *pi, int state)
 {
-        if (!pi || pi->sih->buscoretype != PCIE_CORE_ID)
+        if (!pi || ai_get_buscoretype(pi->sih) != PCIE_CORE_ID)
                 return;
 
         /* Restore L1 timer for better performance */
@@ -781,7 +773,7 @@ void pcicore_sleep(struct pcicore_info *pi)
 
 void pcicore_down(struct pcicore_info *pi, int state)
 {
-        if (!pi || pi->sih->buscoretype != PCIE_CORE_ID)
+        if (!pi || ai_get_buscoretype(pi->sih) != PCIE_CORE_ID)
                 return;
 
         pcie_clkreq_upd(pi, state);
@@ -790,46 +782,45 @@ void pcicore_down(struct pcicore_info *pi, int state)
         pcie_extendL1timer(pi, false);
 }
 
-/* precondition: current core is sii->buscoretype */
-static void pcicore_fixcfg(struct pcicore_info *pi, u16 __iomem *reg16)
+void pcicore_fixcfg(struct pcicore_info *pi)
 {
-        struct si_info *sii = (struct si_info *)(pi->sih);
+        struct bcma_device *core = pi->core;
         u16 val16;
-        uint pciidx;
+        uint regoff;
 
-        pciidx = ai_coreidx(&sii->pub);
-        val16 = R_REG(reg16);
-        if (((val16 & SRSH_PI_MASK) >> SRSH_PI_SHIFT) != (u16)pciidx) {
-                val16 = (u16)(pciidx << SRSH_PI_SHIFT) |
-                        (val16 & ~SRSH_PI_MASK);
-                W_REG(reg16, val16);
-        }
-}
+        switch (pi->core->id.id) {
+        case BCMA_CORE_PCI:
+                regoff = PCIREGOFFS(sprom[SRSH_PI_OFFSET]);
+                break;
 
-void
-pcicore_fixcfg_pci(struct pcicore_info *pi, struct sbpciregs __iomem *pciregs)
-{
-        pcicore_fixcfg(pi, &pciregs->sprom[SRSH_PI_OFFSET]);
-}
+        case BCMA_CORE_PCIE:
+                regoff = PCIEREGOFFS(sprom[SRSH_PI_OFFSET]);
+                break;
 
-void pcicore_fixcfg_pcie(struct pcicore_info *pi,
-                         struct sbpcieregs __iomem *pcieregs)
-{
-        pcicore_fixcfg(pi, &pcieregs->sprom[SRSH_PI_OFFSET]);
+        default:
+                return;
+        }
+
+        val16 = bcma_read16(pi->core, regoff);
+        if (((val16 & SRSH_PI_MASK) >> SRSH_PI_SHIFT) !=
+            (u16)core->core_index) {
+                val16 = ((u16)core->core_index << SRSH_PI_SHIFT) |
+                        (val16 & ~SRSH_PI_MASK);
+                bcma_write16(pi->core, regoff, val16);
+        }
 }
 
 /* precondition: current core is pci core */
 void
-pcicore_pci_setup(struct pcicore_info *pi, struct sbpciregs __iomem *pciregs)
+pcicore_pci_setup(struct pcicore_info *pi)
 {
-        u32 w;
-
-        OR_REG(&pciregs->sbtopci2, SBTOPCI_PREF | SBTOPCI_BURST);
-
-        if (((struct si_info *)(pi->sih))->pub.buscorerev >= 11) {
-                OR_REG(&pciregs->sbtopci2, SBTOPCI_RC_READMULTI);
-                w = R_REG(&pciregs->clkrun);
-                W_REG(&pciregs->clkrun, w | PCI_CLKRUN_DSBL);
-                w = R_REG(&pciregs->clkrun);
+        bcma_set32(pi->core, PCIREGOFFS(sbtopci2),
+                   SBTOPCI_PREF | SBTOPCI_BURST);
+
+        if (pi->core->id.rev >= 11) {
+                bcma_set32(pi->core, PCIREGOFFS(sbtopci2),
+                           SBTOPCI_RC_READMULTI);
+                bcma_set32(pi->core, PCIREGOFFS(clkrun), PCI_CLKRUN_DSBL);
+                (void)bcma_read32(pi->core, PCIREGOFFS(clkrun));
         }
 }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h
index 58aa80dc3329..9fc3ead540a8 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/nicpci.h
@@ -62,8 +62,7 @@ struct sbpciregs;
 struct sbpcieregs;
 
 extern struct pcicore_info *pcicore_init(struct si_pub *sih,
-                                         struct pci_dev *pdev,
-                                         void __iomem *regs);
+                                         struct bcma_device *core);
 extern void pcicore_deinit(struct pcicore_info *pch);
 extern void pcicore_attach(struct pcicore_info *pch, int state);
 extern void pcicore_hwup(struct pcicore_info *pch);
@@ -72,11 +71,7 @@ extern void pcicore_sleep(struct pcicore_info *pch);
 extern void pcicore_down(struct pcicore_info *pch, int state);
 extern u8 pcicore_find_pci_capability(struct pci_dev *dev, u8 req_cap_id,
                                       unsigned char *buf, u32 *buflen);
-extern void pcicore_fixcfg_pci(struct pcicore_info *pch,
-                               struct sbpciregs __iomem *pciregs);
-extern void pcicore_fixcfg_pcie(struct pcicore_info *pch,
-                                struct sbpcieregs __iomem *pciregs);
-extern void pcicore_pci_setup(struct pcicore_info *pch,
-                              struct sbpciregs __iomem *pciregs);
+extern void pcicore_fixcfg(struct pcicore_info *pch);
+extern void pcicore_pci_setup(struct pcicore_info *pch);
 
 #endif /* _BRCM_NICPCI_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/otp.c b/drivers/net/wireless/brcm80211/brcmsmac/otp.c
index edf551561fd8..f1ca12625860 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/otp.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/otp.c
@@ -77,7 +77,7 @@ struct otp_fn_s {
 };
 
 struct otpinfo {
-        uint ccrev;             /* chipc revision */
+        struct bcma_device *core; /* chipc core */
         const struct otp_fn_s *fn;      /* OTP functions */
         struct si_pub *sih;             /* Saved sb handle */
 
@@ -133,9 +133,10 @@ struct otpinfo {
 #define OTP_SZ_FU_144           (144/8) /* 144 bits */
 
 static u16
-ipxotp_otpr(struct otpinfo *oi, struct chipcregs __iomem *cc, uint wn)
+ipxotp_otpr(struct otpinfo *oi, uint wn)
 {
-        return R_REG(&cc->sromotp[wn]);
+        return bcma_read16(oi->core,
+                           CHIPCREGOFFS(sromotp[wn]));
 }
 
 /*
@@ -146,7 +147,7 @@ static int ipxotp_max_rgnsz(struct si_pub *sih, int osizew)
 {
         int ret = 0;
 
-        switch (sih->chip) {
+        switch (ai_get_chip_id(sih)) {
         case BCM43224_CHIP_ID:
         case BCM43225_CHIP_ID:
                 ret = osizew * 2 - OTP_SZ_FU_72 - OTP_SZ_CHECKSUM;
@@ -161,19 +162,21 @@ static int ipxotp_max_rgnsz(struct si_pub *sih, int osizew)
         return ret;
 }
 
-static void _ipxotp_init(struct otpinfo *oi, struct chipcregs __iomem *cc)
+static void _ipxotp_init(struct otpinfo *oi)
 {
         uint k;
         u32 otpp, st;
+        int ccrev = ai_get_ccrev(oi->sih);
+
 
         /*
          * record word offset of General Use Region
          * for various chipcommon revs
          */
-        if (oi->sih->ccrev == 21 || oi->sih->ccrev == 24
-            || oi->sih->ccrev == 27) {
+        if (ccrev == 21 || ccrev == 24
+            || ccrev == 27) {
                 oi->otpgu_base = REVA4_OTPGU_BASE;
-        } else if (oi->sih->ccrev == 36) {
+        } else if (ccrev == 36) {
                 /*
                  * OTP size greater than equal to 2KB (128 words),
                  * otpgu_base is similar to rev23
@@ -182,7 +185,7 @@ static void _ipxotp_init(struct otpinfo *oi, struct chipcregs __iomem *cc)
                         oi->otpgu_base = REVB8_OTPGU_BASE;
                 else
                         oi->otpgu_base = REV36_OTPGU_BASE;
-        } else if (oi->sih->ccrev == 23 || oi->sih->ccrev >= 25) {
+        } else if (ccrev == 23 || ccrev >= 25) {
                 oi->otpgu_base = REVB8_OTPGU_BASE;
         }
 
@@ -190,24 +193,21 @@ static void _ipxotp_init(struct otpinfo *oi, struct chipcregs __iomem *cc)
         otpp =
             OTPP_START_BUSY | ((OTPPOC_INIT << OTPP_OC_SHIFT) & OTPP_OC_MASK);
 
-        W_REG(&cc->otpprog, otpp);
-        for (k = 0;
-             ((st = R_REG(&cc->otpprog)) & OTPP_START_BUSY)
-             && (k < OTPP_TRIES); k++)
-                ;
+        bcma_write32(oi->core, CHIPCREGOFFS(otpprog), otpp);
+        st = bcma_read32(oi->core, CHIPCREGOFFS(otpprog));
+        for (k = 0; (st & OTPP_START_BUSY) && (k < OTPP_TRIES); k++)
+                st = bcma_read32(oi->core, CHIPCREGOFFS(otpprog));
         if (k >= OTPP_TRIES)
                 return;
 
         /* Read OTP lock bits and subregion programmed indication bits */
-        oi->status = R_REG(&cc->otpstatus);
+        oi->status = bcma_read32(oi->core, CHIPCREGOFFS(otpstatus));
 
-        if ((oi->sih->chip == BCM43224_CHIP_ID)
-            || (oi->sih->chip == BCM43225_CHIP_ID)) {
+        if ((ai_get_chip_id(oi->sih) == BCM43224_CHIP_ID)
+            || (ai_get_chip_id(oi->sih) == BCM43225_CHIP_ID)) {
                 u32 p_bits;
-                p_bits =
-                    (ipxotp_otpr(oi, cc, oi->otpgu_base + OTPGU_P_OFF) &
-                     OTPGU_P_MSK)
-                    >> OTPGU_P_SHIFT;
+                p_bits = (ipxotp_otpr(oi, oi->otpgu_base + OTPGU_P_OFF) &
+                          OTPGU_P_MSK) >> OTPGU_P_SHIFT;
                 oi->status |= (p_bits << OTPS_GUP_SHIFT);
         }
 
@@ -220,7 +220,7 @@ static void _ipxotp_init(struct otpinfo *oi, struct chipcregs __iomem *cc)
         oi->hwlim = oi->wsize;
         if (oi->status & OTPS_GUP_HW) {
                 oi->hwlim =
-                    ipxotp_otpr(oi, cc, oi->otpgu_base + OTPGU_HSB_OFF) / 16;
+                    ipxotp_otpr(oi, oi->otpgu_base + OTPGU_HSB_OFF) / 16;
                 oi->swbase = oi->hwlim;
         } else
                 oi->swbase = oi->hwbase;
@@ -230,7 +230,7 @@ static void _ipxotp_init(struct otpinfo *oi, struct chipcregs __iomem *cc)
 
         if (oi->status & OTPS_GUP_SW) {
                 oi->swlim =
-                    ipxotp_otpr(oi, cc, oi->otpgu_base + OTPGU_SFB_OFF) / 16;
+                    ipxotp_otpr(oi, oi->otpgu_base + OTPGU_SFB_OFF) / 16;
                 oi->fbase = oi->swlim;
         } else
                 oi->fbase = oi->swbase;
@@ -240,11 +240,8 @@ static void _ipxotp_init(struct otpinfo *oi, struct chipcregs __iomem *cc)
 
 static int ipxotp_init(struct si_pub *sih, struct otpinfo *oi)
 {
-        uint idx;
-        struct chipcregs __iomem *cc;
-
         /* Make sure we're running IPX OTP */
-        if (!OTPTYPE_IPX(sih->ccrev))
+        if (!OTPTYPE_IPX(ai_get_ccrev(sih)))
                 return -EBADE;
 
         /* Make sure OTP is not disabled */
@@ -252,7 +249,7 @@ static int ipxotp_init(struct si_pub *sih, struct otpinfo *oi)
                 return -EBADE;
 
         /* Check for otp size */
-        switch ((sih->cccaps & CC_CAP_OTPSIZE) >> CC_CAP_OTPSIZE_SHIFT) {
+        switch ((ai_get_cccaps(sih) & CC_CAP_OTPSIZE) >> CC_CAP_OTPSIZE_SHIFT) {
         case 0:
                 /* Nothing there */
                 return -EBADE;
@@ -282,21 +279,13 @@ static int ipxotp_init(struct si_pub *sih, struct otpinfo *oi)
         }
 
         /* Retrieve OTP region info */
-        idx = ai_coreidx(sih);
-        cc = ai_setcoreidx(sih, SI_CC_IDX);
-
-        _ipxotp_init(oi, cc);
-
-        ai_setcoreidx(sih, idx);
-
+        _ipxotp_init(oi);
         return 0;
 }
 
 static int
 ipxotp_read_region(struct otpinfo *oi, int region, u16 *data, uint *wlen)
 {
-        uint idx;
-        struct chipcregs __iomem *cc;
         uint base, i, sz;
 
         /* Validate region selection */
@@ -365,14 +354,10 @@ ipxotp_read_region(struct otpinfo *oi, int region, u16 *data, uint *wlen)
                 return -EINVAL;
         }
 
-        idx = ai_coreidx(oi->sih);
-        cc = ai_setcoreidx(oi->sih, SI_CC_IDX);
-
         /* Read the data */
         for (i = 0; i < sz; i++)
-                data[i] = ipxotp_otpr(oi, cc, base + i);
+                data[i] = ipxotp_otpr(oi, base + i);
 
-        ai_setcoreidx(oi->sih, idx);
         *wlen = sz;
         return 0;
 }
@@ -384,14 +369,13 @@ static const struct otp_fn_s ipxotp_fn = {
 
 static int otp_init(struct si_pub *sih, struct otpinfo *oi)
 {
-
         int ret;
 
         memset(oi, 0, sizeof(struct otpinfo));
 
-        oi->ccrev = sih->ccrev;
+        oi->core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
 
-        if (OTPTYPE_IPX(oi->ccrev))
+        if (OTPTYPE_IPX(ai_get_ccrev(sih)))
                 oi->fn = &ipxotp_fn;
 
         if (oi->fn == NULL)
@@ -399,7 +383,7 @@ static int otp_init(struct si_pub *sih, struct otpinfo *oi)
 
         oi->sih = sih;
 
-        ret = (oi->fn->init) (sih, oi);
+        ret = (oi->fn->init)(sih, oi);
 
         return ret;
 }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
index e17edf7e6833..264f8c4c703d 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
@@ -109,7 +109,7 @@ static const struct chan_info_basic chan_info_all[] = {
         {204, 5020},
         {208, 5040},
         {212, 5060},
-        {216, 50800}
+        {216, 5080}
 };
 
 static const u8 ofdm_rate_lookup[] = {
@@ -149,9 +149,8 @@ void wlc_radioreg_enter(struct brcms_phy_pub *pih)
 void wlc_radioreg_exit(struct brcms_phy_pub *pih)
 {
         struct brcms_phy *pi = (struct brcms_phy *) pih;
-        u16 dummy;
 
-        dummy = R_REG(&pi->regs->phyversion);
+        (void)bcma_read16(pi->d11core, D11REGOFFS(phyversion));
         pi->phy_wreg = 0;
         wlapi_bmac_mctrl(pi->sh->physhim, MCTL_LOCK_RADIO, 0);
 }
@@ -186,11 +185,11 @@ u16 read_radio_reg(struct brcms_phy *pi, u16 addr)
         if ((D11REV_GE(pi->sh->corerev, 24)) ||
             (D11REV_IS(pi->sh->corerev, 22)
              && (pi->pubpi.phy_type != PHY_TYPE_SSN))) {
-                W_REG_FLUSH(&pi->regs->radioregaddr, addr);
-                data = R_REG(&pi->regs->radioregdata);
+                bcma_wflush16(pi->d11core, D11REGOFFS(radioregaddr), addr);
+                data = bcma_read16(pi->d11core, D11REGOFFS(radioregdata));
         } else {
-                W_REG_FLUSH(&pi->regs->phy4waddr, addr);
-                data = R_REG(&pi->regs->phy4wdatalo);
+                bcma_wflush16(pi->d11core, D11REGOFFS(phy4waddr), addr);
+                data = bcma_read16(pi->d11core, D11REGOFFS(phy4wdatalo));
         }
         pi->phy_wreg = 0;
 
@@ -203,15 +202,15 @@ void write_radio_reg(struct brcms_phy *pi, u16 addr, u16 val)
             (D11REV_IS(pi->sh->corerev, 22)
              && (pi->pubpi.phy_type != PHY_TYPE_SSN))) {
 
-                W_REG_FLUSH(&pi->regs->radioregaddr, addr);
-                W_REG(&pi->regs->radioregdata, val);
+                bcma_wflush16(pi->d11core, D11REGOFFS(radioregaddr), addr);
+                bcma_write16(pi->d11core, D11REGOFFS(radioregdata), val);
         } else {
-                W_REG_FLUSH(&pi->regs->phy4waddr, addr);
-                W_REG(&pi->regs->phy4wdatalo, val);
+                bcma_wflush16(pi->d11core, D11REGOFFS(phy4waddr), addr);
+                bcma_write16(pi->d11core, D11REGOFFS(phy4wdatalo), val);
         }
 
         if (++pi->phy_wreg >= pi->phy_wreg_limit) {
-                (void)R_REG(&pi->regs->maccontrol);
+                (void)bcma_read32(pi->d11core, D11REGOFFS(maccontrol));
                 pi->phy_wreg = 0;
         }
 }
@@ -223,19 +222,20 @@ static u32 read_radio_id(struct brcms_phy *pi)
         if (D11REV_GE(pi->sh->corerev, 24)) {
                 u32 b0, b1, b2;
 
-                W_REG_FLUSH(&pi->regs->radioregaddr, 0);
-                b0 = (u32) R_REG(&pi->regs->radioregdata);
-                W_REG_FLUSH(&pi->regs->radioregaddr, 1);
-                b1 = (u32) R_REG(&pi->regs->radioregdata);
-                W_REG_FLUSH(&pi->regs->radioregaddr, 2);
-                b2 = (u32) R_REG(&pi->regs->radioregdata);
+                bcma_wflush16(pi->d11core, D11REGOFFS(radioregaddr), 0);
+                b0 = (u32) bcma_read16(pi->d11core, D11REGOFFS(radioregdata));
+                bcma_wflush16(pi->d11core, D11REGOFFS(radioregaddr), 1);
+                b1 = (u32) bcma_read16(pi->d11core, D11REGOFFS(radioregdata));
+                bcma_wflush16(pi->d11core, D11REGOFFS(radioregaddr), 2);
+                b2 = (u32) bcma_read16(pi->d11core, D11REGOFFS(radioregdata));
 
                 id = ((b0 & 0xf) << 28) | (((b2 << 8) | b1) << 12) | ((b0 >> 4)
                                                                       & 0xf);
         } else {
-                W_REG_FLUSH(&pi->regs->phy4waddr, RADIO_IDCODE);
-                id = (u32) R_REG(&pi->regs->phy4wdatalo);
-                id |= (u32) R_REG(&pi->regs->phy4wdatahi) << 16;
+                bcma_wflush16(pi->d11core, D11REGOFFS(phy4waddr), RADIO_IDCODE);
+                id = (u32) bcma_read16(pi->d11core, D11REGOFFS(phy4wdatalo));
+                id |= (u32) bcma_read16(pi->d11core,
+                                        D11REGOFFS(phy4wdatahi)) << 16;
         }
         pi->phy_wreg = 0;
         return id;
@@ -275,75 +275,52 @@ void mod_radio_reg(struct brcms_phy *pi, u16 addr, u16 mask, u16 val)
 
 void write_phy_channel_reg(struct brcms_phy *pi, uint val)
 {
-        W_REG(&pi->regs->phychannel, val);
+        bcma_write16(pi->d11core, D11REGOFFS(phychannel), val);
 }
 
 u16 read_phy_reg(struct brcms_phy *pi, u16 addr)
 {
-        struct d11regs __iomem *regs;
-
-        regs = pi->regs;
-
-        W_REG_FLUSH(&regs->phyregaddr, addr);
+        bcma_wflush16(pi->d11core, D11REGOFFS(phyregaddr), addr);
 
         pi->phy_wreg = 0;
-        return R_REG(&regs->phyregdata);
+        return bcma_read16(pi->d11core, D11REGOFFS(phyregdata));
 }
 
 void write_phy_reg(struct brcms_phy *pi, u16 addr, u16 val)
 {
-        struct d11regs __iomem *regs;
-
-        regs = pi->regs;
-
 #ifdef CONFIG_BCM47XX
-        W_REG_FLUSH(&regs->phyregaddr, addr);
-        W_REG(&regs->phyregdata, val);
+        bcma_wflush16(pi->d11core, D11REGOFFS(phyregaddr), addr);
+        bcma_write16(pi->d11core, D11REGOFFS(phyregdata), val);
         if (addr == 0x72)
-                (void)R_REG(&regs->phyregdata);
+                (void)bcma_read16(pi->d11core, D11REGOFFS(phyversion));
 #else
-        W_REG((u32 __iomem *)(&regs->phyregaddr), addr | (val << 16));
+        bcma_write32(pi->d11core, D11REGOFFS(phyregaddr), addr | (val << 16));
         if (++pi->phy_wreg >= pi->phy_wreg_limit) {
                 pi->phy_wreg = 0;
-                (void)R_REG(&regs->phyversion);
+                (void)bcma_read16(pi->d11core, D11REGOFFS(phyversion));
         }
 #endif
 }
 
 void and_phy_reg(struct brcms_phy *pi, u16 addr, u16 val)
 {
-        struct d11regs __iomem *regs;
-
-        regs = pi->regs;
-
-        W_REG_FLUSH(&regs->phyregaddr, addr);
-
-        W_REG(&regs->phyregdata, (R_REG(&regs->phyregdata) & val));
+        bcma_wflush16(pi->d11core, D11REGOFFS(phyregaddr), addr);
+        bcma_mask16(pi->d11core, D11REGOFFS(phyregdata), val);
         pi->phy_wreg = 0;
 }
 
 void or_phy_reg(struct brcms_phy *pi, u16 addr, u16 val)
 {
-        struct d11regs __iomem *regs;
-
-        regs = pi->regs;
-
-        W_REG_FLUSH(&regs->phyregaddr, addr);
-
-        W_REG(&regs->phyregdata, (R_REG(&regs->phyregdata) | val));
+        bcma_wflush16(pi->d11core, D11REGOFFS(phyregaddr), addr);
+        bcma_set16(pi->d11core, D11REGOFFS(phyregdata), val);
         pi->phy_wreg = 0;
 }
 
 void mod_phy_reg(struct brcms_phy *pi, u16 addr, u16 mask, u16 val)
 {
-        struct d11regs __iomem *regs;
-
-        regs = pi->regs;
-
-        W_REG_FLUSH(&regs->phyregaddr, addr);
-
-        W_REG(&regs->phyregdata,
-              ((R_REG(&regs->phyregdata) & ~mask) | (val & mask)));
+        val &= mask;
+        bcma_wflush16(pi->d11core, D11REGOFFS(phyregaddr), addr);
+        bcma_maskset16(pi->d11core, D11REGOFFS(phyregdata), ~mask, val);
         pi->phy_wreg = 0;
 }
 
@@ -404,10 +381,8 @@ struct shared_phy *wlc_phy_shared_attach(struct shared_phy_params *shp)
         sh->sromrev = shp->sromrev;
         sh->boardtype = shp->boardtype;
         sh->boardrev = shp->boardrev;
-        sh->boardvendor = shp->boardvendor;
         sh->boardflags = shp->boardflags;
         sh->boardflags2 = shp->boardflags2;
-        sh->buscorerev = shp->buscorerev;
 
         sh->fast_timer = PHY_SW_TIMER_FAST;
         sh->slow_timer = PHY_SW_TIMER_SLOW;
@@ -450,7 +425,7 @@ static u32 wlc_phy_get_radio_ver(struct brcms_phy *pi)
 }
 
 struct brcms_phy_pub *
-wlc_phy_attach(struct shared_phy *sh, struct d11regs __iomem *regs,
+wlc_phy_attach(struct shared_phy *sh, struct bcma_device *d11core,
                int bandtype, struct wiphy *wiphy)
 {
         struct brcms_phy *pi;
@@ -462,7 +437,7 @@ wlc_phy_attach(struct shared_phy *sh, struct d11regs __iomem *regs,
         if (D11REV_IS(sh->corerev, 4))
                 sflags = SISF_2G_PHY | SISF_5G_PHY;
         else
-                sflags = ai_core_sflags(sh->sih, 0, 0);
+                sflags = bcma_aread32(d11core, BCMA_IOST);
 
         if (bandtype == BRCM_BAND_5G) {
                 if ((sflags & (SISF_5G_PHY | SISF_DB_PHY)) == 0)
@@ -480,7 +455,7 @@ wlc_phy_attach(struct shared_phy *sh, struct d11regs __iomem *regs,
         if (pi == NULL)
                 return NULL;
         pi->wiphy = wiphy;
-        pi->regs = regs;
+        pi->d11core = d11core;
         pi->sh = sh;
         pi->phy_init_por = true;
         pi->phy_wreg_limit = PHY_WREG_LIMIT;
@@ -495,7 +470,7 @@ wlc_phy_attach(struct shared_phy *sh, struct d11regs __iomem *regs,
                 pi->pubpi.coreflags = SICF_GMODE;
 
         wlapi_bmac_corereset(pi->sh->physhim, pi->pubpi.coreflags);
-        phyversion = R_REG(&pi->regs->phyversion);
+        phyversion = bcma_read16(pi->d11core, D11REGOFFS(phyversion));
 
         pi->pubpi.phy_type = PHY_TYPE(phyversion);
         pi->pubpi.phy_rev = phyversion & PV_PV_MASK;
@@ -507,8 +482,8 @@ wlc_phy_attach(struct shared_phy *sh, struct d11regs __iomem *regs,
         pi->pubpi.phy_corenum = PHY_CORE_NUM_2;
         pi->pubpi.ana_rev = (phyversion & PV_AV_MASK) >> PV_AV_SHIFT;
 
-        if (!pi->pubpi.phy_type == PHY_TYPE_N &&
-            !pi->pubpi.phy_type == PHY_TYPE_LCN)
+        if (pi->pubpi.phy_type != PHY_TYPE_N &&
+            pi->pubpi.phy_type != PHY_TYPE_LCN)
                 goto err;
 
         if (bandtype == BRCM_BAND_5G) {
@@ -779,14 +754,14 @@ void wlc_phy_init(struct brcms_phy_pub *pih, u16 chanspec)
 
         pi->radio_chanspec = chanspec;
 
-        mc = R_REG(&pi->regs->maccontrol);
+        mc = bcma_read32(pi->d11core, D11REGOFFS(maccontrol));
         if (WARN(mc & MCTL_EN_MAC, "HW error MAC running on init"))
                 return;
 
         if (!(pi->measure_hold & PHY_HOLD_FOR_SCAN))
                 pi->measure_hold |= PHY_HOLD_FOR_NOT_ASSOC;
 
-        if (WARN(!(ai_core_sflags(pi->sh->sih, 0, 0) & SISF_FCLKA),
+        if (WARN(!(bcma_aread32(pi->d11core, BCMA_IOST) & SISF_FCLKA),
                  "HW error SISF_FCLKA\n"))
                 return;
 
@@ -825,8 +800,8 @@ void wlc_phy_cal_init(struct brcms_phy_pub *pih)
         struct brcms_phy *pi = (struct brcms_phy *) pih;
         void (*cal_init)(struct brcms_phy *) = NULL;
 
-        if (WARN((R_REG(&pi->regs->maccontrol) & MCTL_EN_MAC) != 0,
-                 "HW error: MAC enabled during phy cal\n"))
+        if (WARN((bcma_read32(pi->d11core, D11REGOFFS(maccontrol)) &
+                  MCTL_EN_MAC) != 0, "HW error: MAC enabled during phy cal\n"))
                 return;
 
         if (!pi->initialized) {
@@ -1017,7 +992,7 @@ wlc_phy_init_radio_regs(struct brcms_phy *pi,
 void wlc_phy_do_dummy_tx(struct brcms_phy *pi, bool ofdm, bool pa_on)
 {
 #define DUMMY_PKT_LEN   20
-        struct d11regs __iomem *regs = pi->regs;
+        struct bcma_device *core = pi->d11core;
         int i, count;
         u8 ofdmpkt[DUMMY_PKT_LEN] = {
                 0xcc, 0x01, 0x02, 0x00, 0x00, 0x00, 0xd4, 0x00, 0x00, 0x00,
@@ -1033,26 +1008,28 @@ void wlc_phy_do_dummy_tx(struct brcms_phy *pi, bool ofdm, bool pa_on)
         wlapi_bmac_write_template_ram(pi->sh->physhim, 0, DUMMY_PKT_LEN,
                                       dummypkt);
 
-        W_REG(&regs->xmtsel, 0);
+        bcma_write16(core, D11REGOFFS(xmtsel), 0);
 
         if (D11REV_GE(pi->sh->corerev, 11))
-                W_REG(&regs->wepctl, 0x100);
+                bcma_write16(core, D11REGOFFS(wepctl), 0x100);
         else
-                W_REG(&regs->wepctl, 0);
+                bcma_write16(core, D11REGOFFS(wepctl), 0);
 
-        W_REG(&regs->txe_phyctl, (ofdm ? 1 : 0) | PHY_TXC_ANT_0);
+        bcma_write16(core, D11REGOFFS(txe_phyctl),
+                     (ofdm ? 1 : 0) | PHY_TXC_ANT_0);
         if (ISNPHY(pi) || ISLCNPHY(pi))
-                W_REG(&regs->txe_phyctl1, 0x1A02);
+                bcma_write16(core, D11REGOFFS(txe_phyctl1), 0x1A02);
 
-        W_REG(&regs->txe_wm_0, 0);
-        W_REG(&regs->txe_wm_1, 0);
+        bcma_write16(core, D11REGOFFS(txe_wm_0), 0);
+        bcma_write16(core, D11REGOFFS(txe_wm_1), 0);
 
-        W_REG(&regs->xmttplatetxptr, 0);
-        W_REG(&regs->xmttxcnt, DUMMY_PKT_LEN);
+        bcma_write16(core, D11REGOFFS(xmttplatetxptr), 0);
+        bcma_write16(core, D11REGOFFS(xmttxcnt), DUMMY_PKT_LEN);
 
-        W_REG(&regs->xmtsel, ((8 << 8) | (1 << 5) | (1 << 2) | 2));
+        bcma_write16(core, D11REGOFFS(xmtsel),
+                     ((8 << 8) | (1 << 5) | (1 << 2) | 2));
 
-        W_REG(&regs->txe_ctl, 0);
+        bcma_write16(core, D11REGOFFS(txe_ctl), 0);
 
         if (!pa_on) {
                 if (ISNPHY(pi))
@@ -1060,27 +1037,28 @@ void wlc_phy_do_dummy_tx(struct brcms_phy *pi, bool ofdm, bool pa_on)
         }
 
         if (ISNPHY(pi) || ISLCNPHY(pi))
-                W_REG(&regs->txe_aux, 0xD0);
+                bcma_write16(core, D11REGOFFS(txe_aux), 0xD0);
         else
-                W_REG(&regs->txe_aux, ((1 << 5) | (1 << 4)));
+                bcma_write16(core, D11REGOFFS(txe_aux), ((1 << 5) | (1 << 4)));
 
-        (void)R_REG(&regs->txe_aux);
+        (void)bcma_read16(core, D11REGOFFS(txe_aux));
 
         i = 0;
         count = ofdm ? 30 : 250;
         while ((i++ < count)
-               && (R_REG(&regs->txe_status) & (1 << 7)))
+               && (bcma_read16(core, D11REGOFFS(txe_status)) & (1 << 7)))
                 udelay(10);
 
         i = 0;
 
-        while ((i++ < 10)
-               && ((R_REG(&regs->txe_status) & (1 << 10)) == 0))
+        while ((i++ < 10) &&
+               ((bcma_read16(core, D11REGOFFS(txe_status)) & (1 << 10)) == 0))
                 udelay(10);
 
         i = 0;
 
-        while ((i++ < 10) && ((R_REG(&regs->ifsstat) & (1 << 8))))
+        while ((i++ < 10) &&
+               ((bcma_read16(core, D11REGOFFS(ifsstat)) & (1 << 8))))
                 udelay(10);
 
         if (!pa_on) {
@@ -1137,7 +1115,7 @@ static bool wlc_phy_cal_txpower_recalc_sw(struct brcms_phy *pi)
 void wlc_phy_switch_radio(struct brcms_phy_pub *pih, bool on)
 {
         struct brcms_phy *pi = (struct brcms_phy *) pih;
-        (void)R_REG(&pi->regs->maccontrol);
+        (void)bcma_read32(pi->d11core, D11REGOFFS(maccontrol));
 
         if (ISNPHY(pi)) {
                 wlc_phy_switch_radio_nphy(pi, on);
@@ -1377,7 +1355,7 @@ void wlc_phy_txpower_target_set(struct brcms_phy_pub *ppi,
         memcpy(&pi->tx_user_target[TXP_FIRST_MCS_40_SDM],
                &txpwr->mcs_40_mimo[0], BRCMS_NUM_RATES_MCS_2_STREAM);
 
-        if (R_REG(&pi->regs->maccontrol) & MCTL_EN_MAC)
+        if (bcma_read32(pi->d11core, D11REGOFFS(maccontrol)) & MCTL_EN_MAC)
                 mac_enabled = true;
 
         if (mac_enabled)
@@ -1407,7 +1385,8 @@ int wlc_phy_txpower_set(struct brcms_phy_pub *ppi, uint qdbm, bool override)
                 if (!SCAN_INPROG_PHY(pi)) {
                         bool suspend;
 
-                        suspend = (0 == (R_REG(&pi->regs->maccontrol) &
+                        suspend = (0 == (bcma_read32(pi->d11core,
+                                                     D11REGOFFS(maccontrol)) &
                                          MCTL_EN_MAC));
 
                         if (!suspend)
@@ -1860,18 +1839,17 @@ void wlc_phy_runbist_config(struct brcms_phy_pub *ppi, bool start_end)
 
                 if (NREV_IS(pi->pubpi.phy_rev, 3)
                     || NREV_IS(pi->pubpi.phy_rev, 4)) {
-                        W_REG(&pi->regs->phyregaddr, 0xa0);
-                        (void)R_REG(&pi->regs->phyregaddr);
-                        rxc = R_REG(&pi->regs->phyregdata);
-                        W_REG(&pi->regs->phyregdata,
-                              (0x1 << 15) | rxc);
+                        bcma_wflush16(pi->d11core, D11REGOFFS(phyregaddr),
+                                      0xa0);
+                        bcma_set16(pi->d11core, D11REGOFFS(phyregdata),
+                                   0x1 << 15);
                 }
         } else {
                 if (NREV_IS(pi->pubpi.phy_rev, 3)
                     || NREV_IS(pi->pubpi.phy_rev, 4)) {
-                        W_REG(&pi->regs->phyregaddr, 0xa0);
-                        (void)R_REG(&pi->regs->phyregaddr);
-                        W_REG(&pi->regs->phyregdata, rxc);
+                        bcma_wflush16(pi->d11core, D11REGOFFS(phyregaddr),
+                                      0xa0);
+                        bcma_write16(pi->d11core, D11REGOFFS(phyregdata), rxc);
                 }
 
                 wlc_phy_por_inform(ppi);
@@ -1991,7 +1969,9 @@ void wlc_phy_txpower_hw_ctrl_set(struct brcms_phy_pub *ppi, bool hwpwrctrl)
         pi->txpwrctrl = hwpwrctrl;
 
         if (ISNPHY(pi)) {
-                suspend = (0 == (R_REG(&pi->regs->maccontrol) & MCTL_EN_MAC));
+                suspend = (0 == (bcma_read32(pi->d11core,
+                                             D11REGOFFS(maccontrol)) &
+                                 MCTL_EN_MAC));
                 if (!suspend)
                         wlapi_suspend_mac_and_wait(pi->sh->physhim);
 
@@ -2193,7 +2173,8 @@ void wlc_phy_ant_rxdiv_set(struct brcms_phy_pub *ppi, u8 val)
         if (!pi->sh->clk)
                 return;
 
-        suspend = (0 == (R_REG(&pi->regs->maccontrol) & MCTL_EN_MAC));
+        suspend = (0 == (bcma_read32(pi->d11core, D11REGOFFS(maccontrol)) &
+                         MCTL_EN_MAC));
         if (!suspend)
                 wlapi_suspend_mac_and_wait(pi->sh->physhim);
 
@@ -2411,8 +2392,8 @@ wlc_phy_noise_sample_request(struct brcms_phy_pub *pih, u8 reason, u8 ch)
                         wlapi_bmac_write_shm(pi->sh->physhim, M_PWRIND_MAP2, 0);
                         wlapi_bmac_write_shm(pi->sh->physhim, M_PWRIND_MAP3, 0);
 
-                        OR_REG(&pi->regs->maccommand,
-                               MCMD_BG_NOISE);
+                        bcma_set32(pi->d11core, D11REGOFFS(maccommand),
+                                   MCMD_BG_NOISE);
                 } else {
                         wlapi_suspend_mac_and_wait(pi->sh->physhim);
                         wlc_lcnphy_deaf_mode(pi, (bool) 0);
@@ -2430,8 +2411,8 @@ wlc_phy_noise_sample_request(struct brcms_phy_pub *pih, u8 reason, u8 ch)
                         wlapi_bmac_write_shm(pi->sh->physhim, M_PWRIND_MAP2, 0);
                         wlapi_bmac_write_shm(pi->sh->physhim, M_PWRIND_MAP3, 0);
 
-                        OR_REG(&pi->regs->maccommand,
-                               MCMD_BG_NOISE);
+                        bcma_set32(pi->d11core, D11REGOFFS(maccommand),
+                                   MCMD_BG_NOISE);
                 } else {
                         struct phy_iq_est est[PHY_CORE_MAX];
                         u32 cmplx_pwr[PHY_CORE_MAX];
@@ -2924,29 +2905,29 @@ void wlc_lcnphy_epa_switch(struct brcms_phy *pi, bool mode)
                                 mod_phy_reg(pi, 0x44c, (0x1 << 2), (1) << 2);
 
                         }
-                        ai_corereg(pi->sh->sih, SI_CC_IDX,
-                                   offsetof(struct chipcregs, gpiocontrol),
-                                   ~0x0, 0x0);
-                        ai_corereg(pi->sh->sih, SI_CC_IDX,
-                                   offsetof(struct chipcregs, gpioout), 0x40,
-                                   0x40);
-                        ai_corereg(pi->sh->sih, SI_CC_IDX,
-                                   offsetof(struct chipcregs, gpioouten), 0x40,
-                                   0x40);
+                        ai_cc_reg(pi->sh->sih,
+                                  offsetof(struct chipcregs, gpiocontrol),
+                                  ~0x0, 0x0);
+                        ai_cc_reg(pi->sh->sih,
+                                  offsetof(struct chipcregs, gpioout),
+                                  0x40, 0x40);
+                        ai_cc_reg(pi->sh->sih,
+                                  offsetof(struct chipcregs, gpioouten),
+                                  0x40, 0x40);
                 } else {
                         mod_phy_reg(pi, 0x44c, (0x1 << 2), (0) << 2);
 
                         mod_phy_reg(pi, 0x44d, (0x1 << 2), (0) << 2);
 
-                        ai_corereg(pi->sh->sih, SI_CC_IDX,
-                                   offsetof(struct chipcregs, gpioout), 0x40,
-                                   0x00);
-                        ai_corereg(pi->sh->sih, SI_CC_IDX,
-                                   offsetof(struct chipcregs, gpioouten), 0x40,
-                                   0x0);
-                        ai_corereg(pi->sh->sih, SI_CC_IDX,
-                                   offsetof(struct chipcregs, gpiocontrol),
-                                   ~0x0, 0x40);
+                        ai_cc_reg(pi->sh->sih,
+                                  offsetof(struct chipcregs, gpioout),
+                                  0x40, 0x00);
+                        ai_cc_reg(pi->sh->sih,
+                                  offsetof(struct chipcregs, gpioouten),
+                                  0x40, 0x0);
+                        ai_cc_reg(pi->sh->sih,
+                                  offsetof(struct chipcregs, gpiocontrol),
+                                  ~0x0, 0x40);
                 }
         }
 }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h
index 96e15163222b..e34a71e7d242 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h
@@ -166,7 +166,6 @@ struct shared_phy_params {
         struct phy_shim_info *physhim;
         uint unit;
         uint corerev;
-        uint buscorerev;
         u16 vid;
         u16 did;
         uint chip;
@@ -175,7 +174,6 @@ struct shared_phy_params {
         uint sromrev;
         uint boardtype;
         uint boardrev;
-        uint boardvendor;
         u32 boardflags;
         u32 boardflags2;
 };
@@ -183,7 +181,7 @@ struct shared_phy_params {
 
 extern struct shared_phy *wlc_phy_shared_attach(struct shared_phy_params *shp);
 extern struct brcms_phy_pub *wlc_phy_attach(struct shared_phy *sh,
-                                            struct d11regs __iomem *regs,
+                                            struct bcma_device *d11core,
                                             int bandtype, struct wiphy *wiphy);
 extern void wlc_phy_detach(struct brcms_phy_pub *ppi);
 
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
index 5f9478b1c993..af00e2c2b266 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
@@ -503,10 +503,8 @@ struct shared_phy {
         uint sromrev;
         uint boardtype;
         uint boardrev;
-        uint boardvendor;
         u32 boardflags;
         u32 boardflags2;
-        uint buscorerev;
         uint fast_timer;
         uint slow_timer;
         uint glacial_timer;
@@ -559,7 +557,7 @@ struct brcms_phy {
         } u;
         bool user_txpwr_at_rfport;
 
-        struct d11regs __iomem *regs;
+        struct bcma_device *d11core;
         struct brcms_phy *next;
         struct brcms_phy_pub pubpi;
 
@@ -1090,7 +1088,7 @@ extern void wlc_phy_table_write_nphy(struct brcms_phy *pi, u32, u32, u32,
 
 #define BRCMS_PHY_WAR_PR51571(pi) \
         if (NREV_LT((pi)->pubpi.phy_rev, 3)) \
-                (void)R_REG(&(pi)->regs->maccontrol)
+                (void)bcma_read32(pi->d11core, D11REGOFFS(maccontrol))
 
 extern void wlc_phy_cal_perical_nphy_run(struct brcms_phy *pi, u8 caltype);
 extern void wlc_phy_aci_reset_nphy(struct brcms_phy *pi);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
index a63aa99d9810..efa0142bdad5 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
@@ -2813,10 +2813,8 @@ static void wlc_lcnphy_idle_tssi_est(struct brcms_phy_pub *ppi)
         u16 SAVE_jtag_auxpga = read_radio_reg(pi, RADIO_2064_REG0FF) & 0x10;
         u16 SAVE_iqadc_aux_en = read_radio_reg(pi, RADIO_2064_REG11F) & 4;
         idleTssi = read_phy_reg(pi, 0x4ab);
-        suspend =
-                (0 ==
-                 (R_REG(&((struct brcms_phy *) pi)->regs->maccontrol) &
-                  MCTL_EN_MAC));
+        suspend = (0 == (bcma_read32(pi->d11core, D11REGOFFS(maccontrol)) &
+                         MCTL_EN_MAC));
         if (!suspend)
                 wlapi_suspend_mac_and_wait(pi->sh->physhim);
         wlc_lcnphy_set_tx_pwr_ctrl(pi, LCNPHY_TX_PWR_CTRL_OFF);
@@ -2890,7 +2888,8 @@ static void wlc_lcnphy_vbat_temp_sense_setup(struct brcms_phy *pi, u8 mode)
 
         for (i = 0; i < 14; i++)
                 values_to_save[i] = read_phy_reg(pi, tempsense_phy_regs[i]);
-        suspend = (0 == (R_REG(&pi->regs->maccontrol) & MCTL_EN_MAC));
+        suspend = (0 == (bcma_read32(pi->d11core, D11REGOFFS(maccontrol)) &
+                         MCTL_EN_MAC));
         if (!suspend)
                 wlapi_suspend_mac_and_wait(pi->sh->physhim);
         save_txpwrCtrlEn = read_radio_reg(pi, 0x4a4);
@@ -3016,8 +3015,8 @@ static void wlc_lcnphy_tx_pwr_ctrl_init(struct brcms_phy_pub *ppi)
         bool suspend;
         struct brcms_phy *pi = (struct brcms_phy *) ppi;
 
-        suspend =
-                (0 == (R_REG(&pi->regs->maccontrol) & MCTL_EN_MAC));
+        suspend = (0 == (bcma_read32(pi->d11core, D11REGOFFS(maccontrol)) &
+                         MCTL_EN_MAC));
         if (!suspend)
                 wlapi_suspend_mac_and_wait(pi->sh->physhim);
 
@@ -3535,15 +3534,17 @@ wlc_lcnphy_samp_cap(struct brcms_phy *pi, int clip_detect_algo, u16 thresh,
         timer = 0;
         old_sslpnCalibClkEnCtrl = read_phy_reg(pi, 0x6da);
 
-        curval1 = R_REG(&pi->regs->psm_corectlsts);
+        curval1 = bcma_read16(pi->d11core, D11REGOFFS(psm_corectlsts));
         ptr[130] = 0;
-        W_REG(&pi->regs->psm_corectlsts, ((1 << 6) | curval1));
+        bcma_write16(pi->d11core, D11REGOFFS(psm_corectlsts),
+                     ((1 << 6) | curval1));
 
-        W_REG(&pi->regs->smpl_clct_strptr, 0x7E00);
-        W_REG(&pi->regs->smpl_clct_stpptr, 0x8000);
+        bcma_write16(pi->d11core, D11REGOFFS(smpl_clct_strptr), 0x7E00);
+        bcma_write16(pi->d11core, D11REGOFFS(smpl_clct_stpptr), 0x8000);
         udelay(20);
-        curval2 = R_REG(&pi->regs->psm_phy_hdr_param);
-        W_REG(&pi->regs->psm_phy_hdr_param, curval2 | 0x30);
+        curval2 = bcma_read16(pi->d11core, D11REGOFFS(psm_phy_hdr_param));
+        bcma_write16(pi->d11core, D11REGOFFS(psm_phy_hdr_param),
+                     curval2 | 0x30);
 
         write_phy_reg(pi, 0x555, 0x0);
         write_phy_reg(pi, 0x5a6, 0x5);
@@ -3560,19 +3561,19 @@ wlc_lcnphy_samp_cap(struct brcms_phy *pi, int clip_detect_algo, u16 thresh,
 
         sslpnCalibClkEnCtrl = read_phy_reg(pi, 0x6da);
         write_phy_reg(pi, 0x6da, (u32) (sslpnCalibClkEnCtrl | 0x2008));
-        stpptr = R_REG(&pi->regs->smpl_clct_stpptr);
-        curptr = R_REG(&pi->regs->smpl_clct_curptr);
+        stpptr = bcma_read16(pi->d11core, D11REGOFFS(smpl_clct_stpptr));
+        curptr = bcma_read16(pi->d11core, D11REGOFFS(smpl_clct_curptr));
         do {
                 udelay(10);
-                curptr = R_REG(&pi->regs->smpl_clct_curptr);
+                curptr = bcma_read16(pi->d11core, D11REGOFFS(smpl_clct_curptr));
                 timer++;
         } while ((curptr != stpptr) && (timer < 500));
 
-        W_REG(&pi->regs->psm_phy_hdr_param, 0x2);
+        bcma_write16(pi->d11core, D11REGOFFS(psm_phy_hdr_param), 0x2);
         strptr = 0x7E00;
-        W_REG(&pi->regs->tplatewrptr, strptr);
+        bcma_write32(pi->d11core, D11REGOFFS(tplatewrptr), strptr);
         while (strptr < 0x8000) {
-                val = R_REG(&pi->regs->tplatewrdata);
+                val = bcma_read32(pi->d11core, D11REGOFFS(tplatewrdata));
                 imag = ((val >> 16) & 0x3ff);
                 real = ((val) & 0x3ff);
                 if (imag > 511)
@@ -3597,8 +3598,8 @@ wlc_lcnphy_samp_cap(struct brcms_phy *pi, int clip_detect_algo, u16 thresh,
         }
 
         write_phy_reg(pi, 0x6da, old_sslpnCalibClkEnCtrl);
-        W_REG(&pi->regs->psm_phy_hdr_param, curval2);
-        W_REG(&pi->regs->psm_corectlsts, curval1);
+        bcma_write16(pi->d11core, D11REGOFFS(psm_phy_hdr_param), curval2);
+        bcma_write16(pi->d11core, D11REGOFFS(psm_corectlsts), curval1);
 }
 
 static void
@@ -3968,9 +3969,9 @@ s16 wlc_lcnphy_tempsense_new(struct brcms_phy *pi, bool mode)
         bool suspend = 0;
 
         if (mode == 1) {
-                suspend =
-                        (0 ==
-                         (R_REG(&pi->regs->maccontrol) & MCTL_EN_MAC));
+                suspend = (0 == (bcma_read32(pi->d11core,
+                                             D11REGOFFS(maccontrol)) &
+                                 MCTL_EN_MAC));
                 if (!suspend)
                         wlapi_suspend_mac_and_wait(pi->sh->physhim);
                 wlc_lcnphy_vbat_temp_sense_setup(pi, TEMPSENSE);
@@ -4012,9 +4013,9 @@ u16 wlc_lcnphy_tempsense(struct brcms_phy *pi, bool mode)
         struct brcms_phy_lcnphy *pi_lcn = pi->u.pi_lcnphy;
 
         if (mode == 1) {
-                suspend =
-                        (0 ==
-                         (R_REG(&pi->regs->maccontrol) & MCTL_EN_MAC));
+                suspend = (0 == (bcma_read32(pi->d11core,
+                                             D11REGOFFS(maccontrol)) &
+                                 MCTL_EN_MAC));
                 if (!suspend)
                         wlapi_suspend_mac_and_wait(pi->sh->physhim);
                 wlc_lcnphy_vbat_temp_sense_setup(pi, TEMPSENSE);
@@ -4078,9 +4079,9 @@ s8 wlc_lcnphy_vbatsense(struct brcms_phy *pi, bool mode)
         bool suspend = 0;
 
         if (mode == 1) {
-                suspend =
-                        (0 ==
-                         (R_REG(&pi->regs->maccontrol) & MCTL_EN_MAC));
+                suspend = (0 == (bcma_read32(pi->d11core,
+                                             D11REGOFFS(maccontrol)) &
+                                 MCTL_EN_MAC));
                 if (!suspend)
                         wlapi_suspend_mac_and_wait(pi->sh->physhim);
                 wlc_lcnphy_vbat_temp_sense_setup(pi, VBATSENSE);
@@ -4127,8 +4128,8 @@ static void wlc_lcnphy_glacial_timer_based_cal(struct brcms_phy *pi)
         s8 index;
         u16 SAVE_pwrctrl = wlc_lcnphy_get_tx_pwr_ctrl(pi);
         struct brcms_phy_lcnphy *pi_lcn = pi->u.pi_lcnphy;
-        suspend =
-                (0 == (R_REG(&pi->regs->maccontrol) & MCTL_EN_MAC));
+        suspend = (0 == (bcma_read32(pi->d11core, D11REGOFFS(maccontrol)) &
+                         MCTL_EN_MAC));
         if (!suspend)
                 wlapi_suspend_mac_and_wait(pi->sh->physhim);
         wlc_lcnphy_deaf_mode(pi, true);
@@ -4166,8 +4167,8 @@ static void wlc_lcnphy_periodic_cal(struct brcms_phy *pi)
         pi_lcn->lcnphy_full_cal_channel = CHSPEC_CHANNEL(pi->radio_chanspec);
         index = pi_lcn->lcnphy_current_index;
 
-        suspend =
-                (0 == (R_REG(&pi->regs->maccontrol) & MCTL_EN_MAC));
+        suspend = (0 == (bcma_read32(pi->d11core, D11REGOFFS(maccontrol)) &
+                         MCTL_EN_MAC));
         if (!suspend) {
                 wlapi_bmac_write_shm(pi->sh->physhim, M_CTS_DURATION, 10000);
                 wlapi_suspend_mac_and_wait(pi->sh->physhim);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
index ec9b56639d54..a16f1ab292fd 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
@@ -17802,7 +17802,7 @@ static void wlc_phy_txpwrctrl_pwr_setup_nphy(struct brcms_phy *pi)
 
         if (D11REV_IS(pi->sh->corerev, 11) || D11REV_IS(pi->sh->corerev, 12)) {
                 wlapi_bmac_mctrl(pi->sh->physhim, MCTL_PHYLOCK, MCTL_PHYLOCK);
-                (void)R_REG(&pi->regs->maccontrol);
+                (void)bcma_read32(pi->d11core, D11REGOFFS(maccontrol));
                 udelay(1);
         }
 
@@ -17953,7 +17953,7 @@ static void wlc_phy_txpwrctrl_pwr_setup_nphy(struct brcms_phy *pi)
 
         if (D11REV_IS(pi->sh->corerev, 11) || D11REV_IS(pi->sh->corerev, 12)) {
                 wlapi_bmac_mctrl(pi->sh->physhim, MCTL_PHYLOCK, MCTL_PHYLOCK);
-                (void)R_REG(&pi->regs->maccontrol);
+                (void)bcma_read32(pi->d11core, D11REGOFFS(maccontrol));
                 udelay(1);
         }
 
@@ -19447,8 +19447,6 @@ void wlc_phy_init_nphy(struct brcms_phy *pi)
         u8 tx_pwr_ctrl_state;
         bool do_nphy_cal = false;
         uint core;
-        uint origidx, intr_val;
-        struct d11regs __iomem *regs;
         u32 d11_clk_ctl_st;
         bool do_rssi_cal = false;
 
@@ -19462,25 +19460,21 @@ void wlc_phy_init_nphy(struct brcms_phy *pi)
              (pi->sh->chippkg == BCM4718_PKG_ID))) {
                 if ((pi->sh->boardflags & BFL_EXTLNA) &&
                     (CHSPEC_IS2G(pi->radio_chanspec)))
-                        ai_corereg(pi->sh->sih, SI_CC_IDX,
-                                   offsetof(struct chipcregs, chipcontrol),
-                                   0x40, 0x40);
+                        ai_cc_reg(pi->sh->sih,
+                                  offsetof(struct chipcregs, chipcontrol),
+                                  0x40, 0x40);
         }
 
         if ((pi->nphy_gband_spurwar2_en) && CHSPEC_IS2G(pi->radio_chanspec) &&
             CHSPEC_IS40(pi->radio_chanspec)) {
 
-                regs = (struct d11regs __iomem *)
-                                ai_switch_core(pi->sh->sih,
-                                               D11_CORE_ID, &origidx,
-                                               &intr_val);
-                d11_clk_ctl_st = R_REG(&regs->clk_ctl_st);
-                AND_REG(&regs->clk_ctl_st,
-                        ~(CCS_FORCEHT | CCS_HTAREQ));
+                d11_clk_ctl_st = bcma_read32(pi->d11core,
+                                             D11REGOFFS(clk_ctl_st));
+                bcma_mask32(pi->d11core, D11REGOFFS(clk_ctl_st),
+                            ~(CCS_FORCEHT | CCS_HTAREQ));
 
-                W_REG(&regs->clk_ctl_st, d11_clk_ctl_st);
-
-                ai_restore_core(pi->sh->sih, origidx, intr_val);
+                bcma_write32(pi->d11core, D11REGOFFS(clk_ctl_st),
+                             d11_clk_ctl_st);
         }
 
         pi->use_int_tx_iqlo_cal_nphy =
@@ -19885,7 +19879,8 @@ void wlc_phy_rxcore_setstate_nphy(struct brcms_phy_pub *pih, u8 rxcore_bitmask)
         if (!pi->sh->clk)
                 return;
 
-        suspend = (0 == (R_REG(&pi->regs->maccontrol) & MCTL_EN_MAC));
+        suspend = (0 == (bcma_read32(pi->d11core, D11REGOFFS(maccontrol)) &
+                         MCTL_EN_MAC));
         if (!suspend)
                 wlapi_suspend_mac_and_wait(pi->sh->physhim);
 
@@ -21263,28 +21258,28 @@ wlc_phy_chanspec_nphy_setup(struct brcms_phy *pi, u16 chanspec,
         val = read_phy_reg(pi, 0x09) & NPHY_BandControl_currentBand;
         if (CHSPEC_IS5G(chanspec) && !val) {
 
-                val = R_REG(&pi->regs->psm_phy_hdr_param);
-                W_REG(&pi->regs->psm_phy_hdr_param,
+                val = bcma_read16(pi->d11core, D11REGOFFS(psm_phy_hdr_param));
+                bcma_write16(pi->d11core, D11REGOFFS(psm_phy_hdr_param),
                       (val | MAC_PHY_FORCE_CLK));
 
                 or_phy_reg(pi, (NPHY_TO_BPHY_OFF + BPHY_BB_CONFIG),
                            (BBCFG_RESETCCA | BBCFG_RESETRX));
 
-                W_REG(&pi->regs->psm_phy_hdr_param, val);
+                bcma_write16(pi->d11core, D11REGOFFS(psm_phy_hdr_param), val);
 
                 or_phy_reg(pi, 0x09, NPHY_BandControl_currentBand);
         } else if (!CHSPEC_IS5G(chanspec) && val) {
 
                 and_phy_reg(pi, 0x09, ~NPHY_BandControl_currentBand);
 
-                val = R_REG(&pi->regs->psm_phy_hdr_param);
-                W_REG(&pi->regs->psm_phy_hdr_param,
+                val = bcma_read16(pi->d11core, D11REGOFFS(psm_phy_hdr_param));
+                bcma_write16(pi->d11core, D11REGOFFS(psm_phy_hdr_param),
                       (val | MAC_PHY_FORCE_CLK));
 
                 and_phy_reg(pi, (NPHY_TO_BPHY_OFF + BPHY_BB_CONFIG),
                             (u16) (~(BBCFG_RESETCCA | BBCFG_RESETRX)));
 
-                W_REG(&pi->regs->psm_phy_hdr_param, val);
+                bcma_write16(pi->d11core, D11REGOFFS(psm_phy_hdr_param), val);
         }
 
         write_phy_reg(pi, 0x1ce, ci->PHY_BW1a);
@@ -21342,24 +21337,23 @@ wlc_phy_chanspec_nphy_setup(struct brcms_phy *pi, u16 chanspec,
                         spuravoid = 1;
 
                 wlapi_bmac_core_phypll_ctl(pi->sh->physhim, false);
-                si_pmu_spuravoid(pi->sh->sih, spuravoid);
+                si_pmu_spuravoid_pllupdate(pi->sh->sih, spuravoid);
                 wlapi_bmac_core_phypll_ctl(pi->sh->physhim, true);
 
                 if ((pi->sh->chip == BCM43224_CHIP_ID) ||
                     (pi->sh->chip == BCM43225_CHIP_ID)) {
-
                         if (spuravoid == 1) {
-
-                                W_REG(&pi->regs->tsf_clk_frac_l,
-                                      0x5341);
-                                W_REG(&pi->regs->tsf_clk_frac_h,
-                                      0x8);
+                                bcma_write16(pi->d11core,
+                                             D11REGOFFS(tsf_clk_frac_l),
+                                             0x5341);
+                                bcma_write16(pi->d11core,
+                                             D11REGOFFS(tsf_clk_frac_h), 0x8);
                         } else {
-
-                                W_REG(&pi->regs->tsf_clk_frac_l,
-                                      0x8889);
-                                W_REG(&pi->regs->tsf_clk_frac_h,
-                                      0x8);
+                                bcma_write16(pi->d11core,
+                                             D11REGOFFS(tsf_clk_frac_l),
+                                             0x8889);
+                                bcma_write16(pi->d11core,
+                                             D11REGOFFS(tsf_clk_frac_h), 0x8);
                         }
                 }
 
@@ -21499,13 +21493,13 @@ void wlc_phy_antsel_init(struct brcms_phy_pub *ppi, bool lut_init)
 
                 ai_gpiocontrol(pi->sh->sih, mask, mask, GPIO_DRV_PRIORITY);
 
-                mc = R_REG(&pi->regs->maccontrol);
+                mc = bcma_read32(pi->d11core, D11REGOFFS(maccontrol));
                 mc &= ~MCTL_GPOUT_SEL_MASK;
-                W_REG(&pi->regs->maccontrol, mc);
+                bcma_write32(pi->d11core, D11REGOFFS(maccontrol), mc);
 
-                OR_REG(&pi->regs->psm_gpio_oe, mask);
+                bcma_set16(pi->d11core, D11REGOFFS(psm_gpio_oe), mask);
 
-                AND_REG(&pi->regs->psm_gpio_out, ~mask);
+                bcma_mask16(pi->d11core, D11REGOFFS(psm_gpio_out), ~mask);
 
                 if (lut_init) {
                         write_phy_reg(pi, 0xf8, 0x02d8);
@@ -21522,9 +21516,8 @@ u16 wlc_phy_classifier_nphy(struct brcms_phy *pi, u16 mask, u16 val)
         bool suspended = false;
 
         if (D11REV_IS(pi->sh->corerev, 16)) {
-                suspended =
-                        (R_REG(&pi->regs->maccontrol) & MCTL_EN_MAC) ?
-                        false : true;
+                suspended = (bcma_read32(pi->d11core, D11REGOFFS(maccontrol)) &
+                             MCTL_EN_MAC) ? false : true;
                 if (!suspended)
                         wlapi_suspend_mac_and_wait(pi->sh->physhim);
         }
@@ -25383,7 +25376,8 @@ static void wlc_phy_a4(struct brcms_phy *pi, bool full_cal)
         if (pi->nphy_papd_skip == 1)
                 return;
 
-        phy_b3 = (0 == (R_REG(&pi->regs->maccontrol) & MCTL_EN_MAC));
+        phy_b3 = (0 == (bcma_read32(pi->d11core, D11REGOFFS(maccontrol)) &
+                        MCTL_EN_MAC));
         if (!phy_b3)
                 wlapi_suspend_mac_and_wait(pi->sh->physhim);
 
@@ -28357,7 +28351,7 @@ void wlc_phy_txpower_recalc_target_nphy(struct brcms_phy *pi)
 
         if (D11REV_IS(pi->sh->corerev, 11) || D11REV_IS(pi->sh->corerev, 12)) {
                 wlapi_bmac_mctrl(pi->sh->physhim, MCTL_PHYLOCK, MCTL_PHYLOCK);
-                (void)R_REG(&pi->regs->maccontrol);
+                (void)bcma_read32(pi->d11core, D11REGOFFS(maccontrol));
                 udelay(1);
         }
 
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/pmu.c b/drivers/net/wireless/brcm80211/brcmsmac/pmu.c
index 12ba575f5785..4931d29d077b 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/pmu.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/pmu.c
@@ -115,10 +115,10 @@ static void si_pmu_res_masks(struct si_pub *sih, u32 * pmin, u32 * pmax)
         uint rsrcs;
 
         /* # resources */
-        rsrcs = (sih->pmucaps & PCAP_RC_MASK) >> PCAP_RC_SHIFT;
+        rsrcs = (ai_get_pmucaps(sih) & PCAP_RC_MASK) >> PCAP_RC_SHIFT;
 
         /* determine min/max rsrc masks */
-        switch (sih->chip) {
+        switch (ai_get_chip_id(sih)) {
         case BCM43224_CHIP_ID:
         case BCM43225_CHIP_ID:
                 /* ??? */
@@ -139,75 +139,84 @@ static void si_pmu_res_masks(struct si_pub *sih, u32 * pmin, u32 * pmax)
         *pmax = max_mask;
 }
 
-static void
-si_pmu_spuravoid_pllupdate(struct si_pub *sih, struct chipcregs __iomem *cc,
-                           u8 spuravoid)
+void si_pmu_spuravoid_pllupdate(struct si_pub *sih, u8 spuravoid)
 {
         u32 tmp = 0;
+        struct bcma_device *core;
 
-        switch (sih->chip) {
+        /* switch to chipc */
+        core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
+
+        switch (ai_get_chip_id(sih)) {
         case BCM43224_CHIP_ID:
         case BCM43225_CHIP_ID:
                 if (spuravoid == 1) {
-                        W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL0);
-                        W_REG(&cc->pllcontrol_data, 0x11500010);
-                        W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL1);
-                        W_REG(&cc->pllcontrol_data, 0x000C0C06);
-                        W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL2);
-                        W_REG(&cc->pllcontrol_data, 0x0F600a08);
-                        W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL3);
-                        W_REG(&cc->pllcontrol_data, 0x00000000);
-                        W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL4);
-                        W_REG(&cc->pllcontrol_data, 0x2001E920);
-                        W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL5);
-                        W_REG(&cc->pllcontrol_data, 0x88888815);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
+                                     PMU1_PLL0_PLLCTL0);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
+                                     0x11500010);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
+                                     PMU1_PLL0_PLLCTL1);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
+                                     0x000C0C06);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
+                                     PMU1_PLL0_PLLCTL2);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
+                                     0x0F600a08);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
+                                     PMU1_PLL0_PLLCTL3);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
+                                     0x00000000);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
+                                     PMU1_PLL0_PLLCTL4);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
+                                     0x2001E920);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
+                                     PMU1_PLL0_PLLCTL5);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
+                                     0x88888815);
                 } else {
-                        W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL0);
-                        W_REG(&cc->pllcontrol_data, 0x11100010);
-                        W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL1);
-                        W_REG(&cc->pllcontrol_data, 0x000c0c06);
-                        W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL2);
-                        W_REG(&cc->pllcontrol_data, 0x03000a08);
-                        W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL3);
-                        W_REG(&cc->pllcontrol_data, 0x00000000);
-                        W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL4);
-                        W_REG(&cc->pllcontrol_data, 0x200005c0);
-                        W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL5);
-                        W_REG(&cc->pllcontrol_data, 0x88888815);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
+                                     PMU1_PLL0_PLLCTL0);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
+                                     0x11100010);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
+                                     PMU1_PLL0_PLLCTL1);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
+                                     0x000c0c06);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
+                                     PMU1_PLL0_PLLCTL2);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
+                                     0x03000a08);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
+                                     PMU1_PLL0_PLLCTL3);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
+                                     0x00000000);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
+                                     PMU1_PLL0_PLLCTL4);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
+                                     0x200005c0);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
+                                     PMU1_PLL0_PLLCTL5);
+                        bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
+                                     0x88888815);
                 }
                 tmp = 1 << 10;
                 break;
 
-                W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL0);
-                W_REG(&cc->pllcontrol_data, 0x11100008);
-                W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL1);
-                W_REG(&cc->pllcontrol_data, 0x0c000c06);
-                W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL2);
-                W_REG(&cc->pllcontrol_data, 0x03000a08);
-                W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL3);
-                W_REG(&cc->pllcontrol_data, 0x00000000);
-                W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL4);
-                W_REG(&cc->pllcontrol_data, 0x200005c0);
-                W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL5);
-                W_REG(&cc->pllcontrol_data, 0x88888855);
-
-                tmp = 1 << 10;
-                break;
-
         default:
                 /* bail out */
                 return;
         }
 
-        tmp |= R_REG(&cc->pmucontrol);
-        W_REG(&cc->pmucontrol, tmp);
+        bcma_set32(core, CHIPCREGOFFS(pmucontrol), tmp);
 }
 
 u16 si_pmu_fast_pwrup_delay(struct si_pub *sih)
 {
         uint delay = PMU_MAX_TRANSITION_DLY;
 
-        switch (sih->chip) {
+        switch (ai_get_chip_id(sih)) {
         case BCM43224_CHIP_ID:
         case BCM43225_CHIP_ID:
         case BCM4313_CHIP_ID:
@@ -220,54 +229,35 @@ u16 si_pmu_fast_pwrup_delay(struct si_pub *sih)
         return (u16) delay;
 }
 
-void si_pmu_sprom_enable(struct si_pub *sih, bool enable)
-{
-        struct chipcregs __iomem *cc;
-        uint origidx;
-
-        /* Remember original core before switch to chipc */
-        origidx = ai_coreidx(sih);
-        cc = ai_setcoreidx(sih, SI_CC_IDX);
-
-        /* Return to original core */
-        ai_setcoreidx(sih, origidx);
-}
-
 /* Read/write a chipcontrol reg */
 u32 si_pmu_chipcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val)
 {
-        ai_corereg(sih, SI_CC_IDX, offsetof(struct chipcregs, chipcontrol_addr),
-                   ~0, reg);
-        return ai_corereg(sih, SI_CC_IDX,
-                          offsetof(struct chipcregs, chipcontrol_data), mask,
-                          val);
+        ai_cc_reg(sih, offsetof(struct chipcregs, chipcontrol_addr), ~0, reg);
+        return ai_cc_reg(sih, offsetof(struct chipcregs, chipcontrol_data),
+                         mask, val);
 }
 
 /* Read/write a regcontrol reg */
 u32 si_pmu_regcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val)
 {
-        ai_corereg(sih, SI_CC_IDX, offsetof(struct chipcregs, regcontrol_addr),
-                   ~0, reg);
-        return ai_corereg(sih, SI_CC_IDX,
-                          offsetof(struct chipcregs, regcontrol_data), mask,
-                          val);
+        ai_cc_reg(sih, offsetof(struct chipcregs, regcontrol_addr), ~0, reg);
+        return ai_cc_reg(sih, offsetof(struct chipcregs, regcontrol_data),
+                         mask, val);
 }
 
 /* Read/write a pllcontrol reg */
 u32 si_pmu_pllcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val)
 {
-        ai_corereg(sih, SI_CC_IDX, offsetof(struct chipcregs, pllcontrol_addr),
-                   ~0, reg);
-        return ai_corereg(sih, SI_CC_IDX,
-                          offsetof(struct chipcregs, pllcontrol_data), mask,
-                          val);
+        ai_cc_reg(sih, offsetof(struct chipcregs, pllcontrol_addr), ~0, reg);
+        return ai_cc_reg(sih, offsetof(struct chipcregs, pllcontrol_data),
+                         mask, val);
 }
 
 /* PMU PLL update */
 void si_pmu_pllupd(struct si_pub *sih)
 {
-        ai_corereg(sih, SI_CC_IDX, offsetof(struct chipcregs, pmucontrol),
-                   PCTL_PLL_PLLCTL_UPD, PCTL_PLL_PLLCTL_UPD);
+        ai_cc_reg(sih, offsetof(struct chipcregs, pmucontrol),
+                  PCTL_PLL_PLLCTL_UPD, PCTL_PLL_PLLCTL_UPD);
 }
 
 /* query alp/xtal clock frequency */
@@ -276,10 +266,10 @@ u32 si_pmu_alp_clock(struct si_pub *sih)
         u32 clock = ALP_CLOCK;
 
         /* bail out with default */
-        if (!(sih->cccaps & CC_CAP_PMU))
+        if (!(ai_get_cccaps(sih) & CC_CAP_PMU))
                 return clock;
 
-        switch (sih->chip) {
+        switch (ai_get_chip_id(sih)) {
         case BCM43224_CHIP_ID:
         case BCM43225_CHIP_ID:
         case BCM4313_CHIP_ID:
@@ -293,95 +283,29 @@ u32 si_pmu_alp_clock(struct si_pub *sih)
         return clock;
 }
 
-void si_pmu_spuravoid(struct si_pub *sih, u8 spuravoid)
-{
-        struct chipcregs __iomem *cc;
-        uint origidx, intr_val;
-
-        /* Remember original core before switch to chipc */
-        cc = (struct chipcregs __iomem *)
-                        ai_switch_core(sih, CC_CORE_ID, &origidx, &intr_val);
-
-        /* update the pll changes */
-        si_pmu_spuravoid_pllupdate(sih, cc, spuravoid);
-
-        /* Return to original core */
-        ai_restore_core(sih, origidx, intr_val);
-}
-
 /* initialize PMU */
 void si_pmu_init(struct si_pub *sih)
 {
-        struct chipcregs __iomem *cc;
-        uint origidx;
+        struct bcma_device *core;
 
-        /* Remember original core before switch to chipc */
-        origidx = ai_coreidx(sih);
-        cc = ai_setcoreidx(sih, SI_CC_IDX);
-
-        if (sih->pmurev == 1)
-                AND_REG(&cc->pmucontrol, ~PCTL_NOILP_ON_WAIT);
-        else if (sih->pmurev >= 2)
-                OR_REG(&cc->pmucontrol, PCTL_NOILP_ON_WAIT);
+        /* select chipc */
+        core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
 
-        /* Return to original core */
-        ai_setcoreidx(sih, origidx);
-}
-
-/* initialize PMU chip controls and other chip level stuff */
-void si_pmu_chip_init(struct si_pub *sih)
-{
-        uint origidx;
-
-        /* Gate off SPROM clock and chip select signals */
-        si_pmu_sprom_enable(sih, false);
-
-        /* Remember original core */
-        origidx = ai_coreidx(sih);
-
-        /* Return to original core */
-        ai_setcoreidx(sih, origidx);
-}
-
-/* initialize PMU switch/regulators */
-void si_pmu_swreg_init(struct si_pub *sih)
-{
-}
-
-/* initialize PLL */
-void si_pmu_pll_init(struct si_pub *sih, uint xtalfreq)
-{
-        struct chipcregs __iomem *cc;
-        uint origidx;
-
-        /* Remember original core before switch to chipc */
-        origidx = ai_coreidx(sih);
-        cc = ai_setcoreidx(sih, SI_CC_IDX);
-
-        switch (sih->chip) {
-        case BCM4313_CHIP_ID:
-        case BCM43224_CHIP_ID:
-        case BCM43225_CHIP_ID:
-                /* ??? */
-                break;
-        default:
-                break;
-        }
-
-        /* Return to original core */
-        ai_setcoreidx(sih, origidx);
+        if (ai_get_pmurev(sih) == 1)
+                bcma_mask32(core, CHIPCREGOFFS(pmucontrol),
+                            ~PCTL_NOILP_ON_WAIT);
+        else if (ai_get_pmurev(sih) >= 2)
+                bcma_set32(core, CHIPCREGOFFS(pmucontrol), PCTL_NOILP_ON_WAIT);
 }
 
 /* initialize PMU resources */
 void si_pmu_res_init(struct si_pub *sih)
 {
-        struct chipcregs __iomem *cc;
-        uint origidx;
+        struct bcma_device *core;
         u32 min_mask = 0, max_mask = 0;
 
-        /* Remember original core before switch to chipc */
-        origidx = ai_coreidx(sih);
-        cc = ai_setcoreidx(sih, SI_CC_IDX);
+        /* select to chipc */
+        core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
 
         /* Determine min/max rsrc masks */
         si_pmu_res_masks(sih, &min_mask, &max_mask);
@@ -391,55 +315,50 @@ void si_pmu_res_init(struct si_pub *sih)
         /* Program max resource mask */
 
         if (max_mask)
-                W_REG(&cc->max_res_mask, max_mask);
+                bcma_write32(core, CHIPCREGOFFS(max_res_mask), max_mask);
 
         /* Program min resource mask */
 
         if (min_mask)
-                W_REG(&cc->min_res_mask, min_mask);
+                bcma_write32(core, CHIPCREGOFFS(min_res_mask), min_mask);
 
         /* Add some delay; allow resources to come up and settle. */
         mdelay(2);
-
-        /* Return to original core */
-        ai_setcoreidx(sih, origidx);
 }
 
 u32 si_pmu_measure_alpclk(struct si_pub *sih)
 {
-        struct chipcregs __iomem *cc;
-        uint origidx;
+        struct bcma_device *core;
         u32 alp_khz;
 
-        if (sih->pmurev < 10)
+        if (ai_get_pmurev(sih) < 10)
                 return 0;
 
         /* Remember original core before switch to chipc */
-        origidx = ai_coreidx(sih);
-        cc = ai_setcoreidx(sih, SI_CC_IDX);
+        core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
 
-        if (R_REG(&cc->pmustatus) & PST_EXTLPOAVAIL) {
+        if (bcma_read32(core, CHIPCREGOFFS(pmustatus)) & PST_EXTLPOAVAIL) {
                 u32 ilp_ctr, alp_hz;
 
                 /*
                  * Enable the reg to measure the freq,
                  * in case it was disabled before
                  */
-                W_REG(&cc->pmu_xtalfreq,
-                      1U << PMU_XTALFREQ_REG_MEASURE_SHIFT);
+                bcma_write32(core, CHIPCREGOFFS(pmu_xtalfreq),
+                            1U << PMU_XTALFREQ_REG_MEASURE_SHIFT);
 
                 /* Delay for well over 4 ILP clocks */
                 udelay(1000);
 
                 /* Read the latched number of ALP ticks per 4 ILP ticks */
-                ilp_ctr =
-                    R_REG(&cc->pmu_xtalfreq) & PMU_XTALFREQ_REG_ILPCTR_MASK;
+                ilp_ctr = bcma_read32(core, CHIPCREGOFFS(pmu_xtalfreq)) &
+                          PMU_XTALFREQ_REG_ILPCTR_MASK;
 
                 /*
                  * Turn off the PMU_XTALFREQ_REG_MEASURE_SHIFT
                  * bit to save power
                  */
-                W_REG(&cc->pmu_xtalfreq, 0);
+                bcma_write32(core, CHIPCREGOFFS(pmu_xtalfreq), 0);
 
                 /* Calculate ALP frequency */
                 alp_hz = (ilp_ctr * EXT_ILP_HZ) / 4;
@@ -452,8 +371,5 @@ u32 si_pmu_measure_alpclk(struct si_pub *sih)
         } else
                 alp_khz = 0;
 
-        /* Return to original core */
-        ai_setcoreidx(sih, origidx);
-
         return alp_khz;
 }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/pmu.h b/drivers/net/wireless/brcm80211/brcmsmac/pmu.h
index 3a08c620640e..3e39c5e0f9ff 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/pmu.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/pmu.h
@@ -26,13 +26,10 @@ extern u32 si_pmu_chipcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val);
 extern u32 si_pmu_regcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val);
 extern u32 si_pmu_alp_clock(struct si_pub *sih);
 extern void si_pmu_pllupd(struct si_pub *sih);
-extern void si_pmu_spuravoid(struct si_pub *sih, u8 spuravoid);
+extern void si_pmu_spuravoid_pllupdate(struct si_pub *sih, u8 spuravoid);
 extern u32 si_pmu_pllcontrol(struct si_pub *sih, uint reg, u32 mask, u32 val);
 extern void si_pmu_init(struct si_pub *sih);
-extern void si_pmu_chip_init(struct si_pub *sih);
-extern void si_pmu_pll_init(struct si_pub *sih, u32 xtalfreq);
 extern void si_pmu_res_init(struct si_pub *sih);
-extern void si_pmu_swreg_init(struct si_pub *sih);
 extern u32 si_pmu_measure_alpclk(struct si_pub *sih);
 
 #endif /* _BRCM_PMU_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/pub.h b/drivers/net/wireless/brcm80211/brcmsmac/pub.h
index 21ccf3a03987..f0038ad7d7bf 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/pub.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/pub.h
@@ -17,6 +17,7 @@
 #ifndef _BRCM_PUB_H_
 #define _BRCM_PUB_H_
 
+#include <linux/bcma/bcma.h>
 #include <brcmu_wifi.h>
 #include "types.h"
 #include "defs.h"
@@ -530,9 +531,8 @@ struct brcms_antselcfg {
 
 /* common functions for every port */
 extern struct brcms_c_info *
-brcms_c_attach(struct brcms_info *wl, u16 vendor, u16 device, uint unit,
-               bool piomode, void __iomem *regsva, struct pci_dev *btparam,
-               uint *perr);
+brcms_c_attach(struct brcms_info *wl, struct bcma_device *core, uint unit,
+               bool piomode, uint *perr);
 extern uint brcms_c_detach(struct brcms_c_info *wlc);
 extern int brcms_c_up(struct brcms_c_info *wlc);
 extern uint brcms_c_down(struct brcms_c_info *wlc);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/srom.c b/drivers/net/wireless/brcm80211/brcmsmac/srom.c
index b6987ea9fc68..61092156755e 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/srom.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/srom.c
@@ -586,17 +586,6 @@ static const struct brcms_sromvar perpath_pci_sromvars[] = {
  * shared between devices. */
 static u8 brcms_srom_crc8_table[CRC8_TABLE_SIZE];
 
-static u8 __iomem *
-srom_window_address(struct si_pub *sih, u8 __iomem *curmap)
-{
-        if (sih->ccrev < 32)
-                return curmap + PCI_BAR0_SPROM_OFFSET;
-        if (sih->cccaps & CC_CAP_SROM)
-                return curmap + PCI_16KB0_CCREGS_OFFSET + CC_SROM_OTP;
-
-        return NULL;
-}
-
 static uint mask_shift(u16 mask)
 {
         uint i;
@@ -779,17 +768,27 @@ _initvars_srom_pci(u8 sromrev, u16 *srom, struct list_head *var_list)
  * Return 0 on success, nonzero on error.
  */
 static int
-sprom_read_pci(struct si_pub *sih, u8 __iomem *sprom, uint wordoff,
-               u16 *buf, uint nwords, bool check_crc)
+sprom_read_pci(struct si_pub *sih, u16 *buf, uint nwords, bool check_crc)
 {
         int err = 0;
         uint i;
         u8 *bbuf = (u8 *)buf; /* byte buffer */
         uint nbytes = nwords << 1;
+        struct bcma_device *core;
+        uint sprom_offset;
+
+        /* determine core to read */
+        if (ai_get_ccrev(sih) < 32) {
+                core = ai_findcore(sih, BCMA_CORE_80211, 0);
+                sprom_offset = PCI_BAR0_SPROM_OFFSET;
+        } else {
+                core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
+                sprom_offset = CHIPCREGOFFS(sromotp);
+        }
 
         /* read the sprom in bytes */
         for (i = 0; i < nbytes; i++)
-                bbuf[i] = readb(sprom+i);
+                bbuf[i] = bcma_read8(core, sprom_offset+i);
 
         if (buf[0] == 0xffff)
                 /*
@@ -851,10 +850,9 @@ static int otp_read_pci(struct si_pub *sih, u16 *buf, uint nwords)
  * Initialize nonvolatile variable table from sprom.
  * Return 0 on success, nonzero on error.
  */
-static int initvars_srom_pci(struct si_pub *sih, void __iomem *curmap)
+int srom_var_init(struct si_pub *sih)
 {
         u16 *srom;
-        u8 __iomem *sromwindow;
         u8 sromrev = 0;
         u32 sr;
         int err = 0;
@@ -866,12 +864,9 @@ static int initvars_srom_pci(struct si_pub *sih, void __iomem *curmap)
         if (!srom)
                 return -ENOMEM;
 
-        sromwindow = srom_window_address(sih, curmap);
-
         crc8_populate_lsb(brcms_srom_crc8_table, SROM_CRC8_POLY);
         if (ai_is_sprom_available(sih)) {
-                err = sprom_read_pci(sih, sromwindow, 0, srom,
-                                     SROM4_WORDS, true);
+                err = sprom_read_pci(sih, srom, SROM4_WORDS, true);
 
                 if (err == 0)
                         /* srom read and passed crc */
@@ -921,21 +916,6 @@ void srom_free_vars(struct si_pub *sih)
                 kfree(entry);
         }
 }
-/*
- * Initialize local vars from the right source for this platform.
- * Return 0 on success, nonzero on error.
- */
-int srom_var_init(struct si_pub *sih, void __iomem *curmap)
-{
-        uint len;
-
-        len = 0;
-
-        if (curmap != NULL)
-                return initvars_srom_pci(sih, curmap);
-
-        return -EINVAL;
-}
 
 /*
  * Search the name=value vars for a specific one and return its value.
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/srom.h b/drivers/net/wireless/brcm80211/brcmsmac/srom.h
index c81df9798e50..f2a58f262c99 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/srom.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/srom.h
@@ -20,7 +20,7 @@
 #include "types.h"
 
 /* Prototypes */
-extern int srom_var_init(struct si_pub *sih, void __iomem *curmap);
+extern int srom_var_init(struct si_pub *sih);
 extern void srom_free_vars(struct si_pub *sih);
 
 extern int srom_read(struct si_pub *sih, uint bus, void *curmap,
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/types.h b/drivers/net/wireless/brcm80211/brcmsmac/types.h
index 27a814b07462..e11ae83111e4 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/types.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/types.h
@@ -250,66 +250,18 @@ do {						\
                 wiphy_err(dev, "%s: " fmt, __func__, ##args);   \
 } while (0)
 
-/*
- * Register access macros.
- *
- * These macro's take a pointer to the address to read as one of their
- * arguments. The macro itself deduces the size of the IO transaction (u8, u16
- * or u32). Advantage of this approach in combination with using a struct to
- * define the registers in a register block, is that access size and access
- * location are defined in only one spot. This reduces the risk of the
- * programmer trying to use an unsupported transaction size on a register.
- *
- */
-
-#define R_REG(r) \
-        ({ \
-                __typeof(*(r)) __osl_v; \
-                switch (sizeof(*(r))) { \
-                case sizeof(u8): \
-                        __osl_v = readb((u8 __iomem *)(r)); \
-                        break; \
-                case sizeof(u16): \
-                        __osl_v = readw((u16 __iomem *)(r)); \
-                        break; \
-                case sizeof(u32): \
-                        __osl_v = readl((u32 __iomem *)(r)); \
-                        break; \
-                } \
-                __osl_v; \
-        })
-
-#define W_REG(r, v) do { \
-                switch (sizeof(*(r))) { \
-                case sizeof(u8):        \
-                        writeb((u8)((v) & 0xFF), (u8 __iomem *)(r)); \
-                        break; \
-                case sizeof(u16):       \
-                        writew((u16)((v) & 0xFFFF), (u16 __iomem *)(r)); \
-                        break; \
-                case sizeof(u32):       \
-                        writel((u32)(v), (u32 __iomem *)(r)); \
-                        break; \
-                } \
-        } while (0)
-
 #ifdef CONFIG_BCM47XX
 /*
  * bcm4716 (which includes 4717 & 4718), plus 4706 on PCIe can reorder
  * transactions. As a fix, a read after write is performed on certain places
  * in the code. Older chips and the newer 5357 family don't require this fix.
  */
-#define W_REG_FLUSH(r, v)       ({ W_REG((r), (v)); (void)R_REG(r); })
+#define bcma_wflush16(c, o, v) \
+        ({ bcma_write16(c, o, v); (void)bcma_read16(c, o); })
 #else
-#define W_REG_FLUSH(r, v)       W_REG((r), (v))
+#define bcma_wflush16(c, o, v)  bcma_write16(c, o, v)
 #endif                          /* CONFIG_BCM47XX */
 
-#define AND_REG(r, v)   W_REG((r), R_REG(r) & (v))
-#define OR_REG(r, v)    W_REG((r), R_REG(r) | (v))
-
-#define SET_REG(r, mask, val) \
-                W_REG((r), ((R_REG(r) & ~(mask)) | (val)))
-
 /* multi-bool data type: set of bools, mbool is true if any is set */
 
 /* set one bool */
diff --git a/drivers/net/wireless/brcm80211/include/chipcommon.h b/drivers/net/wireless/brcm80211/include/chipcommon.h
index fefabc39e646..f96834a7c055 100644
--- a/drivers/net/wireless/brcm80211/include/chipcommon.h
+++ b/drivers/net/wireless/brcm80211/include/chipcommon.h
@@ -19,6 +19,8 @@
 
 #include "defs.h"               /* for PAD macro */
 
+#define CHIPCREGOFFS(field)     offsetof(struct chipcregs, field)
+
 struct chipcregs {
         u32 chipid;             /* 0x0 */
         u32 capabilities;
diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c
index e0b3e8d406b3..df7050abe717 100644
--- a/drivers/net/wireless/hostap/hostap_80211_rx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_rx.c
@@ -1,5 +1,6 @@
 #include <linux/etherdevice.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <net/lib80211.h>
 #include <linux/if_arp.h>
 
diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c
index c34a3b7f1292..344a981a052e 100644
--- a/drivers/net/wireless/hostap/hostap_80211_tx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_tx.c
@@ -1,4 +1,5 @@
 #include <linux/slab.h>
+#include <linux/export.h>
 
 #include "hostap_80211.h"
 #include "hostap_common.h"
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index 3d05dc15c6b8..e1f410277242 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -21,6 +21,8 @@
 #include <linux/random.h>
 #include <linux/if_arp.h>
 #include <linux/slab.h>
+#include <linux/export.h>
+#include <linux/moduleparam.h>
 
 #include "hostap_wlan.h"
 #include "hostap.h"
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 5441ad195119..89e9d3a78c3c 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -656,6 +656,9 @@ static const struct pcmcia_device_id hostap_cs_ids[] = {
                 "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
                 0xe6ec52ce, 0x08649af2, 0x4b74baa0),
         PCMCIA_DEVICE_PROD_ID123(
+                "Canon", "Wireless LAN CF Card K30225", "Version 01.00",
+                0x96ef6fe2, 0x263fcbab, 0xa57adb8c),
+        PCMCIA_DEVICE_PROD_ID123(
                 "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",
                 0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
         PCMCIA_DEVICE_PROD_ID123(
diff --git a/drivers/net/wireless/hostap/hostap_info.c b/drivers/net/wireless/hostap/hostap_info.c
index d737091cf6ac..47932b28aac1 100644
--- a/drivers/net/wireless/hostap/hostap_info.c
+++ b/drivers/net/wireless/hostap/hostap_info.c
@@ -3,6 +3,7 @@
 #include <linux/if_arp.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "hostap_wlan.h"
 #include "hostap.h"
 #include "hostap_ap.h"
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index 46a8c291c08a..18054d9c6688 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -5,6 +5,7 @@
 #include <linux/sched.h>
 #include <linux/ethtool.h>
 #include <linux/if_arp.h>
+#include <linux/module.h>
 #include <net/lib80211.h>
 
 #include "hostap_wlan.h"
diff --git a/drivers/net/wireless/hostap/hostap_proc.c b/drivers/net/wireless/hostap/hostap_proc.c
index 005ff25a405f..75ef8f04aabe 100644
--- a/drivers/net/wireless/hostap/hostap_proc.c
+++ b/drivers/net/wireless/hostap/hostap_proc.c
@@ -2,6 +2,7 @@
 
 #include <linux/types.h>
 #include <linux/proc_fs.h>
+#include <linux/export.h>
 #include <net/lib80211.h>
 
 #include "hostap_wlan.h"
diff --git a/drivers/net/wireless/iwlegacy/3945-debug.c b/drivers/net/wireless/iwlegacy/3945-debug.c
new file mode 100644
index 000000000000..5e1a19fd354d
--- /dev/null
+++ b/drivers/net/wireless/iwlegacy/3945-debug.c
@@ -0,0 +1,505 @@
+/******************************************************************************
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2011 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:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *****************************************************************************/
+
+#include "common.h"
+#include "3945.h"
+
+static int
+il3945_stats_flag(struct il_priv *il, char *buf, int bufsz)
+{
+        int p = 0;
+
+        p += scnprintf(buf + p, bufsz - p, "Statistics Flag(0x%X):\n",
+                       le32_to_cpu(il->_3945.stats.flag));
+        if (le32_to_cpu(il->_3945.stats.flag) & UCODE_STATS_CLEAR_MSK)
+                p += scnprintf(buf + p, bufsz - p,
+                               "\tStatistics have been cleared\n");
+        p += scnprintf(buf + p, bufsz - p, "\tOperational Frequency: %s\n",
+                       (le32_to_cpu(il->_3945.stats.flag) &
+                        UCODE_STATS_FREQUENCY_MSK) ? "2.4 GHz" : "5.2 GHz");
+        p += scnprintf(buf + p, bufsz - p, "\tTGj Narrow Band: %s\n",
+                       (le32_to_cpu(il->_3945.stats.flag) &
+                        UCODE_STATS_NARROW_BAND_MSK) ? "enabled" : "disabled");
+        return p;
+}
+
+ssize_t
+il3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,
+                           size_t count, loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        int pos = 0;
+        char *buf;
+        int bufsz =
+            sizeof(struct iwl39_stats_rx_phy) * 40 +
+            sizeof(struct iwl39_stats_rx_non_phy) * 40 + 400;
+        ssize_t ret;
+        struct iwl39_stats_rx_phy *ofdm, *accum_ofdm, *delta_ofdm, *max_ofdm;
+        struct iwl39_stats_rx_phy *cck, *accum_cck, *delta_cck, *max_cck;
+        struct iwl39_stats_rx_non_phy *general, *accum_general;
+        struct iwl39_stats_rx_non_phy *delta_general, *max_general;
+
+        if (!il_is_alive(il))
+                return -EAGAIN;
+
+        buf = kzalloc(bufsz, GFP_KERNEL);
+        if (!buf) {
+                IL_ERR("Can not allocate Buffer\n");
+                return -ENOMEM;
+        }
+
+        /*
+         * The statistic information display here is based on
+         * the last stats notification from uCode
+         * might not reflect the current uCode activity
+         */
+        ofdm = &il->_3945.stats.rx.ofdm;
+        cck = &il->_3945.stats.rx.cck;
+        general = &il->_3945.stats.rx.general;
+        accum_ofdm = &il->_3945.accum_stats.rx.ofdm;
+        accum_cck = &il->_3945.accum_stats.rx.cck;
+        accum_general = &il->_3945.accum_stats.rx.general;
+        delta_ofdm = &il->_3945.delta_stats.rx.ofdm;
+        delta_cck = &il->_3945.delta_stats.rx.cck;
+        delta_general = &il->_3945.delta_stats.rx.general;
+        max_ofdm = &il->_3945.max_delta.rx.ofdm;
+        max_cck = &il->_3945.max_delta.rx.cck;
+        max_general = &il->_3945.max_delta.rx.general;
+
+        pos += il3945_stats_flag(il, buf, bufsz);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "%-32s     current"
+                      "acumulative       delta         max\n",
+                      "Statistics_Rx - OFDM:");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "ina_cnt:",
+                      le32_to_cpu(ofdm->ina_cnt), accum_ofdm->ina_cnt,
+                      delta_ofdm->ina_cnt, max_ofdm->ina_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "fina_cnt:",
+                      le32_to_cpu(ofdm->fina_cnt), accum_ofdm->fina_cnt,
+                      delta_ofdm->fina_cnt, max_ofdm->fina_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "plcp_err:",
+                      le32_to_cpu(ofdm->plcp_err), accum_ofdm->plcp_err,
+                      delta_ofdm->plcp_err, max_ofdm->plcp_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "crc32_err:",
+                      le32_to_cpu(ofdm->crc32_err), accum_ofdm->crc32_err,
+                      delta_ofdm->crc32_err, max_ofdm->crc32_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "overrun_err:",
+                      le32_to_cpu(ofdm->overrun_err), accum_ofdm->overrun_err,
+                      delta_ofdm->overrun_err, max_ofdm->overrun_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "early_overrun_err:",
+                      le32_to_cpu(ofdm->early_overrun_err),
+                      accum_ofdm->early_overrun_err,
+                      delta_ofdm->early_overrun_err,
+                      max_ofdm->early_overrun_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "crc32_good:",
+                      le32_to_cpu(ofdm->crc32_good), accum_ofdm->crc32_good,
+                      delta_ofdm->crc32_good, max_ofdm->crc32_good);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "false_alarm_cnt:",
+                      le32_to_cpu(ofdm->false_alarm_cnt),
+                      accum_ofdm->false_alarm_cnt, delta_ofdm->false_alarm_cnt,
+                      max_ofdm->false_alarm_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "fina_sync_err_cnt:",
+                      le32_to_cpu(ofdm->fina_sync_err_cnt),
+                      accum_ofdm->fina_sync_err_cnt,
+                      delta_ofdm->fina_sync_err_cnt,
+                      max_ofdm->fina_sync_err_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "sfd_timeout:",
+                      le32_to_cpu(ofdm->sfd_timeout), accum_ofdm->sfd_timeout,
+                      delta_ofdm->sfd_timeout, max_ofdm->sfd_timeout);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "fina_timeout:",
+                      le32_to_cpu(ofdm->fina_timeout), accum_ofdm->fina_timeout,
+                      delta_ofdm->fina_timeout, max_ofdm->fina_timeout);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "unresponded_rts:",
+                      le32_to_cpu(ofdm->unresponded_rts),
+                      accum_ofdm->unresponded_rts, delta_ofdm->unresponded_rts,
+                      max_ofdm->unresponded_rts);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n",
+                      "rxe_frame_lmt_ovrun:",
+                      le32_to_cpu(ofdm->rxe_frame_limit_overrun),
+                      accum_ofdm->rxe_frame_limit_overrun,
+                      delta_ofdm->rxe_frame_limit_overrun,
+                      max_ofdm->rxe_frame_limit_overrun);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "sent_ack_cnt:",
+                      le32_to_cpu(ofdm->sent_ack_cnt), accum_ofdm->sent_ack_cnt,
+                      delta_ofdm->sent_ack_cnt, max_ofdm->sent_ack_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "sent_cts_cnt:",
+                      le32_to_cpu(ofdm->sent_cts_cnt), accum_ofdm->sent_cts_cnt,
+                      delta_ofdm->sent_cts_cnt, max_ofdm->sent_cts_cnt);
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "%-32s     current"
+                      "acumulative       delta         max\n",
+                      "Statistics_Rx - CCK:");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "ina_cnt:",
+                      le32_to_cpu(cck->ina_cnt), accum_cck->ina_cnt,
+                      delta_cck->ina_cnt, max_cck->ina_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "fina_cnt:",
+                      le32_to_cpu(cck->fina_cnt), accum_cck->fina_cnt,
+                      delta_cck->fina_cnt, max_cck->fina_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "plcp_err:",
+                      le32_to_cpu(cck->plcp_err), accum_cck->plcp_err,
+                      delta_cck->plcp_err, max_cck->plcp_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "crc32_err:",
+                      le32_to_cpu(cck->crc32_err), accum_cck->crc32_err,
+                      delta_cck->crc32_err, max_cck->crc32_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "overrun_err:",
+                      le32_to_cpu(cck->overrun_err), accum_cck->overrun_err,
+                      delta_cck->overrun_err, max_cck->overrun_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "early_overrun_err:",
+                      le32_to_cpu(cck->early_overrun_err),
+                      accum_cck->early_overrun_err,
+                      delta_cck->early_overrun_err, max_cck->early_overrun_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "crc32_good:",
+                      le32_to_cpu(cck->crc32_good), accum_cck->crc32_good,
+                      delta_cck->crc32_good, max_cck->crc32_good);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "false_alarm_cnt:",
+                      le32_to_cpu(cck->false_alarm_cnt),
+                      accum_cck->false_alarm_cnt, delta_cck->false_alarm_cnt,
+                      max_cck->false_alarm_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "fina_sync_err_cnt:",
+                      le32_to_cpu(cck->fina_sync_err_cnt),
+                      accum_cck->fina_sync_err_cnt,
+                      delta_cck->fina_sync_err_cnt, max_cck->fina_sync_err_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "sfd_timeout:",
+                      le32_to_cpu(cck->sfd_timeout), accum_cck->sfd_timeout,
+                      delta_cck->sfd_timeout, max_cck->sfd_timeout);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "fina_timeout:",
+                      le32_to_cpu(cck->fina_timeout), accum_cck->fina_timeout,
+                      delta_cck->fina_timeout, max_cck->fina_timeout);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "unresponded_rts:",
+                      le32_to_cpu(cck->unresponded_rts),
+                      accum_cck->unresponded_rts, delta_cck->unresponded_rts,
+                      max_cck->unresponded_rts);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n",
+                      "rxe_frame_lmt_ovrun:",
+                      le32_to_cpu(cck->rxe_frame_limit_overrun),
+                      accum_cck->rxe_frame_limit_overrun,
+                      delta_cck->rxe_frame_limit_overrun,
+                      max_cck->rxe_frame_limit_overrun);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "sent_ack_cnt:",
+                      le32_to_cpu(cck->sent_ack_cnt), accum_cck->sent_ack_cnt,
+                      delta_cck->sent_ack_cnt, max_cck->sent_ack_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "sent_cts_cnt:",
+                      le32_to_cpu(cck->sent_cts_cnt), accum_cck->sent_cts_cnt,
+                      delta_cck->sent_cts_cnt, max_cck->sent_cts_cnt);
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "%-32s     current"
+                      "acumulative       delta         max\n",
+                      "Statistics_Rx - GENERAL:");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "bogus_cts:",
+                      le32_to_cpu(general->bogus_cts), accum_general->bogus_cts,
+                      delta_general->bogus_cts, max_general->bogus_cts);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "bogus_ack:",
+                      le32_to_cpu(general->bogus_ack), accum_general->bogus_ack,
+                      delta_general->bogus_ack, max_general->bogus_ack);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "non_bssid_frames:",
+                      le32_to_cpu(general->non_bssid_frames),
+                      accum_general->non_bssid_frames,
+                      delta_general->non_bssid_frames,
+                      max_general->non_bssid_frames);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "filtered_frames:",
+                      le32_to_cpu(general->filtered_frames),
+                      accum_general->filtered_frames,
+                      delta_general->filtered_frames,
+                      max_general->filtered_frames);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n",
+                      "non_channel_beacons:",
+                      le32_to_cpu(general->non_channel_beacons),
+                      accum_general->non_channel_beacons,
+                      delta_general->non_channel_beacons,
+                      max_general->non_channel_beacons);
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
+
+ssize_t
+il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,
+                           size_t count, loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        int pos = 0;
+        char *buf;
+        int bufsz = (sizeof(struct iwl39_stats_tx) * 48) + 250;
+        ssize_t ret;
+        struct iwl39_stats_tx *tx, *accum_tx, *delta_tx, *max_tx;
+
+        if (!il_is_alive(il))
+                return -EAGAIN;
+
+        buf = kzalloc(bufsz, GFP_KERNEL);
+        if (!buf) {
+                IL_ERR("Can not allocate Buffer\n");
+                return -ENOMEM;
+        }
+
+        /*
+         * The statistic information display here is based on
+         * the last stats notification from uCode
+         * might not reflect the current uCode activity
+         */
+        tx = &il->_3945.stats.tx;
+        accum_tx = &il->_3945.accum_stats.tx;
+        delta_tx = &il->_3945.delta_stats.tx;
+        max_tx = &il->_3945.max_delta.tx;
+        pos += il3945_stats_flag(il, buf, bufsz);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "%-32s     current"
+                      "acumulative       delta         max\n",
+                      "Statistics_Tx:");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "preamble:",
+                      le32_to_cpu(tx->preamble_cnt), accum_tx->preamble_cnt,
+                      delta_tx->preamble_cnt, max_tx->preamble_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "rx_detected_cnt:",
+                      le32_to_cpu(tx->rx_detected_cnt),
+                      accum_tx->rx_detected_cnt, delta_tx->rx_detected_cnt,
+                      max_tx->rx_detected_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "bt_prio_defer_cnt:",
+                      le32_to_cpu(tx->bt_prio_defer_cnt),
+                      accum_tx->bt_prio_defer_cnt, delta_tx->bt_prio_defer_cnt,
+                      max_tx->bt_prio_defer_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "bt_prio_kill_cnt:",
+                      le32_to_cpu(tx->bt_prio_kill_cnt),
+                      accum_tx->bt_prio_kill_cnt, delta_tx->bt_prio_kill_cnt,
+                      max_tx->bt_prio_kill_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "few_bytes_cnt:",
+                      le32_to_cpu(tx->few_bytes_cnt), accum_tx->few_bytes_cnt,
+                      delta_tx->few_bytes_cnt, max_tx->few_bytes_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "cts_timeout:",
+                      le32_to_cpu(tx->cts_timeout), accum_tx->cts_timeout,
+                      delta_tx->cts_timeout, max_tx->cts_timeout);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "ack_timeout:",
+                      le32_to_cpu(tx->ack_timeout), accum_tx->ack_timeout,
+                      delta_tx->ack_timeout, max_tx->ack_timeout);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "expected_ack_cnt:",
+                      le32_to_cpu(tx->expected_ack_cnt),
+                      accum_tx->expected_ack_cnt, delta_tx->expected_ack_cnt,
+                      max_tx->expected_ack_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "actual_ack_cnt:",
+                      le32_to_cpu(tx->actual_ack_cnt), accum_tx->actual_ack_cnt,
+                      delta_tx->actual_ack_cnt, max_tx->actual_ack_cnt);
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
+
+ssize_t
+il3945_ucode_general_stats_read(struct file *file, char __user *user_buf,
+                                size_t count, loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        int pos = 0;
+        char *buf;
+        int bufsz = sizeof(struct iwl39_stats_general) * 10 + 300;
+        ssize_t ret;
+        struct iwl39_stats_general *general, *accum_general;
+        struct iwl39_stats_general *delta_general, *max_general;
+        struct stats_dbg *dbg, *accum_dbg, *delta_dbg, *max_dbg;
+        struct iwl39_stats_div *div, *accum_div, *delta_div, *max_div;
+
+        if (!il_is_alive(il))
+                return -EAGAIN;
+
+        buf = kzalloc(bufsz, GFP_KERNEL);
+        if (!buf) {
+                IL_ERR("Can not allocate Buffer\n");
+                return -ENOMEM;
+        }
+
+        /*
+         * The statistic information display here is based on
+         * the last stats notification from uCode
+         * might not reflect the current uCode activity
+         */
+        general = &il->_3945.stats.general;
+        dbg = &il->_3945.stats.general.dbg;
+        div = &il->_3945.stats.general.div;
+        accum_general = &il->_3945.accum_stats.general;
+        delta_general = &il->_3945.delta_stats.general;
+        max_general = &il->_3945.max_delta.general;
+        accum_dbg = &il->_3945.accum_stats.general.dbg;
+        delta_dbg = &il->_3945.delta_stats.general.dbg;
+        max_dbg = &il->_3945.max_delta.general.dbg;
+        accum_div = &il->_3945.accum_stats.general.div;
+        delta_div = &il->_3945.delta_stats.general.div;
+        max_div = &il->_3945.max_delta.general.div;
+        pos += il3945_stats_flag(il, buf, bufsz);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "%-32s     current"
+                      "acumulative       delta         max\n",
+                      "Statistics_General:");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "burst_check:",
+                      le32_to_cpu(dbg->burst_check), accum_dbg->burst_check,
+                      delta_dbg->burst_check, max_dbg->burst_check);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "burst_count:",
+                      le32_to_cpu(dbg->burst_count), accum_dbg->burst_count,
+                      delta_dbg->burst_count, max_dbg->burst_count);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "sleep_time:",
+                      le32_to_cpu(general->sleep_time),
+                      accum_general->sleep_time, delta_general->sleep_time,
+                      max_general->sleep_time);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "slots_out:",
+                      le32_to_cpu(general->slots_out), accum_general->slots_out,
+                      delta_general->slots_out, max_general->slots_out);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "slots_idle:",
+                      le32_to_cpu(general->slots_idle),
+                      accum_general->slots_idle, delta_general->slots_idle,
+                      max_general->slots_idle);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "ttl_timestamp:\t\t\t%u\n",
+                      le32_to_cpu(general->ttl_timestamp));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "tx_on_a:",
+                      le32_to_cpu(div->tx_on_a), accum_div->tx_on_a,
+                      delta_div->tx_on_a, max_div->tx_on_a);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "tx_on_b:",
+                      le32_to_cpu(div->tx_on_b), accum_div->tx_on_b,
+                      delta_div->tx_on_b, max_div->tx_on_b);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "exec_time:",
+                      le32_to_cpu(div->exec_time), accum_div->exec_time,
+                      delta_div->exec_time, max_div->exec_time);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "  %-30s %10u  %10u  %10u  %10u\n", "probe_time:",
+                      le32_to_cpu(div->probe_time), accum_div->probe_time,
+                      delta_div->probe_time, max_div->probe_time);
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
new file mode 100644
index 000000000000..daef6b58f6cc
--- /dev/null
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -0,0 +1,3977 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2003 - 2011 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:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/pci-aspm.h>
+#include <linux/slab.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/firmware.h>
+#include <linux/etherdevice.h>
+#include <linux/if_arp.h>
+
+#include <net/ieee80211_radiotap.h>
+#include <net/mac80211.h>
+
+#include <asm/div64.h>
+
+#define DRV_NAME        "iwl3945"
+
+#include "commands.h"
+#include "common.h"
+#include "3945.h"
+#include "iwl-spectrum.h"
+
+/*
+ * module name, copyright, version, etc.
+ */
+
+#define DRV_DESCRIPTION \
+"Intel(R) PRO/Wireless 3945ABG/BG Network Connection driver for Linux"
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+#define VD "d"
+#else
+#define VD
+#endif
+
+/*
+ * add "s" to indicate spectrum measurement included.
+ * we add it here to be consistent with previous releases in which
+ * this was configurable.
+ */
+#define DRV_VERSION  IWLWIFI_VERSION VD "s"
+#define DRV_COPYRIGHT   "Copyright(c) 2003-2011 Intel Corporation"
+#define DRV_AUTHOR     "<ilw@linux.intel.com>"
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
+MODULE_LICENSE("GPL");
+
+ /* module parameters */
+struct il_mod_params il3945_mod_params = {
+        .sw_crypto = 1,
+        .restart_fw = 1,
+        .disable_hw_scan = 1,
+        /* the rest are 0 by default */
+};
+
+/**
+ * il3945_get_antenna_flags - Get antenna flags for RXON command
+ * @il: eeprom and antenna fields are used to determine antenna flags
+ *
+ * il->eeprom39  is used to determine if antenna AUX/MAIN are reversed
+ * il3945_mod_params.antenna specifies the antenna diversity mode:
+ *
+ * IL_ANTENNA_DIVERSITY - NIC selects best antenna by itself
+ * IL_ANTENNA_MAIN      - Force MAIN antenna
+ * IL_ANTENNA_AUX       - Force AUX antenna
+ */
+__le32
+il3945_get_antenna_flags(const struct il_priv *il)
+{
+        struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il->eeprom;
+
+        switch (il3945_mod_params.antenna) {
+        case IL_ANTENNA_DIVERSITY:
+                return 0;
+
+        case IL_ANTENNA_MAIN:
+                if (eeprom->antenna_switch_type)
+                        return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_B_MSK;
+                return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_A_MSK;
+
+        case IL_ANTENNA_AUX:
+                if (eeprom->antenna_switch_type)
+                        return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_A_MSK;
+                return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_B_MSK;
+        }
+
+        /* bad antenna selector value */
+        IL_ERR("Bad antenna selector value (0x%x)\n",
+               il3945_mod_params.antenna);
+
+        return 0;               /* "diversity" is default if error */
+}
+
+static int
+il3945_set_ccmp_dynamic_key_info(struct il_priv *il,
+                                 struct ieee80211_key_conf *keyconf, u8 sta_id)
+{
+        unsigned long flags;
+        __le16 key_flags = 0;
+        int ret;
+
+        key_flags |= (STA_KEY_FLG_CCMP | STA_KEY_FLG_MAP_KEY_MSK);
+        key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS);
+
+        if (sta_id == il->ctx.bcast_sta_id)
+                key_flags |= STA_KEY_MULTICAST_MSK;
+
+        keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
+        keyconf->hw_key_idx = keyconf->keyidx;
+        key_flags &= ~STA_KEY_FLG_INVALID;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        il->stations[sta_id].keyinfo.cipher = keyconf->cipher;
+        il->stations[sta_id].keyinfo.keylen = keyconf->keylen;
+        memcpy(il->stations[sta_id].keyinfo.key, keyconf->key, keyconf->keylen);
+
+        memcpy(il->stations[sta_id].sta.key.key, keyconf->key, keyconf->keylen);
+
+        if ((il->stations[sta_id].sta.key.
+             key_flags & STA_KEY_FLG_ENCRYPT_MSK) == STA_KEY_FLG_NO_ENC)
+                il->stations[sta_id].sta.key.key_offset =
+                    il_get_free_ucode_key_idx(il);
+        /* else, we are overriding an existing key => no need to allocated room
+         * in uCode. */
+
+        WARN(il->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,
+             "no space for a new key");
+
+        il->stations[sta_id].sta.key.key_flags = key_flags;
+        il->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
+        il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
+
+        D_INFO("hwcrypto: modify ucode station key info\n");
+
+        ret = il_send_add_sta(il, &il->stations[sta_id].sta, CMD_ASYNC);
+
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        return ret;
+}
+
+static int
+il3945_set_tkip_dynamic_key_info(struct il_priv *il,
+                                 struct ieee80211_key_conf *keyconf, u8 sta_id)
+{
+        return -EOPNOTSUPP;
+}
+
+static int
+il3945_set_wep_dynamic_key_info(struct il_priv *il,
+                                struct ieee80211_key_conf *keyconf, u8 sta_id)
+{
+        return -EOPNOTSUPP;
+}
+
+static int
+il3945_clear_sta_key_info(struct il_priv *il, u8 sta_id)
+{
+        unsigned long flags;
+        struct il_addsta_cmd sta_cmd;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        memset(&il->stations[sta_id].keyinfo, 0, sizeof(struct il_hw_key));
+        memset(&il->stations[sta_id].sta.key, 0, sizeof(struct il4965_keyinfo));
+        il->stations[sta_id].sta.key.key_flags = STA_KEY_FLG_NO_ENC;
+        il->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
+        il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
+        memcpy(&sta_cmd, &il->stations[sta_id].sta,
+               sizeof(struct il_addsta_cmd));
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        D_INFO("hwcrypto: clear ucode station key info\n");
+        return il_send_add_sta(il, &sta_cmd, CMD_SYNC);
+}
+
+static int
+il3945_set_dynamic_key(struct il_priv *il, struct ieee80211_key_conf *keyconf,
+                       u8 sta_id)
+{
+        int ret = 0;
+
+        keyconf->hw_key_idx = HW_KEY_DYNAMIC;
+
+        switch (keyconf->cipher) {
+        case WLAN_CIPHER_SUITE_CCMP:
+                ret = il3945_set_ccmp_dynamic_key_info(il, keyconf, sta_id);
+                break;
+        case WLAN_CIPHER_SUITE_TKIP:
+                ret = il3945_set_tkip_dynamic_key_info(il, keyconf, sta_id);
+                break;
+        case WLAN_CIPHER_SUITE_WEP40:
+        case WLAN_CIPHER_SUITE_WEP104:
+                ret = il3945_set_wep_dynamic_key_info(il, keyconf, sta_id);
+                break;
+        default:
+                IL_ERR("Unknown alg: %s alg=%x\n", __func__, keyconf->cipher);
+                ret = -EINVAL;
+        }
+
+        D_WEP("Set dynamic key: alg=%x len=%d idx=%d sta=%d ret=%d\n",
+              keyconf->cipher, keyconf->keylen, keyconf->keyidx, sta_id, ret);
+
+        return ret;
+}
+
+static int
+il3945_remove_static_key(struct il_priv *il)
+{
+        int ret = -EOPNOTSUPP;
+
+        return ret;
+}
+
+static int
+il3945_set_static_key(struct il_priv *il, struct ieee80211_key_conf *key)
+{
+        if (key->cipher == WLAN_CIPHER_SUITE_WEP40 ||
+            key->cipher == WLAN_CIPHER_SUITE_WEP104)
+                return -EOPNOTSUPP;
+
+        IL_ERR("Static key invalid: cipher %x\n", key->cipher);
+        return -EINVAL;
+}
+
+static void
+il3945_clear_free_frames(struct il_priv *il)
+{
+        struct list_head *element;
+
+        D_INFO("%d frames on pre-allocated heap on clear.\n", il->frames_count);
+
+        while (!list_empty(&il->free_frames)) {
+                element = il->free_frames.next;
+                list_del(element);
+                kfree(list_entry(element, struct il3945_frame, list));
+                il->frames_count--;
+        }
+
+        if (il->frames_count) {
+                IL_WARN("%d frames still in use.  Did we lose one?\n",
+                        il->frames_count);
+                il->frames_count = 0;
+        }
+}
+
+static struct il3945_frame *
+il3945_get_free_frame(struct il_priv *il)
+{
+        struct il3945_frame *frame;
+        struct list_head *element;
+        if (list_empty(&il->free_frames)) {
+                frame = kzalloc(sizeof(*frame), GFP_KERNEL);
+                if (!frame) {
+                        IL_ERR("Could not allocate frame!\n");
+                        return NULL;
+                }
+
+                il->frames_count++;
+                return frame;
+        }
+
+        element = il->free_frames.next;
+        list_del(element);
+        return list_entry(element, struct il3945_frame, list);
+}
+
+static void
+il3945_free_frame(struct il_priv *il, struct il3945_frame *frame)
+{
+        memset(frame, 0, sizeof(*frame));
+        list_add(&frame->list, &il->free_frames);
+}
+
+unsigned int
+il3945_fill_beacon_frame(struct il_priv *il, struct ieee80211_hdr *hdr,
+                         int left)
+{
+
+        if (!il_is_associated(il) || !il->beacon_skb)
+                return 0;
+
+        if (il->beacon_skb->len > left)
+                return 0;
+
+        memcpy(hdr, il->beacon_skb->data, il->beacon_skb->len);
+
+        return il->beacon_skb->len;
+}
+
+static int
+il3945_send_beacon_cmd(struct il_priv *il)
+{
+        struct il3945_frame *frame;
+        unsigned int frame_size;
+        int rc;
+        u8 rate;
+
+        frame = il3945_get_free_frame(il);
+
+        if (!frame) {
+                IL_ERR("Could not obtain free frame buffer for beacon "
+                       "command.\n");
+                return -ENOMEM;
+        }
+
+        rate = il_get_lowest_plcp(il, &il->ctx);
+
+        frame_size = il3945_hw_get_beacon_cmd(il, frame, rate);
+
+        rc = il_send_cmd_pdu(il, C_TX_BEACON, frame_size, &frame->u.cmd[0]);
+
+        il3945_free_frame(il, frame);
+
+        return rc;
+}
+
+static void
+il3945_unset_hw_params(struct il_priv *il)
+{
+        if (il->_3945.shared_virt)
+                dma_free_coherent(&il->pci_dev->dev,
+                                  sizeof(struct il3945_shared),
+                                  il->_3945.shared_virt, il->_3945.shared_phys);
+}
+
+static void
+il3945_build_tx_cmd_hwcrypto(struct il_priv *il, struct ieee80211_tx_info *info,
+                             struct il_device_cmd *cmd,
+                             struct sk_buff *skb_frag, int sta_id)
+{
+        struct il3945_tx_cmd *tx_cmd = (struct il3945_tx_cmd *)cmd->cmd.payload;
+        struct il_hw_key *keyinfo = &il->stations[sta_id].keyinfo;
+
+        tx_cmd->sec_ctl = 0;
+
+        switch (keyinfo->cipher) {
+        case WLAN_CIPHER_SUITE_CCMP:
+                tx_cmd->sec_ctl = TX_CMD_SEC_CCM;
+                memcpy(tx_cmd->key, keyinfo->key, keyinfo->keylen);
+                D_TX("tx_cmd with AES hwcrypto\n");
+                break;
+
+        case WLAN_CIPHER_SUITE_TKIP:
+                break;
+
+        case WLAN_CIPHER_SUITE_WEP104:
+                tx_cmd->sec_ctl |= TX_CMD_SEC_KEY128;
+                /* fall through */
+        case WLAN_CIPHER_SUITE_WEP40:
+                tx_cmd->sec_ctl |=
+                    TX_CMD_SEC_WEP | (info->control.hw_key->
+                                      hw_key_idx & TX_CMD_SEC_MSK) <<
+                    TX_CMD_SEC_SHIFT;
+
+                memcpy(&tx_cmd->key[3], keyinfo->key, keyinfo->keylen);
+
+                D_TX("Configuring packet for WEP encryption " "with key %d\n",
+                     info->control.hw_key->hw_key_idx);
+                break;
+
+        default:
+                IL_ERR("Unknown encode cipher %x\n", keyinfo->cipher);
+                break;
+        }
+}
+
+/*
+ * handle build C_TX command notification.
+ */
+static void
+il3945_build_tx_cmd_basic(struct il_priv *il, struct il_device_cmd *cmd,
+                          struct ieee80211_tx_info *info,
+                          struct ieee80211_hdr *hdr, u8 std_id)
+{
+        struct il3945_tx_cmd *tx_cmd = (struct il3945_tx_cmd *)cmd->cmd.payload;
+        __le32 tx_flags = tx_cmd->tx_flags;
+        __le16 fc = hdr->frame_control;
+
+        tx_cmd->stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
+        if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) {
+                tx_flags |= TX_CMD_FLG_ACK_MSK;
+                if (ieee80211_is_mgmt(fc))
+                        tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
+                if (ieee80211_is_probe_resp(fc) &&
+                    !(le16_to_cpu(hdr->seq_ctrl) & 0xf))
+                        tx_flags |= TX_CMD_FLG_TSF_MSK;
+        } else {
+                tx_flags &= (~TX_CMD_FLG_ACK_MSK);
+                tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
+        }
+
+        tx_cmd->sta_id = std_id;
+        if (ieee80211_has_morefrags(fc))
+                tx_flags |= TX_CMD_FLG_MORE_FRAG_MSK;
+
+        if (ieee80211_is_data_qos(fc)) {
+                u8 *qc = ieee80211_get_qos_ctl(hdr);
+                tx_cmd->tid_tspec = qc[0] & 0xf;
+                tx_flags &= ~TX_CMD_FLG_SEQ_CTL_MSK;
+        } else {
+                tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
+        }
+
+        il_tx_cmd_protection(il, info, fc, &tx_flags);
+
+        tx_flags &= ~(TX_CMD_FLG_ANT_SEL_MSK);
+        if (ieee80211_is_mgmt(fc)) {
+                if (ieee80211_is_assoc_req(fc) || ieee80211_is_reassoc_req(fc))
+                        tx_cmd->timeout.pm_frame_timeout = cpu_to_le16(3);
+                else
+                        tx_cmd->timeout.pm_frame_timeout = cpu_to_le16(2);
+        } else {
+                tx_cmd->timeout.pm_frame_timeout = 0;
+        }
+
+        tx_cmd->driver_txop = 0;
+        tx_cmd->tx_flags = tx_flags;
+        tx_cmd->next_frame_len = 0;
+}
+
+/*
+ * start C_TX command process
+ */
+static int
+il3945_tx_skb(struct il_priv *il, struct sk_buff *skb)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+        struct il3945_tx_cmd *tx_cmd;
+        struct il_tx_queue *txq = NULL;
+        struct il_queue *q = NULL;
+        struct il_device_cmd *out_cmd;
+        struct il_cmd_meta *out_meta;
+        dma_addr_t phys_addr;
+        dma_addr_t txcmd_phys;
+        int txq_id = skb_get_queue_mapping(skb);
+        u16 len, idx, hdr_len;
+        u8 id;
+        u8 unicast;
+        u8 sta_id;
+        u8 tid = 0;
+        __le16 fc;
+        u8 wait_write_ptr = 0;
+        unsigned long flags;
+
+        spin_lock_irqsave(&il->lock, flags);
+        if (il_is_rfkill(il)) {
+                D_DROP("Dropping - RF KILL\n");
+                goto drop_unlock;
+        }
+
+        if ((ieee80211_get_tx_rate(il->hw, info)->hw_value & 0xFF) ==
+            IL_INVALID_RATE) {
+                IL_ERR("ERROR: No TX rate available.\n");
+                goto drop_unlock;
+        }
+
+        unicast = !is_multicast_ether_addr(hdr->addr1);
+        id = 0;
+
+        fc = hdr->frame_control;
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+        if (ieee80211_is_auth(fc))
+                D_TX("Sending AUTH frame\n");
+        else if (ieee80211_is_assoc_req(fc))
+                D_TX("Sending ASSOC frame\n");
+        else if (ieee80211_is_reassoc_req(fc))
+                D_TX("Sending REASSOC frame\n");
+#endif
+
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        hdr_len = ieee80211_hdrlen(fc);
+
+        /* Find idx into station table for destination station */
+        sta_id = il_sta_id_or_broadcast(il, &il->ctx, info->control.sta);
+        if (sta_id == IL_INVALID_STATION) {
+                D_DROP("Dropping - INVALID STATION: %pM\n", hdr->addr1);
+                goto drop;
+        }
+
+        D_RATE("station Id %d\n", sta_id);
+
+        if (ieee80211_is_data_qos(fc)) {
+                u8 *qc = ieee80211_get_qos_ctl(hdr);
+                tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK;
+                if (unlikely(tid >= MAX_TID_COUNT))
+                        goto drop;
+        }
+
+        /* Descriptor for chosen Tx queue */
+        txq = &il->txq[txq_id];
+        q = &txq->q;
+
+        if ((il_queue_space(q) < q->high_mark))
+                goto drop;
+
+        spin_lock_irqsave(&il->lock, flags);
+
+        idx = il_get_cmd_idx(q, q->write_ptr, 0);
+
+        /* Set up driver data for this TFD */
+        memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct il_tx_info));
+        txq->txb[q->write_ptr].skb = skb;
+        txq->txb[q->write_ptr].ctx = &il->ctx;
+
+        /* Init first empty entry in queue's array of Tx/cmd buffers */
+        out_cmd = txq->cmd[idx];
+        out_meta = &txq->meta[idx];
+        tx_cmd = (struct il3945_tx_cmd *)out_cmd->cmd.payload;
+        memset(&out_cmd->hdr, 0, sizeof(out_cmd->hdr));
+        memset(tx_cmd, 0, sizeof(*tx_cmd));
+
+        /*
+         * Set up the Tx-command (not MAC!) header.
+         * Store the chosen Tx queue and TFD idx within the sequence field;
+         * after Tx, uCode's Tx response will return this value so driver can
+         * locate the frame within the tx queue and do post-tx processing.
+         */
+        out_cmd->hdr.cmd = C_TX;
+        out_cmd->hdr.sequence =
+            cpu_to_le16((u16)
+                        (QUEUE_TO_SEQ(txq_id) | IDX_TO_SEQ(q->write_ptr)));
+
+        /* Copy MAC header from skb into command buffer */
+        memcpy(tx_cmd->hdr, hdr, hdr_len);
+
+        if (info->control.hw_key)
+                il3945_build_tx_cmd_hwcrypto(il, info, out_cmd, skb, sta_id);
+
+        /* TODO need this for burst mode later on */
+        il3945_build_tx_cmd_basic(il, out_cmd, info, hdr, sta_id);
+
+        /* set is_hcca to 0; it probably will never be implemented */
+        il3945_hw_build_tx_cmd_rate(il, out_cmd, info, hdr, sta_id, 0);
+
+        /* Total # bytes to be transmitted */
+        len = (u16) skb->len;
+        tx_cmd->len = cpu_to_le16(len);
+
+        il_dbg_log_tx_data_frame(il, len, hdr);
+        il_update_stats(il, true, fc, len);
+        tx_cmd->tx_flags &= ~TX_CMD_FLG_ANT_A_MSK;
+        tx_cmd->tx_flags &= ~TX_CMD_FLG_ANT_B_MSK;
+
+        if (!ieee80211_has_morefrags(hdr->frame_control)) {
+                txq->need_update = 1;
+        } else {
+                wait_write_ptr = 1;
+                txq->need_update = 0;
+        }
+
+        D_TX("sequence nr = 0X%x\n", le16_to_cpu(out_cmd->hdr.sequence));
+        D_TX("tx_flags = 0X%x\n", le32_to_cpu(tx_cmd->tx_flags));
+        il_print_hex_dump(il, IL_DL_TX, tx_cmd, sizeof(*tx_cmd));
+        il_print_hex_dump(il, IL_DL_TX, (u8 *) tx_cmd->hdr,
+                          ieee80211_hdrlen(fc));
+
+        /*
+         * Use the first empty entry in this queue's command buffer array
+         * to contain the Tx command and MAC header concatenated together
+         * (payload data will be in another buffer).
+         * Size of this varies, due to varying MAC header length.
+         * If end is not dword aligned, we'll have 2 extra bytes at the end
+         * of the MAC header (device reads on dword boundaries).
+         * We'll tell device about this padding later.
+         */
+        len =
+            sizeof(struct il3945_tx_cmd) + sizeof(struct il_cmd_header) +
+            hdr_len;
+        len = (len + 3) & ~3;
+
+        /* Physical address of this Tx command's header (not MAC header!),
+         * within command buffer array. */
+        txcmd_phys =
+            pci_map_single(il->pci_dev, &out_cmd->hdr, len, PCI_DMA_TODEVICE);
+        /* we do not map meta data ... so we can safely access address to
+         * provide to unmap command*/
+        dma_unmap_addr_set(out_meta, mapping, txcmd_phys);
+        dma_unmap_len_set(out_meta, len, len);
+
+        /* Add buffer containing Tx command and MAC(!) header to TFD's
+         * first entry */
+        il->cfg->ops->lib->txq_attach_buf_to_tfd(il, txq, txcmd_phys, len, 1,
+                                                 0);
+
+        /* Set up TFD's 2nd entry to point directly to remainder of skb,
+         * if any (802.11 null frames have no payload). */
+        len = skb->len - hdr_len;
+        if (len) {
+                phys_addr =
+                    pci_map_single(il->pci_dev, skb->data + hdr_len, len,
+                                   PCI_DMA_TODEVICE);
+                il->cfg->ops->lib->txq_attach_buf_to_tfd(il, txq, phys_addr,
+                                                         len, 0, U32_PAD(len));
+        }
+
+        /* Tell device the write idx *just past* this latest filled TFD */
+        q->write_ptr = il_queue_inc_wrap(q->write_ptr, q->n_bd);
+        il_txq_update_write_ptr(il, txq);
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        if (il_queue_space(q) < q->high_mark && il->mac80211_registered) {
+                if (wait_write_ptr) {
+                        spin_lock_irqsave(&il->lock, flags);
+                        txq->need_update = 1;
+                        il_txq_update_write_ptr(il, txq);
+                        spin_unlock_irqrestore(&il->lock, flags);
+                }
+
+                il_stop_queue(il, txq);
+        }
+
+        return 0;
+
+drop_unlock:
+        spin_unlock_irqrestore(&il->lock, flags);
+drop:
+        return -1;
+}
+
+static int
+il3945_get_measurement(struct il_priv *il,
+                       struct ieee80211_measurement_params *params, u8 type)
+{
+        struct il_spectrum_cmd spectrum;
+        struct il_rx_pkt *pkt;
+        struct il_host_cmd cmd = {
+                .id = C_SPECTRUM_MEASUREMENT,
+                .data = (void *)&spectrum,
+                .flags = CMD_WANT_SKB,
+        };
+        u32 add_time = le64_to_cpu(params->start_time);
+        int rc;
+        int spectrum_resp_status;
+        int duration = le16_to_cpu(params->duration);
+        struct il_rxon_context *ctx = &il->ctx;
+
+        if (il_is_associated(il))
+                add_time =
+                    il_usecs_to_beacons(il,
+                                        le64_to_cpu(params->start_time) -
+                                        il->_3945.last_tsf,
+                                        le16_to_cpu(ctx->timing.
+                                                    beacon_interval));
+
+        memset(&spectrum, 0, sizeof(spectrum));
+
+        spectrum.channel_count = cpu_to_le16(1);
+        spectrum.flags =
+            RXON_FLG_TSF2HOST_MSK | RXON_FLG_ANT_A_MSK | RXON_FLG_DIS_DIV_MSK;
+        spectrum.filter_flags = MEASUREMENT_FILTER_FLAG;
+        cmd.len = sizeof(spectrum);
+        spectrum.len = cpu_to_le16(cmd.len - sizeof(spectrum.len));
+
+        if (il_is_associated(il))
+                spectrum.start_time =
+                    il_add_beacon_time(il, il->_3945.last_beacon_time, add_time,
+                                       le16_to_cpu(ctx->timing.
+                                                   beacon_interval));
+        else
+                spectrum.start_time = 0;
+
+        spectrum.channels[0].duration = cpu_to_le32(duration * TIME_UNIT);
+        spectrum.channels[0].channel = params->channel;
+        spectrum.channels[0].type = type;
+        if (ctx->active.flags & RXON_FLG_BAND_24G_MSK)
+                spectrum.flags |=
+                    RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK |
+                    RXON_FLG_TGG_PROTECT_MSK;
+
+        rc = il_send_cmd_sync(il, &cmd);
+        if (rc)
+                return rc;
+
+        pkt = (struct il_rx_pkt *)cmd.reply_page;
+        if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {
+                IL_ERR("Bad return from N_RX_ON_ASSOC command\n");
+                rc = -EIO;
+        }
+
+        spectrum_resp_status = le16_to_cpu(pkt->u.spectrum.status);
+        switch (spectrum_resp_status) {
+        case 0:         /* Command will be handled */
+                if (pkt->u.spectrum.id != 0xff) {
+                        D_INFO("Replaced existing measurement: %d\n",
+                               pkt->u.spectrum.id);
+                        il->measurement_status &= ~MEASUREMENT_READY;
+                }
+                il->measurement_status |= MEASUREMENT_ACTIVE;
+                rc = 0;
+                break;
+
+        case 1:         /* Command will not be handled */
+                rc = -EAGAIN;
+                break;
+        }
+
+        il_free_pages(il, cmd.reply_page);
+
+        return rc;
+}
+
+static void
+il3945_hdl_alive(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct il_alive_resp *palive;
+        struct delayed_work *pwork;
+
+        palive = &pkt->u.alive_frame;
+
+        D_INFO("Alive ucode status 0x%08X revision " "0x%01X 0x%01X\n",
+               palive->is_valid, palive->ver_type, palive->ver_subtype);
+
+        if (palive->ver_subtype == INITIALIZE_SUBTYPE) {
+                D_INFO("Initialization Alive received.\n");
+                memcpy(&il->card_alive_init, &pkt->u.alive_frame,
+                       sizeof(struct il_alive_resp));
+                pwork = &il->init_alive_start;
+        } else {
+                D_INFO("Runtime Alive received.\n");
+                memcpy(&il->card_alive, &pkt->u.alive_frame,
+                       sizeof(struct il_alive_resp));
+                pwork = &il->alive_start;
+                il3945_disable_events(il);
+        }
+
+        /* We delay the ALIVE response by 5ms to
+         * give the HW RF Kill time to activate... */
+        if (palive->is_valid == UCODE_VALID_OK)
+                queue_delayed_work(il->workqueue, pwork, msecs_to_jiffies(5));
+        else
+                IL_WARN("uCode did not respond OK.\n");
+}
+
+static void
+il3945_hdl_add_sta(struct il_priv *il, struct il_rx_buf *rxb)
+{
+#ifdef CONFIG_IWLEGACY_DEBUG
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+#endif
+
+        D_RX("Received C_ADD_STA: 0x%02X\n", pkt->u.status);
+}
+
+static void
+il3945_hdl_beacon(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct il3945_beacon_notif *beacon = &(pkt->u.beacon_status);
+#ifdef CONFIG_IWLEGACY_DEBUG
+        u8 rate = beacon->beacon_notify_hdr.rate;
+
+        D_RX("beacon status %x retries %d iss %d " "tsf %d %d rate %d\n",
+             le32_to_cpu(beacon->beacon_notify_hdr.status) & TX_STATUS_MSK,
+             beacon->beacon_notify_hdr.failure_frame,
+             le32_to_cpu(beacon->ibss_mgr_status),
+             le32_to_cpu(beacon->high_tsf), le32_to_cpu(beacon->low_tsf), rate);
+#endif
+
+        il->ibss_manager = le32_to_cpu(beacon->ibss_mgr_status);
+
+}
+
+/* Handle notification from uCode that card's power state is changing
+ * due to software, hardware, or critical temperature RFKILL */
+static void
+il3945_hdl_card_state(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags);
+        unsigned long status = il->status;
+
+        IL_WARN("Card state received: HW:%s SW:%s\n",
+                (flags & HW_CARD_DISABLED) ? "Kill" : "On",
+                (flags & SW_CARD_DISABLED) ? "Kill" : "On");
+
+        _il_wr(il, CSR_UCODE_DRV_GP1_SET, CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
+
+        if (flags & HW_CARD_DISABLED)
+                set_bit(S_RF_KILL_HW, &il->status);
+        else
+                clear_bit(S_RF_KILL_HW, &il->status);
+
+        il_scan_cancel(il);
+
+        if ((test_bit(S_RF_KILL_HW, &status) !=
+             test_bit(S_RF_KILL_HW, &il->status)))
+                wiphy_rfkill_set_hw_state(il->hw->wiphy,
+                                          test_bit(S_RF_KILL_HW, &il->status));
+        else
+                wake_up(&il->wait_command_queue);
+}
+
+/**
+ * il3945_setup_handlers - Initialize Rx handler callbacks
+ *
+ * Setup the RX handlers for each of the reply types sent from the uCode
+ * to the host.
+ *
+ * This function chains into the hardware specific files for them to setup
+ * any hardware specific handlers as well.
+ */
+static void
+il3945_setup_handlers(struct il_priv *il)
+{
+        il->handlers[N_ALIVE] = il3945_hdl_alive;
+        il->handlers[C_ADD_STA] = il3945_hdl_add_sta;
+        il->handlers[N_ERROR] = il_hdl_error;
+        il->handlers[N_CHANNEL_SWITCH] = il_hdl_csa;
+        il->handlers[N_SPECTRUM_MEASUREMENT] = il_hdl_spectrum_measurement;
+        il->handlers[N_PM_SLEEP] = il_hdl_pm_sleep;
+        il->handlers[N_PM_DEBUG_STATS] = il_hdl_pm_debug_stats;
+        il->handlers[N_BEACON] = il3945_hdl_beacon;
+
+        /*
+         * The same handler is used for both the REPLY to a discrete
+         * stats request from the host as well as for the periodic
+         * stats notifications (after received beacons) from the uCode.
+         */
+        il->handlers[C_STATS] = il3945_hdl_c_stats;
+        il->handlers[N_STATS] = il3945_hdl_stats;
+
+        il_setup_rx_scan_handlers(il);
+        il->handlers[N_CARD_STATE] = il3945_hdl_card_state;
+
+        /* Set up hardware specific Rx handlers */
+        il3945_hw_handler_setup(il);
+}
+
+/************************** RX-FUNCTIONS ****************************/
+/*
+ * Rx theory of operation
+ *
+ * The host allocates 32 DMA target addresses and passes the host address
+ * to the firmware at register IL_RFDS_TBL_LOWER + N * RFD_SIZE where N is
+ * 0 to 31
+ *
+ * Rx Queue Indexes
+ * The host/firmware share two idx registers for managing the Rx buffers.
+ *
+ * The READ idx maps to the first position that the firmware may be writing
+ * to -- the driver can read up to (but not including) this position and get
+ * good data.
+ * The READ idx is managed by the firmware once the card is enabled.
+ *
+ * The WRITE idx maps to the last position the driver has read from -- the
+ * position preceding WRITE is the last slot the firmware can place a packet.
+ *
+ * The queue is empty (no good data) if WRITE = READ - 1, and is full if
+ * WRITE = READ.
+ *
+ * During initialization, the host sets up the READ queue position to the first
+ * IDX position, and WRITE to the last (READ - 1 wrapped)
+ *
+ * When the firmware places a packet in a buffer, it will advance the READ idx
+ * and fire the RX interrupt.  The driver can then query the READ idx and
+ * process as many packets as possible, moving the WRITE idx forward as it
+ * resets the Rx queue buffers with new memory.
+ *
+ * The management in the driver is as follows:
+ * + A list of pre-allocated SKBs is stored in iwl->rxq->rx_free.  When
+ *   iwl->rxq->free_count drops to or below RX_LOW_WATERMARK, work is scheduled
+ *   to replenish the iwl->rxq->rx_free.
+ * + In il3945_rx_replenish (scheduled) if 'processed' != 'read' then the
+ *   iwl->rxq is replenished and the READ IDX is updated (updating the
+ *   'processed' and 'read' driver idxes as well)
+ * + A received packet is processed and handed to the kernel network stack,
+ *   detached from the iwl->rxq.  The driver 'processed' idx is updated.
+ * + The Host/Firmware iwl->rxq is replenished at tasklet time from the rx_free
+ *   list. If there are no allocated buffers in iwl->rxq->rx_free, the READ
+ *   IDX is not incremented and iwl->status(RX_STALLED) is set.  If there
+ *   were enough free buffers and RX_STALLED is set it is cleared.
+ *
+ *
+ * Driver sequence:
+ *
+ * il3945_rx_replenish()     Replenishes rx_free list from rx_used, and calls
+ *                            il3945_rx_queue_restock
+ * il3945_rx_queue_restock() Moves available buffers from rx_free into Rx
+ *                            queue, updates firmware pointers, and updates
+ *                            the WRITE idx.  If insufficient rx_free buffers
+ *                            are available, schedules il3945_rx_replenish
+ *
+ * -- enable interrupts --
+ * ISR - il3945_rx()         Detach il_rx_bufs from pool up to the
+ *                            READ IDX, detaching the SKB from the pool.
+ *                            Moves the packet buffer from queue to rx_used.
+ *                            Calls il3945_rx_queue_restock to refill any empty
+ *                            slots.
+ * ...
+ *
+ */
+
+/**
+ * il3945_dma_addr2rbd_ptr - convert a DMA address to a uCode read buffer ptr
+ */
+static inline __le32
+il3945_dma_addr2rbd_ptr(struct il_priv *il, dma_addr_t dma_addr)
+{
+        return cpu_to_le32((u32) dma_addr);
+}
+
+/**
+ * il3945_rx_queue_restock - refill RX queue from pre-allocated pool
+ *
+ * If there are slots in the RX queue that need to be restocked,
+ * and we have free pre-allocated buffers, fill the ranks as much
+ * as we can, pulling from rx_free.
+ *
+ * This moves the 'write' idx forward to catch up with 'processed', and
+ * also updates the memory address in the firmware to reference the new
+ * target buffer.
+ */
+static void
+il3945_rx_queue_restock(struct il_priv *il)
+{
+        struct il_rx_queue *rxq = &il->rxq;
+        struct list_head *element;
+        struct il_rx_buf *rxb;
+        unsigned long flags;
+        int write;
+
+        spin_lock_irqsave(&rxq->lock, flags);
+        write = rxq->write & ~0x7;
+        while (il_rx_queue_space(rxq) > 0 && rxq->free_count) {
+                /* Get next free Rx buffer, remove from free list */
+                element = rxq->rx_free.next;
+                rxb = list_entry(element, struct il_rx_buf, list);
+                list_del(element);
+
+                /* Point to Rx buffer via next RBD in circular buffer */
+                rxq->bd[rxq->write] =
+                    il3945_dma_addr2rbd_ptr(il, rxb->page_dma);
+                rxq->queue[rxq->write] = rxb;
+                rxq->write = (rxq->write + 1) & RX_QUEUE_MASK;
+                rxq->free_count--;
+        }
+        spin_unlock_irqrestore(&rxq->lock, flags);
+        /* If the pre-allocated buffer pool is dropping low, schedule to
+         * refill it */
+        if (rxq->free_count <= RX_LOW_WATERMARK)
+                queue_work(il->workqueue, &il->rx_replenish);
+
+        /* If we've added more space for the firmware to place data, tell it.
+         * Increment device's write pointer in multiples of 8. */
+        if (rxq->write_actual != (rxq->write & ~0x7) ||
+            abs(rxq->write - rxq->read) > 7) {
+                spin_lock_irqsave(&rxq->lock, flags);
+                rxq->need_update = 1;
+                spin_unlock_irqrestore(&rxq->lock, flags);
+                il_rx_queue_update_write_ptr(il, rxq);
+        }
+}
+
+/**
+ * il3945_rx_replenish - Move all used packet from rx_used to rx_free
+ *
+ * When moving to rx_free an SKB is allocated for the slot.
+ *
+ * Also restock the Rx queue via il3945_rx_queue_restock.
+ * This is called as a scheduled work item (except for during initialization)
+ */
+static void
+il3945_rx_allocate(struct il_priv *il, gfp_t priority)
+{
+        struct il_rx_queue *rxq = &il->rxq;
+        struct list_head *element;
+        struct il_rx_buf *rxb;
+        struct page *page;
+        unsigned long flags;
+        gfp_t gfp_mask = priority;
+
+        while (1) {
+                spin_lock_irqsave(&rxq->lock, flags);
+
+                if (list_empty(&rxq->rx_used)) {
+                        spin_unlock_irqrestore(&rxq->lock, flags);
+                        return;
+                }
+                spin_unlock_irqrestore(&rxq->lock, flags);
+
+                if (rxq->free_count > RX_LOW_WATERMARK)
+                        gfp_mask |= __GFP_NOWARN;
+
+                if (il->hw_params.rx_page_order > 0)
+                        gfp_mask |= __GFP_COMP;
+
+                /* Alloc a new receive buffer */
+                page = alloc_pages(gfp_mask, il->hw_params.rx_page_order);
+                if (!page) {
+                        if (net_ratelimit())
+                                D_INFO("Failed to allocate SKB buffer.\n");
+                        if (rxq->free_count <= RX_LOW_WATERMARK &&
+                            net_ratelimit())
+                                IL_ERR("Failed to allocate SKB buffer with %0x."
+                                       "Only %u free buffers remaining.\n",
+                                       priority, rxq->free_count);
+                        /* We don't reschedule replenish work here -- we will
+                         * call the restock method and if it still needs
+                         * more buffers it will schedule replenish */
+                        break;
+                }
+
+                spin_lock_irqsave(&rxq->lock, flags);
+                if (list_empty(&rxq->rx_used)) {
+                        spin_unlock_irqrestore(&rxq->lock, flags);
+                        __free_pages(page, il->hw_params.rx_page_order);
+                        return;
+                }
+                element = rxq->rx_used.next;
+                rxb = list_entry(element, struct il_rx_buf, list);
+                list_del(element);
+                spin_unlock_irqrestore(&rxq->lock, flags);
+
+                rxb->page = page;
+                /* Get physical address of RB/SKB */
+                rxb->page_dma =
+                    pci_map_page(il->pci_dev, page, 0,
+                                 PAGE_SIZE << il->hw_params.rx_page_order,
+                                 PCI_DMA_FROMDEVICE);
+
+                spin_lock_irqsave(&rxq->lock, flags);
+
+                list_add_tail(&rxb->list, &rxq->rx_free);
+                rxq->free_count++;
+                il->alloc_rxb_page++;
+
+                spin_unlock_irqrestore(&rxq->lock, flags);
+        }
+}
+
+void
+il3945_rx_queue_reset(struct il_priv *il, struct il_rx_queue *rxq)
+{
+        unsigned long flags;
+        int i;
+        spin_lock_irqsave(&rxq->lock, flags);
+        INIT_LIST_HEAD(&rxq->rx_free);
+        INIT_LIST_HEAD(&rxq->rx_used);
+        /* Fill the rx_used queue with _all_ of the Rx buffers */
+        for (i = 0; i < RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++) {
+                /* In the reset function, these buffers may have been allocated
+                 * to an SKB, so we need to unmap and free potential storage */
+                if (rxq->pool[i].page != NULL) {
+                        pci_unmap_page(il->pci_dev, rxq->pool[i].page_dma,
+                                       PAGE_SIZE << il->hw_params.rx_page_order,
+                                       PCI_DMA_FROMDEVICE);
+                        __il_free_pages(il, rxq->pool[i].page);
+                        rxq->pool[i].page = NULL;
+                }
+                list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
+        }
+
+        /* Set us so that we have processed and used all buffers, but have
+         * not restocked the Rx queue with fresh buffers */
+        rxq->read = rxq->write = 0;
+        rxq->write_actual = 0;
+        rxq->free_count = 0;
+        spin_unlock_irqrestore(&rxq->lock, flags);
+}
+
+void
+il3945_rx_replenish(void *data)
+{
+        struct il_priv *il = data;
+        unsigned long flags;
+
+        il3945_rx_allocate(il, GFP_KERNEL);
+
+        spin_lock_irqsave(&il->lock, flags);
+        il3945_rx_queue_restock(il);
+        spin_unlock_irqrestore(&il->lock, flags);
+}
+
+static void
+il3945_rx_replenish_now(struct il_priv *il)
+{
+        il3945_rx_allocate(il, GFP_ATOMIC);
+
+        il3945_rx_queue_restock(il);
+}
+
+/* Assumes that the skb field of the buffers in 'pool' is kept accurate.
+ * If an SKB has been detached, the POOL needs to have its SKB set to NULL
+ * This free routine walks the list of POOL entries and if SKB is set to
+ * non NULL it is unmapped and freed
+ */
+static void
+il3945_rx_queue_free(struct il_priv *il, struct il_rx_queue *rxq)
+{
+        int i;
+        for (i = 0; i < RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {
+                if (rxq->pool[i].page != NULL) {
+                        pci_unmap_page(il->pci_dev, rxq->pool[i].page_dma,
+                                       PAGE_SIZE << il->hw_params.rx_page_order,
+                                       PCI_DMA_FROMDEVICE);
+                        __il_free_pages(il, rxq->pool[i].page);
+                        rxq->pool[i].page = NULL;
+                }
+        }
+
+        dma_free_coherent(&il->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,
+                          rxq->bd_dma);
+        dma_free_coherent(&il->pci_dev->dev, sizeof(struct il_rb_status),
+                          rxq->rb_stts, rxq->rb_stts_dma);
+        rxq->bd = NULL;
+        rxq->rb_stts = NULL;
+}
+
+/* Convert linear signal-to-noise ratio into dB */
+static u8 ratio2dB[100] = {
+/*       0   1   2   3   4   5   6   7   8   9 */
+        0, 0, 6, 10, 12, 14, 16, 17, 18, 19,    /* 00 - 09 */
+        20, 21, 22, 22, 23, 23, 24, 25, 26, 26, /* 10 - 19 */
+        26, 26, 26, 27, 27, 28, 28, 28, 29, 29, /* 20 - 29 */
+        29, 30, 30, 30, 31, 31, 31, 31, 32, 32, /* 30 - 39 */
+        32, 32, 32, 33, 33, 33, 33, 33, 34, 34, /* 40 - 49 */
+        34, 34, 34, 34, 35, 35, 35, 35, 35, 35, /* 50 - 59 */
+        36, 36, 36, 36, 36, 36, 36, 37, 37, 37, /* 60 - 69 */
+        37, 37, 37, 37, 37, 38, 38, 38, 38, 38, /* 70 - 79 */
+        38, 38, 38, 38, 38, 39, 39, 39, 39, 39, /* 80 - 89 */
+        39, 39, 39, 39, 39, 40, 40, 40, 40, 40  /* 90 - 99 */
+};
+
+/* Calculates a relative dB value from a ratio of linear
+ *   (i.e. not dB) signal levels.
+ * Conversion assumes that levels are voltages (20*log), not powers (10*log). */
+int
+il3945_calc_db_from_ratio(int sig_ratio)
+{
+        /* 1000:1 or higher just report as 60 dB */
+        if (sig_ratio >= 1000)
+                return 60;
+
+        /* 100:1 or higher, divide by 10 and use table,
+         *   add 20 dB to make up for divide by 10 */
+        if (sig_ratio >= 100)
+                return 20 + (int)ratio2dB[sig_ratio / 10];
+
+        /* We shouldn't see this */
+        if (sig_ratio < 1)
+                return 0;
+
+        /* Use table for ratios 1:1 - 99:1 */
+        return (int)ratio2dB[sig_ratio];
+}
+
+/**
+ * il3945_rx_handle - Main entry function for receiving responses from uCode
+ *
+ * Uses the il->handlers callback function array to invoke
+ * the appropriate handlers, including command responses,
+ * frame-received notifications, and other notifications.
+ */
+static void
+il3945_rx_handle(struct il_priv *il)
+{
+        struct il_rx_buf *rxb;
+        struct il_rx_pkt *pkt;
+        struct il_rx_queue *rxq = &il->rxq;
+        u32 r, i;
+        int reclaim;
+        unsigned long flags;
+        u8 fill_rx = 0;
+        u32 count = 8;
+        int total_empty = 0;
+
+        /* uCode's read idx (stored in shared DRAM) indicates the last Rx
+         * buffer that the driver may process (last buffer filled by ucode). */
+        r = le16_to_cpu(rxq->rb_stts->closed_rb_num) & 0x0FFF;
+        i = rxq->read;
+
+        /* calculate total frames need to be restock after handling RX */
+        total_empty = r - rxq->write_actual;
+        if (total_empty < 0)
+                total_empty += RX_QUEUE_SIZE;
+
+        if (total_empty > (RX_QUEUE_SIZE / 2))
+                fill_rx = 1;
+        /* Rx interrupt, but nothing sent from uCode */
+        if (i == r)
+                D_RX("r = %d, i = %d\n", r, i);
+
+        while (i != r) {
+                int len;
+
+                rxb = rxq->queue[i];
+
+                /* If an RXB doesn't have a Rx queue slot associated with it,
+                 * then a bug has been introduced in the queue refilling
+                 * routines -- catch it here */
+                BUG_ON(rxb == NULL);
+
+                rxq->queue[i] = NULL;
+
+                pci_unmap_page(il->pci_dev, rxb->page_dma,
+                               PAGE_SIZE << il->hw_params.rx_page_order,
+                               PCI_DMA_FROMDEVICE);
+                pkt = rxb_addr(rxb);
+
+                len = le32_to_cpu(pkt->len_n_flags) & IL_RX_FRAME_SIZE_MSK;
+                len += sizeof(u32);     /* account for status word */
+
+                /* Reclaim a command buffer only if this packet is a response
+                 *   to a (driver-originated) command.
+                 * If the packet (e.g. Rx frame) originated from uCode,
+                 *   there is no command buffer to reclaim.
+                 * Ucode should set SEQ_RX_FRAME bit if ucode-originated,
+                 *   but apparently a few don't get set; catch them here. */
+                reclaim = !(pkt->hdr.sequence & SEQ_RX_FRAME) &&
+                    pkt->hdr.cmd != N_STATS && pkt->hdr.cmd != C_TX;
+
+                /* Based on type of command response or notification,
+                 *   handle those that need handling via function in
+                 *   handlers table.  See il3945_setup_handlers() */
+                if (il->handlers[pkt->hdr.cmd]) {
+                        D_RX("r = %d, i = %d, %s, 0x%02x\n", r, i,
+                             il_get_cmd_string(pkt->hdr.cmd), pkt->hdr.cmd);
+                        il->isr_stats.handlers[pkt->hdr.cmd]++;
+                        il->handlers[pkt->hdr.cmd] (il, rxb);
+                } else {
+                        /* No handling needed */
+                        D_RX("r %d i %d No handler needed for %s, 0x%02x\n", r,
+                             i, il_get_cmd_string(pkt->hdr.cmd), pkt->hdr.cmd);
+                }
+
+                /*
+                 * XXX: After here, we should always check rxb->page
+                 * against NULL before touching it or its virtual
+                 * memory (pkt). Because some handler might have
+                 * already taken or freed the pages.
+                 */
+
+                if (reclaim) {
+                        /* Invoke any callbacks, transfer the buffer to caller,
+                         * and fire off the (possibly) blocking il_send_cmd()
+                         * as we reclaim the driver command queue */
+                        if (rxb->page)
+                                il_tx_cmd_complete(il, rxb);
+                        else
+                                IL_WARN("Claim null rxb?\n");
+                }
+
+                /* Reuse the page if possible. For notification packets and
+                 * SKBs that fail to Rx correctly, add them back into the
+                 * rx_free list for reuse later. */
+                spin_lock_irqsave(&rxq->lock, flags);
+                if (rxb->page != NULL) {
+                        rxb->page_dma =
+                            pci_map_page(il->pci_dev, rxb->page, 0,
+                                         PAGE_SIZE << il->hw_params.
+                                         rx_page_order, PCI_DMA_FROMDEVICE);
+                        list_add_tail(&rxb->list, &rxq->rx_free);
+                        rxq->free_count++;
+                } else
+                        list_add_tail(&rxb->list, &rxq->rx_used);
+
+                spin_unlock_irqrestore(&rxq->lock, flags);
+
+                i = (i + 1) & RX_QUEUE_MASK;
+                /* If there are a lot of unused frames,
+                 * restock the Rx queue so ucode won't assert. */
+                if (fill_rx) {
+                        count++;
+                        if (count >= 8) {
+                                rxq->read = i;
+                                il3945_rx_replenish_now(il);
+                                count = 0;
+                        }
+                }
+        }
+
+        /* Backtrack one entry */
+        rxq->read = i;
+        if (fill_rx)
+                il3945_rx_replenish_now(il);
+        else
+                il3945_rx_queue_restock(il);
+}
+
+/* call this function to flush any scheduled tasklet */
+static inline void
+il3945_synchronize_irq(struct il_priv *il)
+{
+        /* wait to make sure we flush pending tasklet */
+        synchronize_irq(il->pci_dev->irq);
+        tasklet_kill(&il->irq_tasklet);
+}
+
+static const char *
+il3945_desc_lookup(int i)
+{
+        switch (i) {
+        case 1:
+                return "FAIL";
+        case 2:
+                return "BAD_PARAM";
+        case 3:
+                return "BAD_CHECKSUM";
+        case 4:
+                return "NMI_INTERRUPT";
+        case 5:
+                return "SYSASSERT";
+        case 6:
+                return "FATAL_ERROR";
+        }
+
+        return "UNKNOWN";
+}
+
+#define ERROR_START_OFFSET  (1 * sizeof(u32))
+#define ERROR_ELEM_SIZE     (7 * sizeof(u32))
+
+void
+il3945_dump_nic_error_log(struct il_priv *il)
+{
+        u32 i;
+        u32 desc, time, count, base, data1;
+        u32 blink1, blink2, ilink1, ilink2;
+
+        base = le32_to_cpu(il->card_alive.error_event_table_ptr);
+
+        if (!il3945_hw_valid_rtc_data_addr(base)) {
+                IL_ERR("Not valid error log pointer 0x%08X\n", base);
+                return;
+        }
+
+        count = il_read_targ_mem(il, base);
+
+        if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) {
+                IL_ERR("Start IWL Error Log Dump:\n");
+                IL_ERR("Status: 0x%08lX, count: %d\n", il->status, count);
+        }
+
+        IL_ERR("Desc       Time       asrtPC  blink2 "
+               "ilink1  nmiPC   Line\n");
+        for (i = ERROR_START_OFFSET;
+             i < (count * ERROR_ELEM_SIZE) + ERROR_START_OFFSET;
+             i += ERROR_ELEM_SIZE) {
+                desc = il_read_targ_mem(il, base + i);
+                time = il_read_targ_mem(il, base + i + 1 * sizeof(u32));
+                blink1 = il_read_targ_mem(il, base + i + 2 * sizeof(u32));
+                blink2 = il_read_targ_mem(il, base + i + 3 * sizeof(u32));
+                ilink1 = il_read_targ_mem(il, base + i + 4 * sizeof(u32));
+                ilink2 = il_read_targ_mem(il, base + i + 5 * sizeof(u32));
+                data1 = il_read_targ_mem(il, base + i + 6 * sizeof(u32));
+
+                IL_ERR("%-13s (0x%X) %010u 0x%05X 0x%05X 0x%05X 0x%05X %u\n\n",
+                       il3945_desc_lookup(desc), desc, time, blink1, blink2,
+                       ilink1, ilink2, data1);
+        }
+}
+
+static void
+il3945_irq_tasklet(struct il_priv *il)
+{
+        u32 inta, handled = 0;
+        u32 inta_fh;
+        unsigned long flags;
+#ifdef CONFIG_IWLEGACY_DEBUG
+        u32 inta_mask;
+#endif
+
+        spin_lock_irqsave(&il->lock, flags);
+
+        /* 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 = _il_rd(il, CSR_INT);
+        _il_wr(il, 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 = _il_rd(il, CSR_FH_INT_STATUS);
+        _il_wr(il, CSR_FH_INT_STATUS, inta_fh);
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+        if (il_get_debug_level(il) & IL_DL_ISR) {
+                /* just for debug */
+                inta_mask = _il_rd(il, CSR_INT_MASK);
+                D_ISR("inta 0x%08x, enabled 0x%08x, fh 0x%08x\n", inta,
+                      inta_mask, inta_fh);
+        }
+#endif
+
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        /* Since CSR_INT and CSR_FH_INT_STATUS reads and clears are not
+         * 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 & CSR39_FH_INT_RX_MASK)
+                inta |= CSR_INT_BIT_FH_RX;
+        if (inta_fh & CSR39_FH_INT_TX_MASK)
+                inta |= CSR_INT_BIT_FH_TX;
+
+        /* Now service all interrupt bits discovered above. */
+        if (inta & CSR_INT_BIT_HW_ERR) {
+                IL_ERR("Hardware error detected.  Restarting.\n");
+
+                /* Tell the device to stop sending interrupts */
+                il_disable_interrupts(il);
+
+                il->isr_stats.hw++;
+                il_irq_handle_error(il);
+
+                handled |= CSR_INT_BIT_HW_ERR;
+
+                return;
+        }
+#ifdef CONFIG_IWLEGACY_DEBUG
+        if (il_get_debug_level(il) & (IL_DL_ISR)) {
+                /* NIC fires this, but we don't use it, redundant with WAKEUP */
+                if (inta & CSR_INT_BIT_SCD) {
+                        D_ISR("Scheduler finished to transmit "
+                              "the frame/frames.\n");
+                        il->isr_stats.sch++;
+                }
+
+                /* Alive notification via Rx interrupt will do the real work */
+                if (inta & CSR_INT_BIT_ALIVE) {
+                        D_ISR("Alive interrupt\n");
+                        il->isr_stats.alive++;
+                }
+        }
+#endif
+        /* Safely ignore these bits for debug checks below */
+        inta &= ~(CSR_INT_BIT_SCD | CSR_INT_BIT_ALIVE);
+
+        /* Error detected by uCode */
+        if (inta & CSR_INT_BIT_SW_ERR) {
+                IL_ERR("Microcode SW error detected. " "Restarting 0x%X.\n",
+                       inta);
+                il->isr_stats.sw++;
+                il_irq_handle_error(il);
+                handled |= CSR_INT_BIT_SW_ERR;
+        }
+
+        /* uCode wakes up after power-down sleep */
+        if (inta & CSR_INT_BIT_WAKEUP) {
+                D_ISR("Wakeup interrupt\n");
+                il_rx_queue_update_write_ptr(il, &il->rxq);
+                il_txq_update_write_ptr(il, &il->txq[0]);
+                il_txq_update_write_ptr(il, &il->txq[1]);
+                il_txq_update_write_ptr(il, &il->txq[2]);
+                il_txq_update_write_ptr(il, &il->txq[3]);
+                il_txq_update_write_ptr(il, &il->txq[4]);
+                il_txq_update_write_ptr(il, &il->txq[5]);
+
+                il->isr_stats.wakeup++;
+                handled |= CSR_INT_BIT_WAKEUP;
+        }
+
+        /* All uCode command responses, including Tx command responses,
+         * Rx "responses" (frame-received notification), and other
+         * notifications from uCode come through here*/
+        if (inta & (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX)) {
+                il3945_rx_handle(il);
+                il->isr_stats.rx++;
+                handled |= (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX);
+        }
+
+        if (inta & CSR_INT_BIT_FH_TX) {
+                D_ISR("Tx interrupt\n");
+                il->isr_stats.tx++;
+
+                _il_wr(il, CSR_FH_INT_STATUS, (1 << 6));
+                il_wr(il, FH39_TCSR_CREDIT(FH39_SRVC_CHNL), 0x0);
+                handled |= CSR_INT_BIT_FH_TX;
+        }
+
+        if (inta & ~handled) {
+                IL_ERR("Unhandled INTA bits 0x%08x\n", inta & ~handled);
+                il->isr_stats.unhandled++;
+        }
+
+        if (inta & ~il->inta_mask) {
+                IL_WARN("Disabled INTA bits 0x%08x were pending\n",
+                        inta & ~il->inta_mask);
+                IL_WARN("   with inta_fh = 0x%08x\n", inta_fh);
+        }
+
+        /* Re-enable all interrupts */
+        /* only Re-enable if disabled by irq */
+        if (test_bit(S_INT_ENABLED, &il->status))
+                il_enable_interrupts(il);
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+        if (il_get_debug_level(il) & (IL_DL_ISR)) {
+                inta = _il_rd(il, CSR_INT);
+                inta_mask = _il_rd(il, CSR_INT_MASK);
+                inta_fh = _il_rd(il, CSR_FH_INT_STATUS);
+                D_ISR("End inta 0x%08x, enabled 0x%08x, fh 0x%08x, "
+                      "flags 0x%08lx\n", inta, inta_mask, inta_fh, flags);
+        }
+#endif
+}
+
+static int
+il3945_get_channels_for_scan(struct il_priv *il, enum ieee80211_band band,
+                             u8 is_active, u8 n_probes,
+                             struct il3945_scan_channel *scan_ch,
+                             struct ieee80211_vif *vif)
+{
+        struct ieee80211_channel *chan;
+        const struct ieee80211_supported_band *sband;
+        const struct il_channel_info *ch_info;
+        u16 passive_dwell = 0;
+        u16 active_dwell = 0;
+        int added, i;
+
+        sband = il_get_hw_mode(il, band);
+        if (!sband)
+                return 0;
+
+        active_dwell = il_get_active_dwell_time(il, band, n_probes);
+        passive_dwell = il_get_passive_dwell_time(il, band, vif);
+
+        if (passive_dwell <= active_dwell)
+                passive_dwell = active_dwell + 1;
+
+        for (i = 0, added = 0; i < il->scan_request->n_channels; i++) {
+                chan = il->scan_request->channels[i];
+
+                if (chan->band != band)
+                        continue;
+
+                scan_ch->channel = chan->hw_value;
+
+                ch_info = il_get_channel_info(il, band, scan_ch->channel);
+                if (!il_is_channel_valid(ch_info)) {
+                        D_SCAN("Channel %d is INVALID for this band.\n",
+                               scan_ch->channel);
+                        continue;
+                }
+
+                scan_ch->active_dwell = cpu_to_le16(active_dwell);
+                scan_ch->passive_dwell = cpu_to_le16(passive_dwell);
+                /* If passive , set up for auto-switch
+                 *  and use long active_dwell time.
+                 */
+                if (!is_active || il_is_channel_passive(ch_info) ||
+                    (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN)) {
+                        scan_ch->type = 0;      /* passive */
+                        if (IL_UCODE_API(il->ucode_ver) == 1)
+                                scan_ch->active_dwell =
+                                    cpu_to_le16(passive_dwell - 1);
+                } else {
+                        scan_ch->type = 1;      /* active */
+                }
+
+                /* Set direct probe bits. These may be used both for active
+                 * scan channels (probes gets sent right away),
+                 * or for passive channels (probes get se sent only after
+                 * hearing clear Rx packet).*/
+                if (IL_UCODE_API(il->ucode_ver) >= 2) {
+                        if (n_probes)
+                                scan_ch->type |= IL39_SCAN_PROBE_MASK(n_probes);
+                } else {
+                        /* uCode v1 does not allow setting direct probe bits on
+                         * passive channel. */
+                        if ((scan_ch->type & 1) && n_probes)
+                                scan_ch->type |= IL39_SCAN_PROBE_MASK(n_probes);
+                }
+
+                /* Set txpower levels to defaults */
+                scan_ch->tpc.dsp_atten = 110;
+                /* scan_pwr_info->tpc.dsp_atten; */
+
+                /*scan_pwr_info->tpc.tx_gain; */
+                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));
+                        /* NOTE: if we were doing 6Mb OFDM for scans we'd use
+                         * power level:
+                         * scan_ch->tpc.tx_gain = ((1 << 5) | (2 << 3)) | 3;
+                         */
+                }
+
+                D_SCAN("Scanning %d [%s %d]\n", scan_ch->channel,
+                       (scan_ch->type & 1) ? "ACTIVE" : "PASSIVE",
+                       (scan_ch->type & 1) ? active_dwell : passive_dwell);
+
+                scan_ch++;
+                added++;
+        }
+
+        D_SCAN("total channels to scan %d\n", added);
+        return added;
+}
+
+static void
+il3945_init_hw_rates(struct il_priv *il, struct ieee80211_rate *rates)
+{
+        int i;
+
+        for (i = 0; i < RATE_COUNT_LEGACY; i++) {
+                rates[i].bitrate = il3945_rates[i].ieee * 5;
+                rates[i].hw_value = i;  /* Rate scaling will work on idxes */
+                rates[i].hw_value_short = i;
+                rates[i].flags = 0;
+                if (i > IL39_LAST_OFDM_RATE || i < IL_FIRST_OFDM_RATE) {
+                        /*
+                         * If CCK != 1M then set short preamble rate flag.
+                         */
+                        rates[i].flags |=
+                            (il3945_rates[i].plcp ==
+                             10) ? 0 : IEEE80211_RATE_SHORT_PREAMBLE;
+                }
+        }
+}
+
+/******************************************************************************
+ *
+ * uCode download functions
+ *
+ ******************************************************************************/
+
+static void
+il3945_dealloc_ucode_pci(struct il_priv *il)
+{
+        il_free_fw_desc(il->pci_dev, &il->ucode_code);
+        il_free_fw_desc(il->pci_dev, &il->ucode_data);
+        il_free_fw_desc(il->pci_dev, &il->ucode_data_backup);
+        il_free_fw_desc(il->pci_dev, &il->ucode_init);
+        il_free_fw_desc(il->pci_dev, &il->ucode_init_data);
+        il_free_fw_desc(il->pci_dev, &il->ucode_boot);
+}
+
+/**
+ * il3945_verify_inst_full - verify runtime uCode image in card vs. host,
+ *     looking at all data.
+ */
+static int
+il3945_verify_inst_full(struct il_priv *il, __le32 * image, u32 len)
+{
+        u32 val;
+        u32 save_len = len;
+        int rc = 0;
+        u32 errcnt;
+
+        D_INFO("ucode inst image size is %u\n", len);
+
+        il_wr(il, HBUS_TARG_MEM_RADDR, IL39_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 IL_DL_IO is set */
+                val = _il_rd(il, HBUS_TARG_MEM_RDAT);
+                if (val != le32_to_cpu(*image)) {
+                        IL_ERR("uCode INST section is invalid at "
+                               "offset 0x%x, is 0x%x, s/b 0x%x\n",
+                               save_len - len, val, le32_to_cpu(*image));
+                        rc = -EIO;
+                        errcnt++;
+                        if (errcnt >= 20)
+                                break;
+                }
+        }
+
+        if (!errcnt)
+                D_INFO("ucode image in INSTRUCTION memory is good\n");
+
+        return rc;
+}
+
+/**
+ * il3945_verify_inst_sparse - verify runtime uCode image in card vs. host,
+ *   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
+il3945_verify_inst_sparse(struct il_priv *il, __le32 * image, u32 len)
+{
+        u32 val;
+        int rc = 0;
+        u32 errcnt = 0;
+        u32 i;
+
+        D_INFO("ucode inst image size is %u\n", len);
+
+        for (i = 0; i < len; i += 100, image += 100 / sizeof(u32)) {
+                /* read data comes through single port, auto-incr addr */
+                /* NOTE: Use the debugless read so we don't flood kernel log
+                 * if IL_DL_IO is set */
+                il_wr(il, HBUS_TARG_MEM_RADDR, i + IL39_RTC_INST_LOWER_BOUND);
+                val = _il_rd(il, HBUS_TARG_MEM_RDAT);
+                if (val != le32_to_cpu(*image)) {
+#if 0                           /* Enable this if you want to see details */
+                        IL_ERR("uCode INST section is invalid at "
+                               "offset 0x%x, is 0x%x, s/b 0x%x\n", i, val,
+                               *image);
+#endif
+                        rc = -EIO;
+                        errcnt++;
+                        if (errcnt >= 3)
+                                break;
+                }
+        }
+
+        return rc;
+}
+
+/**
+ * il3945_verify_ucode - determine which instruction image is in SRAM,
+ *    and verify its contents
+ */
+static int
+il3945_verify_ucode(struct il_priv *il)
+{
+        __le32 *image;
+        u32 len;
+        int rc = 0;
+
+        /* Try bootstrap */
+        image = (__le32 *) il->ucode_boot.v_addr;
+        len = il->ucode_boot.len;
+        rc = il3945_verify_inst_sparse(il, image, len);
+        if (rc == 0) {
+                D_INFO("Bootstrap uCode is good in inst SRAM\n");
+                return 0;
+        }
+
+        /* Try initialize */
+        image = (__le32 *) il->ucode_init.v_addr;
+        len = il->ucode_init.len;
+        rc = il3945_verify_inst_sparse(il, image, len);
+        if (rc == 0) {
+                D_INFO("Initialize uCode is good in inst SRAM\n");
+                return 0;
+        }
+
+        /* Try runtime/protocol */
+        image = (__le32 *) il->ucode_code.v_addr;
+        len = il->ucode_code.len;
+        rc = il3945_verify_inst_sparse(il, image, len);
+        if (rc == 0) {
+                D_INFO("Runtime uCode is good in inst SRAM\n");
+                return 0;
+        }
+
+        IL_ERR("NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n");
+
+        /* Since nothing seems to match, show first several data entries in
+         * instruction SRAM, so maybe visual inspection will give a clue.
+         * Selection of bootstrap image (vs. other images) is arbitrary. */
+        image = (__le32 *) il->ucode_boot.v_addr;
+        len = il->ucode_boot.len;
+        rc = il3945_verify_inst_full(il, image, len);
+
+        return rc;
+}
+
+static void
+il3945_nic_start(struct il_priv *il)
+{
+        /* Remove all resets to allow NIC to operate */
+        _il_wr(il, CSR_RESET, 0);
+}
+
+#define IL3945_UCODE_GET(item)                                          \
+static u32 il3945_ucode_get_##item(const struct il_ucode_header *ucode)\
+{                                                                       \
+        return le32_to_cpu(ucode->v1.item);                             \
+}
+
+static u32
+il3945_ucode_get_header_size(u32 api_ver)
+{
+        return 24;
+}
+
+static u8 *
+il3945_ucode_get_data(const struct il_ucode_header *ucode)
+{
+        return (u8 *) ucode->v1.data;
+}
+
+IL3945_UCODE_GET(inst_size);
+IL3945_UCODE_GET(data_size);
+IL3945_UCODE_GET(init_size);
+IL3945_UCODE_GET(init_data_size);
+IL3945_UCODE_GET(boot_size);
+
+/**
+ * il3945_read_ucode - Read uCode images from disk file.
+ *
+ * Copy into buffers for card to fetch via bus-mastering
+ */
+static int
+il3945_read_ucode(struct il_priv *il)
+{
+        const struct il_ucode_header *ucode;
+        int ret = -EINVAL, idx;
+        const struct firmware *ucode_raw;
+        /* firmware file name contains uCode/driver compatibility version */
+        const char *name_pre = il->cfg->fw_name_pre;
+        const unsigned int api_max = il->cfg->ucode_api_max;
+        const unsigned int api_min = il->cfg->ucode_api_min;
+        char buf[25];
+        u8 *src;
+        size_t len;
+        u32 api_ver, inst_size, data_size, init_size, init_data_size, boot_size;
+
+        /* Ask kernel firmware_class module to get the boot firmware off disk.
+         * request_firmware() is synchronous, file is in memory on return. */
+        for (idx = api_max; idx >= api_min; idx--) {
+                sprintf(buf, "%s%u%s", name_pre, idx, ".ucode");
+                ret = request_firmware(&ucode_raw, buf, &il->pci_dev->dev);
+                if (ret < 0) {
+                        IL_ERR("%s firmware file req failed: %d\n", buf, ret);
+                        if (ret == -ENOENT)
+                                continue;
+                        else
+                                goto error;
+                } else {
+                        if (idx < api_max)
+                                IL_ERR("Loaded firmware %s, "
+                                       "which is deprecated. "
+                                       " Please use API v%u instead.\n", buf,
+                                       api_max);
+                        D_INFO("Got firmware '%s' file "
+                               "(%zd bytes) from disk\n", buf, ucode_raw->size);
+                        break;
+                }
+        }
+
+        if (ret < 0)
+                goto error;
+
+        /* Make sure that we got at least our header! */
+        if (ucode_raw->size < il3945_ucode_get_header_size(1)) {
+                IL_ERR("File size way too small!\n");
+                ret = -EINVAL;
+                goto err_release;
+        }
+
+        /* Data from ucode file:  header followed by uCode images */
+        ucode = (struct il_ucode_header *)ucode_raw->data;
+
+        il->ucode_ver = le32_to_cpu(ucode->ver);
+        api_ver = IL_UCODE_API(il->ucode_ver);
+        inst_size = il3945_ucode_get_inst_size(ucode);
+        data_size = il3945_ucode_get_data_size(ucode);
+        init_size = il3945_ucode_get_init_size(ucode);
+        init_data_size = il3945_ucode_get_init_data_size(ucode);
+        boot_size = il3945_ucode_get_boot_size(ucode);
+        src = il3945_ucode_get_data(ucode);
+
+        /* api_ver should match the api version forming part of the
+         * firmware filename ... but we don't check for that and only rely
+         * on the API version read from firmware header from here on forward */
+
+        if (api_ver < api_min || api_ver > api_max) {
+                IL_ERR("Driver unable to support your firmware API. "
+                       "Driver supports v%u, firmware is v%u.\n", api_max,
+                       api_ver);
+                il->ucode_ver = 0;
+                ret = -EINVAL;
+                goto err_release;
+        }
+        if (api_ver != api_max)
+                IL_ERR("Firmware has old API version. Expected %u, "
+                       "got %u. New firmware can be obtained "
+                       "from http://www.intellinuxwireless.org.\n", api_max,
+                       api_ver);
+
+        IL_INFO("loaded firmware version %u.%u.%u.%u\n",
+                IL_UCODE_MAJOR(il->ucode_ver), IL_UCODE_MINOR(il->ucode_ver),
+                IL_UCODE_API(il->ucode_ver), IL_UCODE_SERIAL(il->ucode_ver));
+
+        snprintf(il->hw->wiphy->fw_version, sizeof(il->hw->wiphy->fw_version),
+                 "%u.%u.%u.%u", IL_UCODE_MAJOR(il->ucode_ver),
+                 IL_UCODE_MINOR(il->ucode_ver), IL_UCODE_API(il->ucode_ver),
+                 IL_UCODE_SERIAL(il->ucode_ver));
+
+        D_INFO("f/w package hdr ucode version raw = 0x%x\n", il->ucode_ver);
+        D_INFO("f/w package hdr runtime inst size = %u\n", inst_size);
+        D_INFO("f/w package hdr runtime data size = %u\n", data_size);
+        D_INFO("f/w package hdr init inst size = %u\n", init_size);
+        D_INFO("f/w package hdr init data size = %u\n", init_data_size);
+        D_INFO("f/w package hdr boot inst size = %u\n", boot_size);
+
+        /* Verify size of file vs. image size info in file's header */
+        if (ucode_raw->size !=
+            il3945_ucode_get_header_size(api_ver) + inst_size + data_size +
+            init_size + init_data_size + boot_size) {
+
+                D_INFO("uCode file size %zd does not match expected size\n",
+                       ucode_raw->size);
+                ret = -EINVAL;
+                goto err_release;
+        }
+
+        /* Verify that uCode images will fit in card's SRAM */
+        if (inst_size > IL39_MAX_INST_SIZE) {
+                D_INFO("uCode instr len %d too large to fit in\n", inst_size);
+                ret = -EINVAL;
+                goto err_release;
+        }
+
+        if (data_size > IL39_MAX_DATA_SIZE) {
+                D_INFO("uCode data len %d too large to fit in\n", data_size);
+                ret = -EINVAL;
+                goto err_release;
+        }
+        if (init_size > IL39_MAX_INST_SIZE) {
+                D_INFO("uCode init instr len %d too large to fit in\n",
+                       init_size);
+                ret = -EINVAL;
+                goto err_release;
+        }
+        if (init_data_size > IL39_MAX_DATA_SIZE) {
+                D_INFO("uCode init data len %d too large to fit in\n",
+                       init_data_size);
+                ret = -EINVAL;
+                goto err_release;
+        }
+        if (boot_size > IL39_MAX_BSM_SIZE) {
+                D_INFO("uCode boot instr len %d too large to fit in\n",
+                       boot_size);
+                ret = -EINVAL;
+                goto err_release;
+        }
+
+        /* Allocate ucode buffers for card's bus-master loading ... */
+
+        /* Runtime instructions and 2 copies of data:
+         * 1) unmodified from disk
+         * 2) backup cache for save/restore during power-downs */
+        il->ucode_code.len = inst_size;
+        il_alloc_fw_desc(il->pci_dev, &il->ucode_code);
+
+        il->ucode_data.len = data_size;
+        il_alloc_fw_desc(il->pci_dev, &il->ucode_data);
+
+        il->ucode_data_backup.len = data_size;
+        il_alloc_fw_desc(il->pci_dev, &il->ucode_data_backup);
+
+        if (!il->ucode_code.v_addr || !il->ucode_data.v_addr ||
+            !il->ucode_data_backup.v_addr)
+                goto err_pci_alloc;
+
+        /* Initialization instructions and data */
+        if (init_size && init_data_size) {
+                il->ucode_init.len = init_size;
+                il_alloc_fw_desc(il->pci_dev, &il->ucode_init);
+
+                il->ucode_init_data.len = init_data_size;
+                il_alloc_fw_desc(il->pci_dev, &il->ucode_init_data);
+
+                if (!il->ucode_init.v_addr || !il->ucode_init_data.v_addr)
+                        goto err_pci_alloc;
+        }
+
+        /* Bootstrap (instructions only, no data) */
+        if (boot_size) {
+                il->ucode_boot.len = boot_size;
+                il_alloc_fw_desc(il->pci_dev, &il->ucode_boot);
+
+                if (!il->ucode_boot.v_addr)
+                        goto err_pci_alloc;
+        }
+
+        /* Copy images into buffers for card's bus-master reads ... */
+
+        /* Runtime instructions (first block of data in file) */
+        len = inst_size;
+        D_INFO("Copying (but not loading) uCode instr len %zd\n", len);
+        memcpy(il->ucode_code.v_addr, src, len);
+        src += len;
+
+        D_INFO("uCode instr buf vaddr = 0x%p, paddr = 0x%08x\n",
+               il->ucode_code.v_addr, (u32) il->ucode_code.p_addr);
+
+        /* Runtime data (2nd block)
+         * NOTE:  Copy into backup buffer will be done in il3945_up()  */
+        len = data_size;
+        D_INFO("Copying (but not loading) uCode data len %zd\n", len);
+        memcpy(il->ucode_data.v_addr, src, len);
+        memcpy(il->ucode_data_backup.v_addr, src, len);
+        src += len;
+
+        /* Initialization instructions (3rd block) */
+        if (init_size) {
+                len = init_size;
+                D_INFO("Copying (but not loading) init instr len %zd\n", len);
+                memcpy(il->ucode_init.v_addr, src, len);
+                src += len;
+        }
+
+        /* Initialization data (4th block) */
+        if (init_data_size) {
+                len = init_data_size;
+                D_INFO("Copying (but not loading) init data len %zd\n", len);
+                memcpy(il->ucode_init_data.v_addr, src, len);
+                src += len;
+        }
+
+        /* Bootstrap instructions (5th block) */
+        len = boot_size;
+        D_INFO("Copying (but not loading) boot instr len %zd\n", len);
+        memcpy(il->ucode_boot.v_addr, src, len);
+
+        /* We have our copies now, allow OS release its copies */
+        release_firmware(ucode_raw);
+        return 0;
+
+err_pci_alloc:
+        IL_ERR("failed to allocate pci memory\n");
+        ret = -ENOMEM;
+        il3945_dealloc_ucode_pci(il);
+
+err_release:
+        release_firmware(ucode_raw);
+
+error:
+        return ret;
+}
+
+/**
+ * il3945_set_ucode_ptrs - Set uCode address location
+ *
+ * Tell initialization uCode where to find runtime uCode.
+ *
+ * BSM registers initially contain pointers to initialization uCode.
+ * We need to replace them to load runtime uCode inst and data,
+ * and to save runtime data when powering down.
+ */
+static int
+il3945_set_ucode_ptrs(struct il_priv *il)
+{
+        dma_addr_t pinst;
+        dma_addr_t pdata;
+
+        /* bits 31:0 for 3945 */
+        pinst = il->ucode_code.p_addr;
+        pdata = il->ucode_data_backup.p_addr;
+
+        /* Tell bootstrap uCode where to find image to load */
+        il_wr_prph(il, BSM_DRAM_INST_PTR_REG, pinst);
+        il_wr_prph(il, BSM_DRAM_DATA_PTR_REG, pdata);
+        il_wr_prph(il, BSM_DRAM_DATA_BYTECOUNT_REG, il->ucode_data.len);
+
+        /* Inst byte count must be last to set up, bit 31 signals uCode
+         *   that all new ptr/size info is in place */
+        il_wr_prph(il, BSM_DRAM_INST_BYTECOUNT_REG,
+                   il->ucode_code.len | BSM_DRAM_INST_LOAD);
+
+        D_INFO("Runtime uCode pointers are set.\n");
+
+        return 0;
+}
+
+/**
+ * il3945_init_alive_start - Called after N_ALIVE notification received
+ *
+ * Called after N_ALIVE notification received from "initialize" uCode.
+ *
+ * Tell "initialize" uCode to go ahead and load the runtime uCode.
+ */
+static void
+il3945_init_alive_start(struct il_priv *il)
+{
+        /* Check alive response for "valid" sign from uCode */
+        if (il->card_alive_init.is_valid != UCODE_VALID_OK) {
+                /* We had an error bringing up the hardware, so take it
+                 * all the way back down so we can try again */
+                D_INFO("Initialize Alive failed.\n");
+                goto restart;
+        }
+
+        /* Bootstrap uCode has loaded initialize uCode ... verify inst image.
+         * This is a paranoid check, because we would not have gotten the
+         * "initialize" alive if code weren't properly loaded.  */
+        if (il3945_verify_ucode(il)) {
+                /* Runtime instruction load was bad;
+                 * take it all the way back down so we can try again */
+                D_INFO("Bad \"initialize\" uCode load.\n");
+                goto restart;
+        }
+
+        /* Send pointers to protocol/runtime uCode image ... init code will
+         * load and launch runtime uCode, which will send us another "Alive"
+         * notification. */
+        D_INFO("Initialization Alive received.\n");
+        if (il3945_set_ucode_ptrs(il)) {
+                /* Runtime instruction load won't happen;
+                 * take it all the way back down so we can try again */
+                D_INFO("Couldn't set up uCode pointers.\n");
+                goto restart;
+        }
+        return;
+
+restart:
+        queue_work(il->workqueue, &il->restart);
+}
+
+/**
+ * il3945_alive_start - called after N_ALIVE notification received
+ *                   from protocol/runtime uCode (initialization uCode's
+ *                   Alive gets handled by il3945_init_alive_start()).
+ */
+static void
+il3945_alive_start(struct il_priv *il)
+{
+        int thermal_spin = 0;
+        u32 rfkill;
+        struct il_rxon_context *ctx = &il->ctx;
+
+        D_INFO("Runtime Alive received.\n");
+
+        if (il->card_alive.is_valid != UCODE_VALID_OK) {
+                /* We had an error bringing up the hardware, so take it
+                 * all the way back down so we can try again */
+                D_INFO("Alive failed.\n");
+                goto restart;
+        }
+
+        /* Initialize uCode has loaded Runtime uCode ... verify inst image.
+         * This is a paranoid check, because we would not have gotten the
+         * "runtime" alive if code weren't properly loaded.  */
+        if (il3945_verify_ucode(il)) {
+                /* Runtime instruction load was bad;
+                 * take it all the way back down so we can try again */
+                D_INFO("Bad runtime uCode load.\n");
+                goto restart;
+        }
+
+        rfkill = il_rd_prph(il, APMG_RFKILL_REG);
+        D_INFO("RFKILL status: 0x%x\n", rfkill);
+
+        if (rfkill & 0x1) {
+                clear_bit(S_RF_KILL_HW, &il->status);
+                /* if RFKILL is not on, then wait for thermal
+                 * sensor in adapter to kick in */
+                while (il3945_hw_get_temperature(il) == 0) {
+                        thermal_spin++;
+                        udelay(10);
+                }
+
+                if (thermal_spin)
+                        D_INFO("Thermal calibration took %dus\n",
+                               thermal_spin * 10);
+        } else
+                set_bit(S_RF_KILL_HW, &il->status);
+
+        /* After the ALIVE response, we can send commands to 3945 uCode */
+        set_bit(S_ALIVE, &il->status);
+
+        /* Enable watchdog to monitor the driver tx queues */
+        il_setup_watchdog(il);
+
+        if (il_is_rfkill(il))
+                return;
+
+        ieee80211_wake_queues(il->hw);
+
+        il->active_rate = RATES_MASK_3945;
+
+        il_power_update_mode(il, true);
+
+        if (il_is_associated(il)) {
+                struct il3945_rxon_cmd *active_rxon =
+                    (struct il3945_rxon_cmd *)(&ctx->active);
+
+                ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
+                active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+        } else {
+                /* Initialize our rx_config data */
+                il_connection_init_rx_config(il, ctx);
+        }
+
+        /* Configure Bluetooth device coexistence support */
+        il_send_bt_config(il);
+
+        set_bit(S_READY, &il->status);
+
+        /* Configure the adapter for unassociated operation */
+        il3945_commit_rxon(il, ctx);
+
+        il3945_reg_txpower_periodic(il);
+
+        D_INFO("ALIVE processing complete.\n");
+        wake_up(&il->wait_command_queue);
+
+        return;
+
+restart:
+        queue_work(il->workqueue, &il->restart);
+}
+
+static void il3945_cancel_deferred_work(struct il_priv *il);
+
+static void
+__il3945_down(struct il_priv *il)
+{
+        unsigned long flags;
+        int exit_pending;
+
+        D_INFO(DRV_NAME " is going down\n");
+
+        il_scan_cancel_timeout(il, 200);
+
+        exit_pending = test_and_set_bit(S_EXIT_PENDING, &il->status);
+
+        /* Stop TX queues watchdog. We need to have S_EXIT_PENDING bit set
+         * to prevent rearm timer */
+        del_timer_sync(&il->watchdog);
+
+        /* Station information will now be cleared in device */
+        il_clear_ucode_stations(il, NULL);
+        il_dealloc_bcast_stations(il);
+        il_clear_driver_stations(il);
+
+        /* Unblock any waiting calls */
+        wake_up_all(&il->wait_command_queue);
+
+        /* Wipe out the EXIT_PENDING status bit if we are not actually
+         * exiting the module */
+        if (!exit_pending)
+                clear_bit(S_EXIT_PENDING, &il->status);
+
+        /* stop and reset the on-board processor */
+        _il_wr(il, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
+
+        /* tell the device to stop sending interrupts */
+        spin_lock_irqsave(&il->lock, flags);
+        il_disable_interrupts(il);
+        spin_unlock_irqrestore(&il->lock, flags);
+        il3945_synchronize_irq(il);
+
+        if (il->mac80211_registered)
+                ieee80211_stop_queues(il->hw);
+
+        /* If we have not previously called il3945_init() then
+         * clear all bits but the RF Kill bits and return */
+        if (!il_is_init(il)) {
+                il->status =
+                    test_bit(S_RF_KILL_HW,
+                             &il->
+                             status) << S_RF_KILL_HW |
+                    test_bit(S_GEO_CONFIGURED,
+                             &il->
+                             status) << S_GEO_CONFIGURED |
+                    test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING;
+                goto exit;
+        }
+
+        /* ...otherwise clear out all the status bits but the RF Kill
+         * bit and continue taking the NIC down. */
+        il->status &=
+            test_bit(S_RF_KILL_HW,
+                     &il->status) << S_RF_KILL_HW | test_bit(S_GEO_CONFIGURED,
+                                                             &il->
+                                                             status) <<
+            S_GEO_CONFIGURED | test_bit(S_FW_ERROR,
+                                        &il->
+                                        status) << S_FW_ERROR |
+            test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING;
+
+        il3945_hw_txq_ctx_stop(il);
+        il3945_hw_rxq_stop(il);
+
+        /* Power-down device's busmaster DMA clocks */
+        il_wr_prph(il, APMG_CLK_DIS_REG, APMG_CLK_VAL_DMA_CLK_RQT);
+        udelay(5);
+
+        /* Stop the device, and put it in low power state */
+        il_apm_stop(il);
+
+exit:
+        memset(&il->card_alive, 0, sizeof(struct il_alive_resp));
+
+        if (il->beacon_skb)
+                dev_kfree_skb(il->beacon_skb);
+        il->beacon_skb = NULL;
+
+        /* clear out any free frames */
+        il3945_clear_free_frames(il);
+}
+
+static void
+il3945_down(struct il_priv *il)
+{
+        mutex_lock(&il->mutex);
+        __il3945_down(il);
+        mutex_unlock(&il->mutex);
+
+        il3945_cancel_deferred_work(il);
+}
+
+#define MAX_HW_RESTARTS 5
+
+static int
+il3945_alloc_bcast_station(struct il_priv *il)
+{
+        struct il_rxon_context *ctx = &il->ctx;
+        unsigned long flags;
+        u8 sta_id;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        sta_id = il_prep_station(il, ctx, il_bcast_addr, false, NULL);
+        if (sta_id == IL_INVALID_STATION) {
+                IL_ERR("Unable to prepare broadcast station\n");
+                spin_unlock_irqrestore(&il->sta_lock, flags);
+
+                return -EINVAL;
+        }
+
+        il->stations[sta_id].used |= IL_STA_DRIVER_ACTIVE;
+        il->stations[sta_id].used |= IL_STA_BCAST;
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        return 0;
+}
+
+static int
+__il3945_up(struct il_priv *il)
+{
+        int rc, i;
+
+        rc = il3945_alloc_bcast_station(il);
+        if (rc)
+                return rc;
+
+        if (test_bit(S_EXIT_PENDING, &il->status)) {
+                IL_WARN("Exit pending; will not bring the NIC up\n");
+                return -EIO;
+        }
+
+        if (!il->ucode_data_backup.v_addr || !il->ucode_data.v_addr) {
+                IL_ERR("ucode not available for device bring up\n");
+                return -EIO;
+        }
+
+        /* If platform's RF_KILL switch is NOT set to KILL */
+        if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
+                clear_bit(S_RF_KILL_HW, &il->status);
+        else {
+                set_bit(S_RF_KILL_HW, &il->status);
+                IL_WARN("Radio disabled by HW RF Kill switch\n");
+                return -ENODEV;
+        }
+
+        _il_wr(il, CSR_INT, 0xFFFFFFFF);
+
+        rc = il3945_hw_nic_init(il);
+        if (rc) {
+                IL_ERR("Unable to int nic\n");
+                return rc;
+        }
+
+        /* make sure rfkill handshake bits are cleared */
+        _il_wr(il, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
+        _il_wr(il, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
+
+        /* clear (again), then enable host interrupts */
+        _il_wr(il, CSR_INT, 0xFFFFFFFF);
+        il_enable_interrupts(il);
+
+        /* really make sure rfkill handshake bits are cleared */
+        _il_wr(il, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
+        _il_wr(il, 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
+         * data SRAM for a clean start when the runtime program first loads. */
+        memcpy(il->ucode_data_backup.v_addr, il->ucode_data.v_addr,
+               il->ucode_data.len);
+
+        /* We return success when we resume from suspend and rf_kill is on. */
+        if (test_bit(S_RF_KILL_HW, &il->status))
+                return 0;
+
+        for (i = 0; i < MAX_HW_RESTARTS; i++) {
+
+                /* load bootstrap state machine,
+                 * load bootstrap program into processor's memory,
+                 * prepare to load the "initialize" uCode */
+                rc = il->cfg->ops->lib->load_ucode(il);
+
+                if (rc) {
+                        IL_ERR("Unable to set up bootstrap uCode: %d\n", rc);
+                        continue;
+                }
+
+                /* start card; "initialize" will load runtime ucode */
+                il3945_nic_start(il);
+
+                D_INFO(DRV_NAME " is coming up\n");
+
+                return 0;
+        }
+
+        set_bit(S_EXIT_PENDING, &il->status);
+        __il3945_down(il);
+        clear_bit(S_EXIT_PENDING, &il->status);
+
+        /* tried to restart and config the device for as long as our
+         * patience could withstand */
+        IL_ERR("Unable to initialize device after %d attempts.\n", i);
+        return -EIO;
+}
+
+/*****************************************************************************
+ *
+ * Workqueue callbacks
+ *
+ *****************************************************************************/
+
+static void
+il3945_bg_init_alive_start(struct work_struct *data)
+{
+        struct il_priv *il =
+            container_of(data, struct il_priv, init_alive_start.work);
+
+        mutex_lock(&il->mutex);
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                goto out;
+
+        il3945_init_alive_start(il);
+out:
+        mutex_unlock(&il->mutex);
+}
+
+static void
+il3945_bg_alive_start(struct work_struct *data)
+{
+        struct il_priv *il =
+            container_of(data, struct il_priv, alive_start.work);
+
+        mutex_lock(&il->mutex);
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                goto out;
+
+        il3945_alive_start(il);
+out:
+        mutex_unlock(&il->mutex);
+}
+
+/*
+ * 3945 cannot interrupt driver when hardware rf kill switch toggles;
+ * driver must poll CSR_GP_CNTRL_REG register for change.  This register
+ * *is* readable even when device has been SW_RESET into low power mode
+ * (e.g. during RF KILL).
+ */
+static void
+il3945_rfkill_poll(struct work_struct *data)
+{
+        struct il_priv *il =
+            container_of(data, struct il_priv, _3945.rfkill_poll.work);
+        bool old_rfkill = test_bit(S_RF_KILL_HW, &il->status);
+        bool new_rfkill =
+            !(_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW);
+
+        if (new_rfkill != old_rfkill) {
+                if (new_rfkill)
+                        set_bit(S_RF_KILL_HW, &il->status);
+                else
+                        clear_bit(S_RF_KILL_HW, &il->status);
+
+                wiphy_rfkill_set_hw_state(il->hw->wiphy, new_rfkill);
+
+                D_RF_KILL("RF_KILL bit toggled to %s.\n",
+                          new_rfkill ? "disable radio" : "enable radio");
+        }
+
+        /* Keep this running, even if radio now enabled.  This will be
+         * cancelled in mac_start() if system decides to start again */
+        queue_delayed_work(il->workqueue, &il->_3945.rfkill_poll,
+                           round_jiffies_relative(2 * HZ));
+
+}
+
+int
+il3945_request_scan(struct il_priv *il, struct ieee80211_vif *vif)
+{
+        struct il_host_cmd cmd = {
+                .id = C_SCAN,
+                .len = sizeof(struct il3945_scan_cmd),
+                .flags = CMD_SIZE_HUGE,
+        };
+        struct il3945_scan_cmd *scan;
+        u8 n_probes = 0;
+        enum ieee80211_band band;
+        bool is_active = false;
+        int ret;
+        u16 len;
+
+        lockdep_assert_held(&il->mutex);
+
+        if (!il->scan_cmd) {
+                il->scan_cmd =
+                    kmalloc(sizeof(struct il3945_scan_cmd) + IL_MAX_SCAN_SIZE,
+                            GFP_KERNEL);
+                if (!il->scan_cmd) {
+                        D_SCAN("Fail to allocate scan memory\n");
+                        return -ENOMEM;
+                }
+        }
+        scan = il->scan_cmd;
+        memset(scan, 0, sizeof(struct il3945_scan_cmd) + IL_MAX_SCAN_SIZE);
+
+        scan->quiet_plcp_th = IL_PLCP_QUIET_THRESH;
+        scan->quiet_time = IL_ACTIVE_QUIET_TIME;
+
+        if (il_is_associated(il)) {
+                u16 interval;
+                u32 extra;
+                u32 suspend_time = 100;
+                u32 scan_suspend_time = 100;
+
+                D_INFO("Scanning while associated...\n");
+
+                interval = vif->bss_conf.beacon_int;
+
+                scan->suspend_time = 0;
+                scan->max_out_time = cpu_to_le32(200 * 1024);
+                if (!interval)
+                        interval = suspend_time;
+                /*
+                 * suspend time format:
+                 *  0-19: beacon interval in usec (time before exec.)
+                 * 20-23: 0
+                 * 24-31: number of beacons (suspend between channels)
+                 */
+
+                extra = (suspend_time / interval) << 24;
+                scan_suspend_time =
+                    0xFF0FFFFF & (extra | ((suspend_time % interval) * 1024));
+
+                scan->suspend_time = cpu_to_le32(scan_suspend_time);
+                D_SCAN("suspend_time 0x%X beacon interval %d\n",
+                       scan_suspend_time, interval);
+        }
+
+        if (il->scan_request->n_ssids) {
+                int i, p = 0;
+                D_SCAN("Kicking off active scan\n");
+                for (i = 0; i < il->scan_request->n_ssids; i++) {
+                        /* always does wildcard anyway */
+                        if (!il->scan_request->ssids[i].ssid_len)
+                                continue;
+                        scan->direct_scan[p].id = WLAN_EID_SSID;
+                        scan->direct_scan[p].len =
+                            il->scan_request->ssids[i].ssid_len;
+                        memcpy(scan->direct_scan[p].ssid,
+                               il->scan_request->ssids[i].ssid,
+                               il->scan_request->ssids[i].ssid_len);
+                        n_probes++;
+                        p++;
+                }
+                is_active = true;
+        } else
+                D_SCAN("Kicking off passive scan.\n");
+
+        /* 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.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK;
+        scan->tx_cmd.sta_id = il->ctx.bcast_sta_id;
+        scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
+
+        /* flags + rate selection */
+
+        switch (il->scan_band) {
+        case IEEE80211_BAND_2GHZ:
+                scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK;
+                scan->tx_cmd.rate = RATE_1M_PLCP;
+                band = IEEE80211_BAND_2GHZ;
+                break;
+        case IEEE80211_BAND_5GHZ:
+                scan->tx_cmd.rate = RATE_6M_PLCP;
+                band = IEEE80211_BAND_5GHZ;
+                break;
+        default:
+                IL_WARN("Invalid scan band\n");
+                return -EIO;
+        }
+
+        /*
+         * If active scaning is requested but a certain channel
+         * is marked passive, we can do active scanning if we
+         * detect transmissions.
+         */
+        scan->good_CRC_th =
+            is_active ? IL_GOOD_CRC_TH_DEFAULT : IL_GOOD_CRC_TH_DISABLED;
+
+        len =
+            il_fill_probe_req(il, (struct ieee80211_mgmt *)scan->data,
+                              vif->addr, il->scan_request->ie,
+                              il->scan_request->ie_len,
+                              IL_MAX_SCAN_SIZE - sizeof(*scan));
+        scan->tx_cmd.len = cpu_to_le16(len);
+
+        /* select Rx antennas */
+        scan->flags |= il3945_get_antenna_flags(il);
+
+        scan->channel_count =
+            il3945_get_channels_for_scan(il, band, is_active, n_probes,
+                                         (void *)&scan->data[len], vif);
+        if (scan->channel_count == 0) {
+                D_SCAN("channel count %d\n", scan->channel_count);
+                return -EIO;
+        }
+
+        cmd.len +=
+            le16_to_cpu(scan->tx_cmd.len) +
+            scan->channel_count * sizeof(struct il3945_scan_channel);
+        cmd.data = scan;
+        scan->len = cpu_to_le16(cmd.len);
+
+        set_bit(S_SCAN_HW, &il->status);
+        ret = il_send_cmd_sync(il, &cmd);
+        if (ret)
+                clear_bit(S_SCAN_HW, &il->status);
+        return ret;
+}
+
+void
+il3945_post_scan(struct il_priv *il)
+{
+        struct il_rxon_context *ctx = &il->ctx;
+
+        /*
+         * Since setting the RXON may have been deferred while
+         * performing the scan, fire one off if needed
+         */
+        if (memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging)))
+                il3945_commit_rxon(il, ctx);
+}
+
+static void
+il3945_bg_restart(struct work_struct *data)
+{
+        struct il_priv *il = container_of(data, struct il_priv, restart);
+
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                return;
+
+        if (test_and_clear_bit(S_FW_ERROR, &il->status)) {
+                mutex_lock(&il->mutex);
+                il->ctx.vif = NULL;
+                il->is_open = 0;
+                mutex_unlock(&il->mutex);
+                il3945_down(il);
+                ieee80211_restart_hw(il->hw);
+        } else {
+                il3945_down(il);
+
+                mutex_lock(&il->mutex);
+                if (test_bit(S_EXIT_PENDING, &il->status)) {
+                        mutex_unlock(&il->mutex);
+                        return;
+                }
+
+                __il3945_up(il);
+                mutex_unlock(&il->mutex);
+        }
+}
+
+static void
+il3945_bg_rx_replenish(struct work_struct *data)
+{
+        struct il_priv *il = container_of(data, struct il_priv, rx_replenish);
+
+        mutex_lock(&il->mutex);
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                goto out;
+
+        il3945_rx_replenish(il);
+out:
+        mutex_unlock(&il->mutex);
+}
+
+void
+il3945_post_associate(struct il_priv *il)
+{
+        int rc = 0;
+        struct ieee80211_conf *conf = NULL;
+        struct il_rxon_context *ctx = &il->ctx;
+
+        if (!ctx->vif || !il->is_open)
+                return;
+
+        D_ASSOC("Associated as %d to: %pM\n", ctx->vif->bss_conf.aid,
+                ctx->active.bssid_addr);
+
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                return;
+
+        il_scan_cancel_timeout(il, 200);
+
+        conf = &il->hw->conf;
+
+        ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+        il3945_commit_rxon(il, ctx);
+
+        rc = il_send_rxon_timing(il, ctx);
+        if (rc)
+                IL_WARN("C_RXON_TIMING failed - " "Attempting to continue.\n");
+
+        ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
+
+        ctx->staging.assoc_id = cpu_to_le16(ctx->vif->bss_conf.aid);
+
+        D_ASSOC("assoc id %d beacon interval %d\n", ctx->vif->bss_conf.aid,
+                ctx->vif->bss_conf.beacon_int);
+
+        if (ctx->vif->bss_conf.use_short_preamble)
+                ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
+        else
+                ctx->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
+
+        if (ctx->staging.flags & RXON_FLG_BAND_24G_MSK) {
+                if (ctx->vif->bss_conf.use_short_slot)
+                        ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
+                else
+                        ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
+        }
+
+        il3945_commit_rxon(il, ctx);
+
+        switch (ctx->vif->type) {
+        case NL80211_IFTYPE_STATION:
+                il3945_rate_scale_init(il->hw, IL_AP_ID);
+                break;
+        case NL80211_IFTYPE_ADHOC:
+                il3945_send_beacon_cmd(il);
+                break;
+        default:
+                IL_ERR("%s Should not be called in %d mode\n", __func__,
+                       ctx->vif->type);
+                break;
+        }
+}
+
+/*****************************************************************************
+ *
+ * mac80211 entry point functions
+ *
+ *****************************************************************************/
+
+#define UCODE_READY_TIMEOUT     (2 * HZ)
+
+static int
+il3945_mac_start(struct ieee80211_hw *hw)
+{
+        struct il_priv *il = hw->priv;
+        int ret;
+
+        D_MAC80211("enter\n");
+
+        /* we should be verifying the device is ready to be opened */
+        mutex_lock(&il->mutex);
+
+        /* fetch ucode file from disk, alloc and copy to bus-master buffers ...
+         * ucode filename and max sizes are card-specific. */
+
+        if (!il->ucode_code.len) {
+                ret = il3945_read_ucode(il);
+                if (ret) {
+                        IL_ERR("Could not read microcode: %d\n", ret);
+                        mutex_unlock(&il->mutex);
+                        goto out_release_irq;
+                }
+        }
+
+        ret = __il3945_up(il);
+
+        mutex_unlock(&il->mutex);
+
+        if (ret)
+                goto out_release_irq;
+
+        D_INFO("Start UP work.\n");
+
+        /* Wait for START_ALIVE from ucode. Otherwise callbacks from
+         * mac80211 will not be run successfully. */
+        ret = wait_event_timeout(il->wait_command_queue,
+                                 test_bit(S_READY, &il->status),
+                                 UCODE_READY_TIMEOUT);
+        if (!ret) {
+                if (!test_bit(S_READY, &il->status)) {
+                        IL_ERR("Wait for START_ALIVE timeout after %dms.\n",
+                               jiffies_to_msecs(UCODE_READY_TIMEOUT));
+                        ret = -ETIMEDOUT;
+                        goto out_release_irq;
+                }
+        }
+
+        /* ucode is running and will send rfkill notifications,
+         * no need to poll the killswitch state anymore */
+        cancel_delayed_work(&il->_3945.rfkill_poll);
+
+        il->is_open = 1;
+        D_MAC80211("leave\n");
+        return 0;
+
+out_release_irq:
+        il->is_open = 0;
+        D_MAC80211("leave - failed\n");
+        return ret;
+}
+
+static void
+il3945_mac_stop(struct ieee80211_hw *hw)
+{
+        struct il_priv *il = hw->priv;
+
+        D_MAC80211("enter\n");
+
+        if (!il->is_open) {
+                D_MAC80211("leave - skip\n");
+                return;
+        }
+
+        il->is_open = 0;
+
+        il3945_down(il);
+
+        flush_workqueue(il->workqueue);
+
+        /* start polling the killswitch state again */
+        queue_delayed_work(il->workqueue, &il->_3945.rfkill_poll,
+                           round_jiffies_relative(2 * HZ));
+
+        D_MAC80211("leave\n");
+}
+
+static void
+il3945_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
+{
+        struct il_priv *il = hw->priv;
+
+        D_MAC80211("enter\n");
+
+        D_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len,
+             ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate);
+
+        if (il3945_tx_skb(il, skb))
+                dev_kfree_skb_any(skb);
+
+        D_MAC80211("leave\n");
+}
+
+void
+il3945_config_ap(struct il_priv *il)
+{
+        struct il_rxon_context *ctx = &il->ctx;
+        struct ieee80211_vif *vif = ctx->vif;
+        int rc = 0;
+
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                return;
+
+        /* The following should be done only at AP bring up */
+        if (!(il_is_associated(il))) {
+
+                /* RXON - unassoc (to set timing command) */
+                ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+                il3945_commit_rxon(il, ctx);
+
+                /* RXON Timing */
+                rc = il_send_rxon_timing(il, ctx);
+                if (rc)
+                        IL_WARN("C_RXON_TIMING failed - "
+                                "Attempting to continue.\n");
+
+                ctx->staging.assoc_id = 0;
+
+                if (vif->bss_conf.use_short_preamble)
+                        ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
+                else
+                        ctx->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
+
+                if (ctx->staging.flags & RXON_FLG_BAND_24G_MSK) {
+                        if (vif->bss_conf.use_short_slot)
+                                ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
+                        else
+                                ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
+                }
+                /* restore RXON assoc */
+                ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
+                il3945_commit_rxon(il, ctx);
+        }
+        il3945_send_beacon_cmd(il);
+}
+
+static int
+il3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+                   struct ieee80211_vif *vif, struct ieee80211_sta *sta,
+                   struct ieee80211_key_conf *key)
+{
+        struct il_priv *il = hw->priv;
+        int ret = 0;
+        u8 sta_id = IL_INVALID_STATION;
+        u8 static_key;
+
+        D_MAC80211("enter\n");
+
+        if (il3945_mod_params.sw_crypto) {
+                D_MAC80211("leave - hwcrypto disabled\n");
+                return -EOPNOTSUPP;
+        }
+
+        /*
+         * To support IBSS RSN, don't program group keys in IBSS, the
+         * hardware will then not attempt to decrypt the frames.
+         */
+        if (vif->type == NL80211_IFTYPE_ADHOC &&
+            !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))
+                return -EOPNOTSUPP;
+
+        static_key = !il_is_associated(il);
+
+        if (!static_key) {
+                sta_id = il_sta_id_or_broadcast(il, &il->ctx, sta);
+                if (sta_id == IL_INVALID_STATION)
+                        return -EINVAL;
+        }
+
+        mutex_lock(&il->mutex);
+        il_scan_cancel_timeout(il, 100);
+
+        switch (cmd) {
+        case SET_KEY:
+                if (static_key)
+                        ret = il3945_set_static_key(il, key);
+                else
+                        ret = il3945_set_dynamic_key(il, key, sta_id);
+                D_MAC80211("enable hwcrypto key\n");
+                break;
+        case DISABLE_KEY:
+                if (static_key)
+                        ret = il3945_remove_static_key(il);
+                else
+                        ret = il3945_clear_sta_key_info(il, sta_id);
+                D_MAC80211("disable hwcrypto key\n");
+                break;
+        default:
+                ret = -EINVAL;
+        }
+
+        mutex_unlock(&il->mutex);
+        D_MAC80211("leave\n");
+
+        return ret;
+}
+
+static int
+il3945_mac_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                   struct ieee80211_sta *sta)
+{
+        struct il_priv *il = hw->priv;
+        struct il3945_sta_priv *sta_priv = (void *)sta->drv_priv;
+        int ret;
+        bool is_ap = vif->type == NL80211_IFTYPE_STATION;
+        u8 sta_id;
+
+        D_INFO("received request to add station %pM\n", sta->addr);
+        mutex_lock(&il->mutex);
+        D_INFO("proceeding to add station %pM\n", sta->addr);
+        sta_priv->common.sta_id = IL_INVALID_STATION;
+
+        ret =
+            il_add_station_common(il, &il->ctx, sta->addr, is_ap, sta, &sta_id);
+        if (ret) {
+                IL_ERR("Unable to add station %pM (%d)\n", sta->addr, ret);
+                /* Should we return success if return code is EEXIST ? */
+                mutex_unlock(&il->mutex);
+                return ret;
+        }
+
+        sta_priv->common.sta_id = sta_id;
+
+        /* Initialize rate scaling */
+        D_INFO("Initializing rate scaling for station %pM\n", sta->addr);
+        il3945_rs_rate_init(il, sta, sta_id);
+        mutex_unlock(&il->mutex);
+
+        return 0;
+}
+
+static void
+il3945_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags,
+                        unsigned int *total_flags, u64 multicast)
+{
+        struct il_priv *il = hw->priv;
+        __le32 filter_or = 0, filter_nand = 0;
+        struct il_rxon_context *ctx = &il->ctx;
+
+#define CHK(test, flag) do { \
+        if (*total_flags & (test))              \
+                filter_or |= (flag);            \
+        else                                    \
+                filter_nand |= (flag);          \
+        } while (0)
+
+        D_MAC80211("Enter: changed: 0x%x, total: 0x%x\n", changed_flags,
+                   *total_flags);
+
+        CHK(FIF_OTHER_BSS | FIF_PROMISC_IN_BSS, RXON_FILTER_PROMISC_MSK);
+        CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK);
+        CHK(FIF_BCN_PRBRESP_PROMISC, RXON_FILTER_BCON_AWARE_MSK);
+
+#undef CHK
+
+        mutex_lock(&il->mutex);
+
+        ctx->staging.filter_flags &= ~filter_nand;
+        ctx->staging.filter_flags |= filter_or;
+
+        /*
+         * Not committing directly because hardware can perform a scan,
+         * but even if hw is ready, committing here breaks for some reason,
+         * we'll eventually commit the filter flags change anyway.
+         */
+
+        mutex_unlock(&il->mutex);
+
+        /*
+         * Receiving all multicast frames is always enabled by the
+         * default flags setup in il_connection_init_rx_config()
+         * since we currently do not support programming multicast
+         * filters into the device.
+         */
+        *total_flags &=
+            FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |
+            FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
+}
+
+/*****************************************************************************
+ *
+ * sysfs attributes
+ *
+ *****************************************************************************/
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+
+/*
+ * The following adds a new attribute to the sysfs representation
+ * of this device driver (i.e. a new file in /sys/bus/pci/drivers/iwl/)
+ * used for controlling the debug level.
+ *
+ * See the level definitions in iwl for details.
+ *
+ * The debug_level being managed using sysfs below is a per device debug
+ * level that is used instead of the global debug level if it (the per
+ * device debug level) is set.
+ */
+static ssize_t
+il3945_show_debug_level(struct device *d, struct device_attribute *attr,
+                        char *buf)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+        return sprintf(buf, "0x%08X\n", il_get_debug_level(il));
+}
+
+static ssize_t
+il3945_store_debug_level(struct device *d, struct device_attribute *attr,
+                         const char *buf, size_t count)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+        unsigned long val;
+        int ret;
+
+        ret = strict_strtoul(buf, 0, &val);
+        if (ret)
+                IL_INFO("%s is not in hex or decimal form.\n", buf);
+        else {
+                il->debug_level = val;
+                if (il_alloc_traffic_mem(il))
+                        IL_ERR("Not enough memory to generate traffic log\n");
+        }
+        return strnlen(buf, count);
+}
+
+static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO, il3945_show_debug_level,
+                   il3945_store_debug_level);
+
+#endif /* CONFIG_IWLEGACY_DEBUG */
+
+static ssize_t
+il3945_show_temperature(struct device *d, struct device_attribute *attr,
+                        char *buf)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+
+        if (!il_is_alive(il))
+                return -EAGAIN;
+
+        return sprintf(buf, "%d\n", il3945_hw_get_temperature(il));
+}
+
+static DEVICE_ATTR(temperature, S_IRUGO, il3945_show_temperature, NULL);
+
+static ssize_t
+il3945_show_tx_power(struct device *d, struct device_attribute *attr, char *buf)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+        return sprintf(buf, "%d\n", il->tx_power_user_lmt);
+}
+
+static ssize_t
+il3945_store_tx_power(struct device *d, struct device_attribute *attr,
+                      const char *buf, size_t count)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+        char *p = (char *)buf;
+        u32 val;
+
+        val = simple_strtoul(p, &p, 10);
+        if (p == buf)
+                IL_INFO(": %s is not in decimal form.\n", buf);
+        else
+                il3945_hw_reg_set_txpower(il, val);
+
+        return count;
+}
+
+static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO, il3945_show_tx_power,
+                   il3945_store_tx_power);
+
+static ssize_t
+il3945_show_flags(struct device *d, struct device_attribute *attr, char *buf)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+        struct il_rxon_context *ctx = &il->ctx;
+
+        return sprintf(buf, "0x%04X\n", ctx->active.flags);
+}
+
+static ssize_t
+il3945_store_flags(struct device *d, struct device_attribute *attr,
+                   const char *buf, size_t count)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+        u32 flags = simple_strtoul(buf, NULL, 0);
+        struct il_rxon_context *ctx = &il->ctx;
+
+        mutex_lock(&il->mutex);
+        if (le32_to_cpu(ctx->staging.flags) != flags) {
+                /* Cancel any currently running scans... */
+                if (il_scan_cancel_timeout(il, 100))
+                        IL_WARN("Could not cancel scan.\n");
+                else {
+                        D_INFO("Committing rxon.flags = 0x%04X\n", flags);
+                        ctx->staging.flags = cpu_to_le32(flags);
+                        il3945_commit_rxon(il, ctx);
+                }
+        }
+        mutex_unlock(&il->mutex);
+
+        return count;
+}
+
+static DEVICE_ATTR(flags, S_IWUSR | S_IRUGO, il3945_show_flags,
+                   il3945_store_flags);
+
+static ssize_t
+il3945_show_filter_flags(struct device *d, struct device_attribute *attr,
+                         char *buf)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+        struct il_rxon_context *ctx = &il->ctx;
+
+        return sprintf(buf, "0x%04X\n", le32_to_cpu(ctx->active.filter_flags));
+}
+
+static ssize_t
+il3945_store_filter_flags(struct device *d, struct device_attribute *attr,
+                          const char *buf, size_t count)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+        struct il_rxon_context *ctx = &il->ctx;
+        u32 filter_flags = simple_strtoul(buf, NULL, 0);
+
+        mutex_lock(&il->mutex);
+        if (le32_to_cpu(ctx->staging.filter_flags) != filter_flags) {
+                /* Cancel any currently running scans... */
+                if (il_scan_cancel_timeout(il, 100))
+                        IL_WARN("Could not cancel scan.\n");
+                else {
+                        D_INFO("Committing rxon.filter_flags = " "0x%04X\n",
+                               filter_flags);
+                        ctx->staging.filter_flags = cpu_to_le32(filter_flags);
+                        il3945_commit_rxon(il, ctx);
+                }
+        }
+        mutex_unlock(&il->mutex);
+
+        return count;
+}
+
+static DEVICE_ATTR(filter_flags, S_IWUSR | S_IRUGO, il3945_show_filter_flags,
+                   il3945_store_filter_flags);
+
+static ssize_t
+il3945_show_measurement(struct device *d, struct device_attribute *attr,
+                        char *buf)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+        struct il_spectrum_notification measure_report;
+        u32 size = sizeof(measure_report), len = 0, ofs = 0;
+        u8 *data = (u8 *) &measure_report;
+        unsigned long flags;
+
+        spin_lock_irqsave(&il->lock, flags);
+        if (!(il->measurement_status & MEASUREMENT_READY)) {
+                spin_unlock_irqrestore(&il->lock, flags);
+                return 0;
+        }
+        memcpy(&measure_report, &il->measure_report, size);
+        il->measurement_status = 0;
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        while (size && PAGE_SIZE - len) {
+                hex_dump_to_buffer(data + ofs, size, 16, 1, buf + len,
+                                   PAGE_SIZE - len, 1);
+                len = strlen(buf);
+                if (PAGE_SIZE - len)
+                        buf[len++] = '\n';
+
+                ofs += 16;
+                size -= min(size, 16U);
+        }
+
+        return len;
+}
+
+static ssize_t
+il3945_store_measurement(struct device *d, struct device_attribute *attr,
+                         const char *buf, size_t count)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+        struct il_rxon_context *ctx = &il->ctx;
+        struct ieee80211_measurement_params params = {
+                .channel = le16_to_cpu(ctx->active.channel),
+                .start_time = cpu_to_le64(il->_3945.last_tsf),
+                .duration = cpu_to_le16(1),
+        };
+        u8 type = IL_MEASURE_BASIC;
+        u8 buffer[32];
+        u8 channel;
+
+        if (count) {
+                char *p = buffer;
+                strncpy(buffer, buf, min(sizeof(buffer), count));
+                channel = simple_strtoul(p, NULL, 0);
+                if (channel)
+                        params.channel = channel;
+
+                p = buffer;
+                while (*p && *p != ' ')
+                        p++;
+                if (*p)
+                        type = simple_strtoul(p + 1, NULL, 0);
+        }
+
+        D_INFO("Invoking measurement of type %d on " "channel %d (for '%s')\n",
+               type, params.channel, buf);
+        il3945_get_measurement(il, &params, type);
+
+        return count;
+}
+
+static DEVICE_ATTR(measurement, S_IRUSR | S_IWUSR, il3945_show_measurement,
+                   il3945_store_measurement);
+
+static ssize_t
+il3945_store_retry_rate(struct device *d, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+
+        il->retry_rate = simple_strtoul(buf, NULL, 0);
+        if (il->retry_rate <= 0)
+                il->retry_rate = 1;
+
+        return count;
+}
+
+static ssize_t
+il3945_show_retry_rate(struct device *d, struct device_attribute *attr,
+                       char *buf)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+        return sprintf(buf, "%d", il->retry_rate);
+}
+
+static DEVICE_ATTR(retry_rate, S_IWUSR | S_IRUSR, il3945_show_retry_rate,
+                   il3945_store_retry_rate);
+
+static ssize_t
+il3945_show_channels(struct device *d, struct device_attribute *attr, char *buf)
+{
+        /* all this shit doesn't belong into sysfs anyway */
+        return 0;
+}
+
+static DEVICE_ATTR(channels, S_IRUSR, il3945_show_channels, NULL);
+
+static ssize_t
+il3945_show_antenna(struct device *d, struct device_attribute *attr, char *buf)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+
+        if (!il_is_alive(il))
+                return -EAGAIN;
+
+        return sprintf(buf, "%d\n", il3945_mod_params.antenna);
+}
+
+static ssize_t
+il3945_store_antenna(struct device *d, struct device_attribute *attr,
+                     const char *buf, size_t count)
+{
+        struct il_priv *il __maybe_unused = dev_get_drvdata(d);
+        int ant;
+
+        if (count == 0)
+                return 0;
+
+        if (sscanf(buf, "%1i", &ant) != 1) {
+                D_INFO("not in hex or decimal form.\n");
+                return count;
+        }
+
+        if (ant >= 0 && ant <= 2) {
+                D_INFO("Setting antenna select to %d.\n", ant);
+                il3945_mod_params.antenna = (enum il3945_antenna)ant;
+        } else
+                D_INFO("Bad antenna select value %d.\n", ant);
+
+        return count;
+}
+
+static DEVICE_ATTR(antenna, S_IWUSR | S_IRUGO, il3945_show_antenna,
+                   il3945_store_antenna);
+
+static ssize_t
+il3945_show_status(struct device *d, struct device_attribute *attr, char *buf)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+        if (!il_is_alive(il))
+                return -EAGAIN;
+        return sprintf(buf, "0x%08x\n", (int)il->status);
+}
+
+static DEVICE_ATTR(status, S_IRUGO, il3945_show_status, NULL);
+
+static ssize_t
+il3945_dump_error_log(struct device *d, struct device_attribute *attr,
+                      const char *buf, size_t count)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+        char *p = (char *)buf;
+
+        if (p[0] == '1')
+                il3945_dump_nic_error_log(il);
+
+        return strnlen(buf, count);
+}
+
+static DEVICE_ATTR(dump_errors, S_IWUSR, NULL, il3945_dump_error_log);
+
+/*****************************************************************************
+ *
+ * driver setup and tear down
+ *
+ *****************************************************************************/
+
+static void
+il3945_setup_deferred_work(struct il_priv *il)
+{
+        il->workqueue = create_singlethread_workqueue(DRV_NAME);
+
+        init_waitqueue_head(&il->wait_command_queue);
+
+        INIT_WORK(&il->restart, il3945_bg_restart);
+        INIT_WORK(&il->rx_replenish, il3945_bg_rx_replenish);
+        INIT_DELAYED_WORK(&il->init_alive_start, il3945_bg_init_alive_start);
+        INIT_DELAYED_WORK(&il->alive_start, il3945_bg_alive_start);
+        INIT_DELAYED_WORK(&il->_3945.rfkill_poll, il3945_rfkill_poll);
+
+        il_setup_scan_deferred_work(il);
+
+        il3945_hw_setup_deferred_work(il);
+
+        init_timer(&il->watchdog);
+        il->watchdog.data = (unsigned long)il;
+        il->watchdog.function = il_bg_watchdog;
+
+        tasklet_init(&il->irq_tasklet,
+                     (void (*)(unsigned long))il3945_irq_tasklet,
+                     (unsigned long)il);
+}
+
+static void
+il3945_cancel_deferred_work(struct il_priv *il)
+{
+        il3945_hw_cancel_deferred_work(il);
+
+        cancel_delayed_work_sync(&il->init_alive_start);
+        cancel_delayed_work(&il->alive_start);
+
+        il_cancel_scan_deferred_work(il);
+}
+
+static struct attribute *il3945_sysfs_entries[] = {
+        &dev_attr_antenna.attr,
+        &dev_attr_channels.attr,
+        &dev_attr_dump_errors.attr,
+        &dev_attr_flags.attr,
+        &dev_attr_filter_flags.attr,
+        &dev_attr_measurement.attr,
+        &dev_attr_retry_rate.attr,
+        &dev_attr_status.attr,
+        &dev_attr_temperature.attr,
+        &dev_attr_tx_power.attr,
+#ifdef CONFIG_IWLEGACY_DEBUG
+        &dev_attr_debug_level.attr,
+#endif
+        NULL
+};
+
+static struct attribute_group il3945_attribute_group = {
+        .name = NULL,           /* put in device directory */
+        .attrs = il3945_sysfs_entries,
+};
+
+struct ieee80211_ops il3945_hw_ops = {
+        .tx = il3945_mac_tx,
+        .start = il3945_mac_start,
+        .stop = il3945_mac_stop,
+        .add_interface = il_mac_add_interface,
+        .remove_interface = il_mac_remove_interface,
+        .change_interface = il_mac_change_interface,
+        .config = il_mac_config,
+        .configure_filter = il3945_configure_filter,
+        .set_key = il3945_mac_set_key,
+        .conf_tx = il_mac_conf_tx,
+        .reset_tsf = il_mac_reset_tsf,
+        .bss_info_changed = il_mac_bss_info_changed,
+        .hw_scan = il_mac_hw_scan,
+        .sta_add = il3945_mac_sta_add,
+        .sta_remove = il_mac_sta_remove,
+        .tx_last_beacon = il_mac_tx_last_beacon,
+};
+
+static int
+il3945_init_drv(struct il_priv *il)
+{
+        int ret;
+        struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il->eeprom;
+
+        il->retry_rate = 1;
+        il->beacon_skb = NULL;
+
+        spin_lock_init(&il->sta_lock);
+        spin_lock_init(&il->hcmd_lock);
+
+        INIT_LIST_HEAD(&il->free_frames);
+
+        mutex_init(&il->mutex);
+
+        il->ieee_channels = NULL;
+        il->ieee_rates = NULL;
+        il->band = IEEE80211_BAND_2GHZ;
+
+        il->iw_mode = NL80211_IFTYPE_STATION;
+        il->missed_beacon_threshold = IL_MISSED_BEACON_THRESHOLD_DEF;
+
+        /* initialize force reset */
+        il->force_reset.reset_duration = IL_DELAY_NEXT_FORCE_FW_RELOAD;
+
+        if (eeprom->version < EEPROM_3945_EEPROM_VERSION) {
+                IL_WARN("Unsupported EEPROM version: 0x%04X\n",
+                        eeprom->version);
+                ret = -EINVAL;
+                goto err;
+        }
+        ret = il_init_channel_map(il);
+        if (ret) {
+                IL_ERR("initializing regulatory failed: %d\n", ret);
+                goto err;
+        }
+
+        /* Set up txpower settings in driver for all channels */
+        if (il3945_txpower_set_from_eeprom(il)) {
+                ret = -EIO;
+                goto err_free_channel_map;
+        }
+
+        ret = il_init_geos(il);
+        if (ret) {
+                IL_ERR("initializing geos failed: %d\n", ret);
+                goto err_free_channel_map;
+        }
+        il3945_init_hw_rates(il, il->ieee_rates);
+
+        return 0;
+
+err_free_channel_map:
+        il_free_channel_map(il);
+err:
+        return ret;
+}
+
+#define IL3945_MAX_PROBE_REQUEST        200
+
+static int
+il3945_setup_mac(struct il_priv *il)
+{
+        int ret;
+        struct ieee80211_hw *hw = il->hw;
+
+        hw->rate_control_algorithm = "iwl-3945-rs";
+        hw->sta_data_size = sizeof(struct il3945_sta_priv);
+        hw->vif_data_size = sizeof(struct il_vif_priv);
+
+        /* Tell mac80211 our characteristics */
+        hw->flags = IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_SPECTRUM_MGMT;
+
+        hw->wiphy->interface_modes = il->ctx.interface_modes;
+
+        hw->wiphy->flags |=
+            WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS |
+            WIPHY_FLAG_IBSS_RSN;
+
+        hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX_3945;
+        /* we create the 802.11 header and a zero-length SSID element */
+        hw->wiphy->max_scan_ie_len = IL3945_MAX_PROBE_REQUEST - 24 - 2;
+
+        /* Default value; 4 EDCA QOS priorities */
+        hw->queues = 4;
+
+        if (il->bands[IEEE80211_BAND_2GHZ].n_channels)
+                il->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
+                    &il->bands[IEEE80211_BAND_2GHZ];
+
+        if (il->bands[IEEE80211_BAND_5GHZ].n_channels)
+                il->hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
+                    &il->bands[IEEE80211_BAND_5GHZ];
+
+        il_leds_init(il);
+
+        ret = ieee80211_register_hw(il->hw);
+        if (ret) {
+                IL_ERR("Failed to register hw (error %d)\n", ret);
+                return ret;
+        }
+        il->mac80211_registered = 1;
+
+        return 0;
+}
+
+static int
+il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+        int err = 0;
+        struct il_priv *il;
+        struct ieee80211_hw *hw;
+        struct il_cfg *cfg = (struct il_cfg *)(ent->driver_data);
+        struct il3945_eeprom *eeprom;
+        unsigned long flags;
+
+        /***********************
+         * 1. Allocating HW data
+         * ********************/
+
+        /* mac80211 allocates memory for this device instance, including
+         *   space for this driver's ilate structure */
+        hw = il_alloc_all(cfg);
+        if (hw == NULL) {
+                pr_err("Can not allocate network device\n");
+                err = -ENOMEM;
+                goto out;
+        }
+        il = hw->priv;
+        SET_IEEE80211_DEV(hw, &pdev->dev);
+
+        il->cmd_queue = IL39_CMD_QUEUE_NUM;
+
+        il->ctx.ctxid = 0;
+
+        il->ctx.rxon_cmd = C_RXON;
+        il->ctx.rxon_timing_cmd = C_RXON_TIMING;
+        il->ctx.rxon_assoc_cmd = C_RXON_ASSOC;
+        il->ctx.qos_cmd = C_QOS_PARAM;
+        il->ctx.ap_sta_id = IL_AP_ID;
+        il->ctx.wep_key_cmd = C_WEPKEY;
+        il->ctx.interface_modes =
+            BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
+        il->ctx.ibss_devtype = RXON_DEV_TYPE_IBSS;
+        il->ctx.station_devtype = RXON_DEV_TYPE_ESS;
+        il->ctx.unused_devtype = RXON_DEV_TYPE_ESS;
+
+        /*
+         * Disabling hardware scan means that mac80211 will perform scans
+         * "the hard way", rather than using device's scan.
+         */
+        if (il3945_mod_params.disable_hw_scan) {
+                D_INFO("Disabling hw_scan\n");
+                il3945_hw_ops.hw_scan = NULL;
+        }
+
+        D_INFO("*** LOAD DRIVER ***\n");
+        il->cfg = cfg;
+        il->pci_dev = pdev;
+        il->inta_mask = CSR_INI_SET_MASK;
+
+        if (il_alloc_traffic_mem(il))
+                IL_ERR("Not enough memory to generate traffic log\n");
+
+        /***************************
+         * 2. Initializing PCI bus
+         * *************************/
+        pci_disable_link_state(pdev,
+                               PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
+                               PCIE_LINK_STATE_CLKPM);
+
+        if (pci_enable_device(pdev)) {
+                err = -ENODEV;
+                goto out_ieee80211_free_hw;
+        }
+
+        pci_set_master(pdev);
+
+        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+        if (!err)
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
+        if (err) {
+                IL_WARN("No suitable DMA available.\n");
+                goto out_pci_disable_device;
+        }
+
+        pci_set_drvdata(pdev, il);
+        err = pci_request_regions(pdev, DRV_NAME);
+        if (err)
+                goto out_pci_disable_device;
+
+        /***********************
+         * 3. Read REV Register
+         * ********************/
+        il->hw_base = pci_iomap(pdev, 0, 0);
+        if (!il->hw_base) {
+                err = -ENODEV;
+                goto out_pci_release_regions;
+        }
+
+        D_INFO("pci_resource_len = 0x%08llx\n",
+               (unsigned long long)pci_resource_len(pdev, 0));
+        D_INFO("pci_resource_base = %p\n", il->hw_base);
+
+        /* 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);
+
+        /* these spin locks will be used in apm_ops.init and EEPROM access
+         * we should init now
+         */
+        spin_lock_init(&il->reg_lock);
+        spin_lock_init(&il->lock);
+
+        /*
+         * stop and reset the on-board processor just in case it is in a
+         * strange state ... like being left stranded by a primary kernel
+         * and this is now the kdump kernel trying to start up
+         */
+        _il_wr(il, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
+
+        /***********************
+         * 4. Read EEPROM
+         * ********************/
+
+        /* Read the EEPROM */
+        err = il_eeprom_init(il);
+        if (err) {
+                IL_ERR("Unable to init EEPROM\n");
+                goto out_iounmap;
+        }
+        /* MAC Address location in EEPROM same for 3945/4965 */
+        eeprom = (struct il3945_eeprom *)il->eeprom;
+        D_INFO("MAC address: %pM\n", eeprom->mac_address);
+        SET_IEEE80211_PERM_ADDR(il->hw, eeprom->mac_address);
+
+        /***********************
+         * 5. Setup HW Constants
+         * ********************/
+        /* Device-specific setup */
+        if (il3945_hw_set_hw_params(il)) {
+                IL_ERR("failed to set hw settings\n");
+                goto out_eeprom_free;
+        }
+
+        /***********************
+         * 6. Setup il
+         * ********************/
+
+        err = il3945_init_drv(il);
+        if (err) {
+                IL_ERR("initializing driver failed\n");
+                goto out_unset_hw_params;
+        }
+
+        IL_INFO("Detected Intel Wireless WiFi Link %s\n", il->cfg->name);
+
+        /***********************
+         * 7. Setup Services
+         * ********************/
+
+        spin_lock_irqsave(&il->lock, flags);
+        il_disable_interrupts(il);
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        pci_enable_msi(il->pci_dev);
+
+        err = request_irq(il->pci_dev->irq, il_isr, IRQF_SHARED, DRV_NAME, il);
+        if (err) {
+                IL_ERR("Error allocating IRQ %d\n", il->pci_dev->irq);
+                goto out_disable_msi;
+        }
+
+        err = sysfs_create_group(&pdev->dev.kobj, &il3945_attribute_group);
+        if (err) {
+                IL_ERR("failed to create sysfs device attributes\n");
+                goto out_release_irq;
+        }
+
+        il_set_rxon_channel(il, &il->bands[IEEE80211_BAND_2GHZ].channels[5],
+                            &il->ctx);
+        il3945_setup_deferred_work(il);
+        il3945_setup_handlers(il);
+        il_power_initialize(il);
+
+        /*********************************
+         * 8. Setup and Register mac80211
+         * *******************************/
+
+        il_enable_interrupts(il);
+
+        err = il3945_setup_mac(il);
+        if (err)
+                goto out_remove_sysfs;
+
+        err = il_dbgfs_register(il, DRV_NAME);
+        if (err)
+                IL_ERR("failed to create debugfs files. Ignoring error: %d\n",
+                       err);
+
+        /* Start monitoring the killswitch */
+        queue_delayed_work(il->workqueue, &il->_3945.rfkill_poll, 2 * HZ);
+
+        return 0;
+
+out_remove_sysfs:
+        destroy_workqueue(il->workqueue);
+        il->workqueue = NULL;
+        sysfs_remove_group(&pdev->dev.kobj, &il3945_attribute_group);
+out_release_irq:
+        free_irq(il->pci_dev->irq, il);
+out_disable_msi:
+        pci_disable_msi(il->pci_dev);
+        il_free_geos(il);
+        il_free_channel_map(il);
+out_unset_hw_params:
+        il3945_unset_hw_params(il);
+out_eeprom_free:
+        il_eeprom_free(il);
+out_iounmap:
+        pci_iounmap(pdev, il->hw_base);
+out_pci_release_regions:
+        pci_release_regions(pdev);
+out_pci_disable_device:
+        pci_set_drvdata(pdev, NULL);
+        pci_disable_device(pdev);
+out_ieee80211_free_hw:
+        il_free_traffic_mem(il);
+        ieee80211_free_hw(il->hw);
+out:
+        return err;
+}
+
+static void __devexit
+il3945_pci_remove(struct pci_dev *pdev)
+{
+        struct il_priv *il = pci_get_drvdata(pdev);
+        unsigned long flags;
+
+        if (!il)
+                return;
+
+        D_INFO("*** UNLOAD DRIVER ***\n");
+
+        il_dbgfs_unregister(il);
+
+        set_bit(S_EXIT_PENDING, &il->status);
+
+        il_leds_exit(il);
+
+        if (il->mac80211_registered) {
+                ieee80211_unregister_hw(il->hw);
+                il->mac80211_registered = 0;
+        } else {
+                il3945_down(il);
+        }
+
+        /*
+         * Make sure device is reset to low power before unloading driver.
+         * This may be redundant with il_down(), but there are paths to
+         * run il_down() without calling apm_ops.stop(), and there are
+         * paths to avoid running il_down() at all before leaving driver.
+         * This (inexpensive) call *makes sure* device is reset.
+         */
+        il_apm_stop(il);
+
+        /* make sure we flush any pending irq or
+         * tasklet for the driver
+         */
+        spin_lock_irqsave(&il->lock, flags);
+        il_disable_interrupts(il);
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        il3945_synchronize_irq(il);
+
+        sysfs_remove_group(&pdev->dev.kobj, &il3945_attribute_group);
+
+        cancel_delayed_work_sync(&il->_3945.rfkill_poll);
+
+        il3945_dealloc_ucode_pci(il);
+
+        if (il->rxq.bd)
+                il3945_rx_queue_free(il, &il->rxq);
+        il3945_hw_txq_ctx_free(il);
+
+        il3945_unset_hw_params(il);
+
+        /*netif_stop_queue(dev); */
+        flush_workqueue(il->workqueue);
+
+        /* ieee80211_unregister_hw calls il3945_mac_stop, which flushes
+         * il->workqueue... so we can't take down the workqueue
+         * until now... */
+        destroy_workqueue(il->workqueue);
+        il->workqueue = NULL;
+        il_free_traffic_mem(il);
+
+        free_irq(pdev->irq, il);
+        pci_disable_msi(pdev);
+
+        pci_iounmap(pdev, il->hw_base);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+
+        il_free_channel_map(il);
+        il_free_geos(il);
+        kfree(il->scan_cmd);
+        if (il->beacon_skb)
+                dev_kfree_skb(il->beacon_skb);
+
+        ieee80211_free_hw(il->hw);
+}
+
+/*****************************************************************************
+ *
+ * driver and module entry point
+ *
+ *****************************************************************************/
+
+static struct pci_driver il3945_driver = {
+        .name = DRV_NAME,
+        .id_table = il3945_hw_card_ids,
+        .probe = il3945_pci_probe,
+        .remove = __devexit_p(il3945_pci_remove),
+        .driver.pm = IL_LEGACY_PM_OPS,
+};
+
+static int __init
+il3945_init(void)
+{
+
+        int ret;
+        pr_info(DRV_DESCRIPTION ", " DRV_VERSION "\n");
+        pr_info(DRV_COPYRIGHT "\n");
+
+        ret = il3945_rate_control_register();
+        if (ret) {
+                pr_err("Unable to register rate control algorithm: %d\n", ret);
+                return ret;
+        }
+
+        ret = pci_register_driver(&il3945_driver);
+        if (ret) {
+                pr_err("Unable to initialize PCI module\n");
+                goto error_register;
+        }
+
+        return ret;
+
+error_register:
+        il3945_rate_control_unregister();
+        return ret;
+}
+
+static void __exit
+il3945_exit(void)
+{
+        pci_unregister_driver(&il3945_driver);
+        il3945_rate_control_unregister();
+}
+
+MODULE_FIRMWARE(IL3945_MODULE_FIRMWARE(IL3945_UCODE_API_MAX));
+
+module_param_named(antenna, il3945_mod_params.antenna, int, S_IRUGO);
+MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])");
+module_param_named(swcrypto, il3945_mod_params.sw_crypto, int, S_IRUGO);
+MODULE_PARM_DESC(swcrypto, "using software crypto (default 1 [software])");
+module_param_named(disable_hw_scan, il3945_mod_params.disable_hw_scan, int,
+                   S_IRUGO);
+MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 1)");
+#ifdef CONFIG_IWLEGACY_DEBUG
+module_param_named(debug, il_debug_level, uint, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "debug output mask");
+#endif
+module_param_named(fw_restart, il3945_mod_params.restart_fw, int, S_IRUGO);
+MODULE_PARM_DESC(fw_restart, "restart firmware in case of error");
+
+module_exit(il3945_exit);
+module_init(il3945_init);
diff --git a/drivers/net/wireless/iwlegacy/3945-rs.c b/drivers/net/wireless/iwlegacy/3945-rs.c
new file mode 100644
index 000000000000..30ad404f8df7
--- /dev/null
+++ b/drivers/net/wireless/iwlegacy/3945-rs.c
@@ -0,0 +1,995 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2005 - 2011 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:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/skbuff.h>
+#include <linux/slab.h>
+#include <net/mac80211.h>
+
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/delay.h>
+
+#include <linux/workqueue.h>
+
+#include "commands.h"
+#include "3945.h"
+
+#define RS_NAME "iwl-3945-rs"
+
+static s32 il3945_expected_tpt_g[RATE_COUNT_3945] = {
+        7, 13, 35, 58, 0, 0, 76, 104, 130, 168, 191, 202
+};
+
+static s32 il3945_expected_tpt_g_prot[RATE_COUNT_3945] = {
+        7, 13, 35, 58, 0, 0, 0, 80, 93, 113, 123, 125
+};
+
+static s32 il3945_expected_tpt_a[RATE_COUNT_3945] = {
+        0, 0, 0, 0, 40, 57, 72, 98, 121, 154, 177, 186
+};
+
+static s32 il3945_expected_tpt_b[RATE_COUNT_3945] = {
+        7, 13, 35, 58, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+struct il3945_tpt_entry {
+        s8 min_rssi;
+        u8 idx;
+};
+
+static struct il3945_tpt_entry il3945_tpt_table_a[] = {
+        {-60, RATE_54M_IDX},
+        {-64, RATE_48M_IDX},
+        {-72, RATE_36M_IDX},
+        {-80, RATE_24M_IDX},
+        {-84, RATE_18M_IDX},
+        {-85, RATE_12M_IDX},
+        {-87, RATE_9M_IDX},
+        {-89, RATE_6M_IDX}
+};
+
+static struct il3945_tpt_entry il3945_tpt_table_g[] = {
+        {-60, RATE_54M_IDX},
+        {-64, RATE_48M_IDX},
+        {-68, RATE_36M_IDX},
+        {-80, RATE_24M_IDX},
+        {-84, RATE_18M_IDX},
+        {-85, RATE_12M_IDX},
+        {-86, RATE_11M_IDX},
+        {-88, RATE_5M_IDX},
+        {-90, RATE_2M_IDX},
+        {-92, RATE_1M_IDX}
+};
+
+#define RATE_MAX_WINDOW          62
+#define RATE_FLUSH              (3*HZ)
+#define RATE_WIN_FLUSH       (HZ/2)
+#define IL39_RATE_HIGH_TH          11520
+#define IL_SUCCESS_UP_TH           8960
+#define IL_SUCCESS_DOWN_TH        10880
+#define RATE_MIN_FAILURE_TH       6
+#define RATE_MIN_SUCCESS_TH       8
+#define RATE_DECREASE_TH       1920
+#define RATE_RETRY_TH        15
+
+static u8
+il3945_get_rate_idx_by_rssi(s32 rssi, enum ieee80211_band band)
+{
+        u32 idx = 0;
+        u32 table_size = 0;
+        struct il3945_tpt_entry *tpt_table = NULL;
+
+        if (rssi < IL_MIN_RSSI_VAL || rssi > IL_MAX_RSSI_VAL)
+                rssi = IL_MIN_RSSI_VAL;
+
+        switch (band) {
+        case IEEE80211_BAND_2GHZ:
+                tpt_table = il3945_tpt_table_g;
+                table_size = ARRAY_SIZE(il3945_tpt_table_g);
+                break;
+
+        case IEEE80211_BAND_5GHZ:
+                tpt_table = il3945_tpt_table_a;
+                table_size = ARRAY_SIZE(il3945_tpt_table_a);
+                break;
+
+        default:
+                BUG();
+                break;
+        }
+
+        while (idx < table_size && rssi < tpt_table[idx].min_rssi)
+                idx++;
+
+        idx = min(idx, (table_size - 1));
+
+        return tpt_table[idx].idx;
+}
+
+static void
+il3945_clear_win(struct il3945_rate_scale_data *win)
+{
+        win->data = 0;
+        win->success_counter = 0;
+        win->success_ratio = -1;
+        win->counter = 0;
+        win->average_tpt = IL_INVALID_VALUE;
+        win->stamp = 0;
+}
+
+/**
+ * il3945_rate_scale_flush_wins - flush out the rate scale wins
+ *
+ * Returns the number of wins that have gathered data but were
+ * not flushed.  If there were any that were not flushed, then
+ * reschedule the rate flushing routine.
+ */
+static int
+il3945_rate_scale_flush_wins(struct il3945_rs_sta *rs_sta)
+{
+        int unflushed = 0;
+        int i;
+        unsigned long flags;
+        struct il_priv *il __maybe_unused = rs_sta->il;
+
+        /*
+         * For each rate, if we have collected data on that rate
+         * and it has been more than RATE_WIN_FLUSH
+         * since we flushed, clear out the gathered stats
+         */
+        for (i = 0; i < RATE_COUNT_3945; i++) {
+                if (!rs_sta->win[i].counter)
+                        continue;
+
+                spin_lock_irqsave(&rs_sta->lock, flags);
+                if (time_after(jiffies, rs_sta->win[i].stamp + RATE_WIN_FLUSH)) {
+                        D_RATE("flushing %d samples of rate " "idx %d\n",
+                               rs_sta->win[i].counter, i);
+                        il3945_clear_win(&rs_sta->win[i]);
+                } else
+                        unflushed++;
+                spin_unlock_irqrestore(&rs_sta->lock, flags);
+        }
+
+        return unflushed;
+}
+
+#define RATE_FLUSH_MAX              5000        /* msec */
+#define RATE_FLUSH_MIN              50  /* msec */
+#define IL_AVERAGE_PACKETS             1500
+
+static void
+il3945_bg_rate_scale_flush(unsigned long data)
+{
+        struct il3945_rs_sta *rs_sta = (void *)data;
+        struct il_priv *il __maybe_unused = rs_sta->il;
+        int unflushed = 0;
+        unsigned long flags;
+        u32 packet_count, duration, pps;
+
+        D_RATE("enter\n");
+
+        unflushed = il3945_rate_scale_flush_wins(rs_sta);
+
+        spin_lock_irqsave(&rs_sta->lock, flags);
+
+        /* Number of packets Rx'd since last time this timer ran */
+        packet_count = (rs_sta->tx_packets - rs_sta->last_tx_packets) + 1;
+
+        rs_sta->last_tx_packets = rs_sta->tx_packets + 1;
+
+        if (unflushed) {
+                duration =
+                    jiffies_to_msecs(jiffies - rs_sta->last_partial_flush);
+
+                D_RATE("Tx'd %d packets in %dms\n", packet_count, duration);
+
+                /* Determine packets per second */
+                if (duration)
+                        pps = (packet_count * 1000) / duration;
+                else
+                        pps = 0;
+
+                if (pps) {
+                        duration = (IL_AVERAGE_PACKETS * 1000) / pps;
+                        if (duration < RATE_FLUSH_MIN)
+                                duration = RATE_FLUSH_MIN;
+                        else if (duration > RATE_FLUSH_MAX)
+                                duration = RATE_FLUSH_MAX;
+                } else
+                        duration = RATE_FLUSH_MAX;
+
+                rs_sta->flush_time = msecs_to_jiffies(duration);
+
+                D_RATE("new flush period: %d msec ave %d\n", duration,
+                       packet_count);
+
+                mod_timer(&rs_sta->rate_scale_flush,
+                          jiffies + rs_sta->flush_time);
+
+                rs_sta->last_partial_flush = jiffies;
+        } else {
+                rs_sta->flush_time = RATE_FLUSH;
+                rs_sta->flush_pending = 0;
+        }
+        /* If there weren't any unflushed entries, we don't schedule the timer
+         * to run again */
+
+        rs_sta->last_flush = jiffies;
+
+        spin_unlock_irqrestore(&rs_sta->lock, flags);
+
+        D_RATE("leave\n");
+}
+
+/**
+ * il3945_collect_tx_data - Update the success/failure sliding win
+ *
+ * We keep a sliding win of the last 64 packets transmitted
+ * at this rate.  win->data contains the bitmask of successful
+ * packets.
+ */
+static void
+il3945_collect_tx_data(struct il3945_rs_sta *rs_sta,
+                       struct il3945_rate_scale_data *win, int success,
+                       int retries, int idx)
+{
+        unsigned long flags;
+        s32 fail_count;
+        struct il_priv *il __maybe_unused = rs_sta->il;
+
+        if (!retries) {
+                D_RATE("leave: retries == 0 -- should be at least 1\n");
+                return;
+        }
+
+        spin_lock_irqsave(&rs_sta->lock, flags);
+
+        /*
+         * Keep track of only the latest 62 tx frame attempts in this rate's
+         * history win; anything older isn't really relevant any more.
+         * If we have filled up the sliding win, drop the oldest attempt;
+         * if the oldest attempt (highest bit in bitmap) shows "success",
+         * subtract "1" from the success counter (this is the main reason
+         * we keep these bitmaps!).
+         * */
+        while (retries > 0) {
+                if (win->counter >= RATE_MAX_WINDOW) {
+
+                        /* remove earliest */
+                        win->counter = RATE_MAX_WINDOW - 1;
+
+                        if (win->data & (1ULL << (RATE_MAX_WINDOW - 1))) {
+                                win->data &= ~(1ULL << (RATE_MAX_WINDOW - 1));
+                                win->success_counter--;
+                        }
+                }
+
+                /* Increment frames-attempted counter */
+                win->counter++;
+
+                /* Shift bitmap by one frame (throw away oldest history),
+                 * OR in "1", and increment "success" if this
+                 * frame was successful. */
+                win->data <<= 1;
+                if (success > 0) {
+                        win->success_counter++;
+                        win->data |= 0x1;
+                        success--;
+                }
+
+                retries--;
+        }
+
+        /* Calculate current success ratio, avoid divide-by-0! */
+        if (win->counter > 0)
+                win->success_ratio =
+                    128 * (100 * win->success_counter) / win->counter;
+        else
+                win->success_ratio = IL_INVALID_VALUE;
+
+        fail_count = win->counter - win->success_counter;
+
+        /* Calculate average throughput, if we have enough history. */
+        if (fail_count >= RATE_MIN_FAILURE_TH ||
+            win->success_counter >= RATE_MIN_SUCCESS_TH)
+                win->average_tpt =
+                    ((win->success_ratio * rs_sta->expected_tpt[idx] +
+                      64) / 128);
+        else
+                win->average_tpt = IL_INVALID_VALUE;
+
+        /* Tag this win as having been updated */
+        win->stamp = jiffies;
+
+        spin_unlock_irqrestore(&rs_sta->lock, flags);
+
+}
+
+/*
+ * Called after adding a new station to initialize rate scaling
+ */
+void
+il3945_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta, u8 sta_id)
+{
+        struct ieee80211_hw *hw = il->hw;
+        struct ieee80211_conf *conf = &il->hw->conf;
+        struct il3945_sta_priv *psta;
+        struct il3945_rs_sta *rs_sta;
+        struct ieee80211_supported_band *sband;
+        int i;
+
+        D_INFO("enter\n");
+        if (sta_id == il->ctx.bcast_sta_id)
+                goto out;
+
+        psta = (struct il3945_sta_priv *)sta->drv_priv;
+        rs_sta = &psta->rs_sta;
+        sband = hw->wiphy->bands[conf->channel->band];
+
+        rs_sta->il = il;
+
+        rs_sta->start_rate = RATE_INVALID;
+
+        /* default to just 802.11b */
+        rs_sta->expected_tpt = il3945_expected_tpt_b;
+
+        rs_sta->last_partial_flush = jiffies;
+        rs_sta->last_flush = jiffies;
+        rs_sta->flush_time = RATE_FLUSH;
+        rs_sta->last_tx_packets = 0;
+
+        rs_sta->rate_scale_flush.data = (unsigned long)rs_sta;
+        rs_sta->rate_scale_flush.function = il3945_bg_rate_scale_flush;
+
+        for (i = 0; i < RATE_COUNT_3945; i++)
+                il3945_clear_win(&rs_sta->win[i]);
+
+        /* TODO: what is a good starting rate for STA? About middle? Maybe not
+         * the lowest or the highest rate.. Could consider using RSSI from
+         * previous packets? Need to have IEEE 802.1X auth succeed immediately
+         * after assoc.. */
+
+        for (i = sband->n_bitrates - 1; i >= 0; i--) {
+                if (sta->supp_rates[sband->band] & (1 << i)) {
+                        rs_sta->last_txrate_idx = i;
+                        break;
+                }
+        }
+
+        il->_3945.sta_supp_rates = sta->supp_rates[sband->band];
+        /* For 5 GHz band it start at IL_FIRST_OFDM_RATE */
+        if (sband->band == IEEE80211_BAND_5GHZ) {
+                rs_sta->last_txrate_idx += IL_FIRST_OFDM_RATE;
+                il->_3945.sta_supp_rates =
+                    il->_3945.sta_supp_rates << IL_FIRST_OFDM_RATE;
+        }
+
+out:
+        il->stations[sta_id].used &= ~IL_STA_UCODE_INPROGRESS;
+
+        D_INFO("leave\n");
+}
+
+static void *
+il3945_rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
+{
+        return hw->priv;
+}
+
+/* rate scale requires free function to be implemented */
+static void
+il3945_rs_free(void *il)
+{
+        return;
+}
+
+static void *
+il3945_rs_alloc_sta(void *il_priv, struct ieee80211_sta *sta, gfp_t gfp)
+{
+        struct il3945_rs_sta *rs_sta;
+        struct il3945_sta_priv *psta = (void *)sta->drv_priv;
+        struct il_priv *il __maybe_unused = il_priv;
+
+        D_RATE("enter\n");
+
+        rs_sta = &psta->rs_sta;
+
+        spin_lock_init(&rs_sta->lock);
+        init_timer(&rs_sta->rate_scale_flush);
+
+        D_RATE("leave\n");
+
+        return rs_sta;
+}
+
+static void
+il3945_rs_free_sta(void *il_priv, struct ieee80211_sta *sta, void *il_sta)
+{
+        struct il3945_rs_sta *rs_sta = il_sta;
+
+        /*
+         * Be careful not to use any members of il3945_rs_sta (like trying
+         * to use il_priv to print out debugging) since it may not be fully
+         * initialized at this point.
+         */
+        del_timer_sync(&rs_sta->rate_scale_flush);
+}
+
+/**
+ * il3945_rs_tx_status - Update rate control values based on Tx results
+ *
+ * NOTE: Uses il_priv->retry_rate for the # of retries attempted by
+ * the hardware for each rate.
+ */
+static void
+il3945_rs_tx_status(void *il_rate, struct ieee80211_supported_band *sband,
+                    struct ieee80211_sta *sta, void *il_sta,
+                    struct sk_buff *skb)
+{
+        s8 retries = 0, current_count;
+        int scale_rate_idx, first_idx, last_idx;
+        unsigned long flags;
+        struct il_priv *il = (struct il_priv *)il_rate;
+        struct il3945_rs_sta *rs_sta = il_sta;
+        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+
+        D_RATE("enter\n");
+
+        retries = info->status.rates[0].count;
+        /* Sanity Check for retries */
+        if (retries > RATE_RETRY_TH)
+                retries = RATE_RETRY_TH;
+
+        first_idx = sband->bitrates[info->status.rates[0].idx].hw_value;
+        if (first_idx < 0 || first_idx >= RATE_COUNT_3945) {
+                D_RATE("leave: Rate out of bounds: %d\n", first_idx);
+                return;
+        }
+
+        if (!il_sta) {
+                D_RATE("leave: No STA il data to update!\n");
+                return;
+        }
+
+        /* Treat uninitialized rate scaling data same as non-existing. */
+        if (!rs_sta->il) {
+                D_RATE("leave: STA il data uninitialized!\n");
+                return;
+        }
+
+        rs_sta->tx_packets++;
+
+        scale_rate_idx = first_idx;
+        last_idx = first_idx;
+
+        /*
+         * Update the win for each rate.  We determine which rates
+         * were Tx'd based on the total number of retries vs. the number
+         * of retries configured for each rate -- currently set to the
+         * il value 'retry_rate' vs. rate specific
+         *
+         * On exit from this while loop last_idx indicates the rate
+         * at which the frame was finally transmitted (or failed if no
+         * ACK)
+         */
+        while (retries > 1) {
+                if ((retries - 1) < il->retry_rate) {
+                        current_count = (retries - 1);
+                        last_idx = scale_rate_idx;
+                } else {
+                        current_count = il->retry_rate;
+                        last_idx = il3945_rs_next_rate(il, scale_rate_idx);
+                }
+
+                /* Update this rate accounting for as many retries
+                 * as was used for it (per current_count) */
+                il3945_collect_tx_data(rs_sta, &rs_sta->win[scale_rate_idx], 0,
+                                       current_count, scale_rate_idx);
+                D_RATE("Update rate %d for %d retries.\n", scale_rate_idx,
+                       current_count);
+
+                retries -= current_count;
+
+                scale_rate_idx = last_idx;
+        }
+
+        /* Update the last idx win with success/failure based on ACK */
+        D_RATE("Update rate %d with %s.\n", last_idx,
+               (info->flags & IEEE80211_TX_STAT_ACK) ? "success" : "failure");
+        il3945_collect_tx_data(rs_sta, &rs_sta->win[last_idx],
+                               info->flags & IEEE80211_TX_STAT_ACK, 1,
+                               last_idx);
+
+        /* We updated the rate scale win -- if its been more than
+         * flush_time since the last run, schedule the flush
+         * again */
+        spin_lock_irqsave(&rs_sta->lock, flags);
+
+        if (!rs_sta->flush_pending &&
+            time_after(jiffies, rs_sta->last_flush + rs_sta->flush_time)) {
+
+                rs_sta->last_partial_flush = jiffies;
+                rs_sta->flush_pending = 1;
+                mod_timer(&rs_sta->rate_scale_flush,
+                          jiffies + rs_sta->flush_time);
+        }
+
+        spin_unlock_irqrestore(&rs_sta->lock, flags);
+
+        D_RATE("leave\n");
+}
+
+static u16
+il3945_get_adjacent_rate(struct il3945_rs_sta *rs_sta, u8 idx, u16 rate_mask,
+                         enum ieee80211_band band)
+{
+        u8 high = RATE_INVALID;
+        u8 low = RATE_INVALID;
+        struct il_priv *il __maybe_unused = rs_sta->il;
+
+        /* 802.11A walks to the next literal adjacent rate in
+         * the rate table */
+        if (unlikely(band == IEEE80211_BAND_5GHZ)) {
+                int i;
+                u32 mask;
+
+                /* Find the previous rate that is in the rate mask */
+                i = idx - 1;
+                for (mask = (1 << i); i >= 0; i--, mask >>= 1) {
+                        if (rate_mask & mask) {
+                                low = i;
+                                break;
+                        }
+                }
+
+                /* Find the next rate that is in the rate mask */
+                i = idx + 1;
+                for (mask = (1 << i); i < RATE_COUNT_3945; i++, mask <<= 1) {
+                        if (rate_mask & mask) {
+                                high = i;
+                                break;
+                        }
+                }
+
+                return (high << 8) | low;
+        }
+
+        low = idx;
+        while (low != RATE_INVALID) {
+                if (rs_sta->tgg)
+                        low = il3945_rates[low].prev_rs_tgg;
+                else
+                        low = il3945_rates[low].prev_rs;
+                if (low == RATE_INVALID)
+                        break;
+                if (rate_mask & (1 << low))
+                        break;
+                D_RATE("Skipping masked lower rate: %d\n", low);
+        }
+
+        high = idx;
+        while (high != RATE_INVALID) {
+                if (rs_sta->tgg)
+                        high = il3945_rates[high].next_rs_tgg;
+                else
+                        high = il3945_rates[high].next_rs;
+                if (high == RATE_INVALID)
+                        break;
+                if (rate_mask & (1 << high))
+                        break;
+                D_RATE("Skipping masked higher rate: %d\n", high);
+        }
+
+        return (high << 8) | low;
+}
+
+/**
+ * il3945_rs_get_rate - find the rate for the requested packet
+ *
+ * Returns the ieee80211_rate structure allocated by the driver.
+ *
+ * The rate control algorithm has no internal mapping between hw_mode's
+ * rate ordering and the rate ordering used by the rate control algorithm.
+ *
+ * The rate control algorithm uses a single table of rates that goes across
+ * the entire A/B/G spectrum vs. being limited to just one particular
+ * hw_mode.
+ *
+ * As such, we can't convert the idx obtained below into the hw_mode's
+ * rate table and must reference the driver allocated rate table
+ *
+ */
+static void
+il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta, void *il_sta,
+                   struct ieee80211_tx_rate_control *txrc)
+{
+        struct ieee80211_supported_band *sband = txrc->sband;
+        struct sk_buff *skb = txrc->skb;
+        u8 low = RATE_INVALID;
+        u8 high = RATE_INVALID;
+        u16 high_low;
+        int idx;
+        struct il3945_rs_sta *rs_sta = il_sta;
+        struct il3945_rate_scale_data *win = NULL;
+        int current_tpt = IL_INVALID_VALUE;
+        int low_tpt = IL_INVALID_VALUE;
+        int high_tpt = IL_INVALID_VALUE;
+        u32 fail_count;
+        s8 scale_action = 0;
+        unsigned long flags;
+        u16 rate_mask;
+        s8 max_rate_idx = -1;
+        struct il_priv *il __maybe_unused = (struct il_priv *)il_r;
+        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+
+        D_RATE("enter\n");
+
+        /* Treat uninitialized rate scaling data same as non-existing. */
+        if (rs_sta && !rs_sta->il) {
+                D_RATE("Rate scaling information not initialized yet.\n");
+                il_sta = NULL;
+        }
+
+        if (rate_control_send_low(sta, il_sta, txrc))
+                return;
+
+        rate_mask = sta->supp_rates[sband->band];
+
+        /* get user max rate if set */
+        max_rate_idx = txrc->max_rate_idx;
+        if (sband->band == IEEE80211_BAND_5GHZ && max_rate_idx != -1)
+                max_rate_idx += IL_FIRST_OFDM_RATE;
+        if (max_rate_idx < 0 || max_rate_idx >= RATE_COUNT)
+                max_rate_idx = -1;
+
+        idx = min(rs_sta->last_txrate_idx & 0xffff, RATE_COUNT_3945 - 1);
+
+        if (sband->band == IEEE80211_BAND_5GHZ)
+                rate_mask = rate_mask << IL_FIRST_OFDM_RATE;
+
+        spin_lock_irqsave(&rs_sta->lock, flags);
+
+        /* for recent assoc, choose best rate regarding
+         * to rssi value
+         */
+        if (rs_sta->start_rate != RATE_INVALID) {
+                if (rs_sta->start_rate < idx &&
+                    (rate_mask & (1 << rs_sta->start_rate)))
+                        idx = rs_sta->start_rate;
+                rs_sta->start_rate = RATE_INVALID;
+        }
+
+        /* force user max rate if set by user */
+        if (max_rate_idx != -1 && max_rate_idx < idx) {
+                if (rate_mask & (1 << max_rate_idx))
+                        idx = max_rate_idx;
+        }
+
+        win = &(rs_sta->win[idx]);
+
+        fail_count = win->counter - win->success_counter;
+
+        if (fail_count < RATE_MIN_FAILURE_TH &&
+            win->success_counter < RATE_MIN_SUCCESS_TH) {
+                spin_unlock_irqrestore(&rs_sta->lock, flags);
+
+                D_RATE("Invalid average_tpt on rate %d: "
+                       "counter: %d, success_counter: %d, "
+                       "expected_tpt is %sNULL\n", idx, win->counter,
+                       win->success_counter,
+                       rs_sta->expected_tpt ? "not " : "");
+
+                /* Can't calculate this yet; not enough history */
+                win->average_tpt = IL_INVALID_VALUE;
+                goto out;
+
+        }
+
+        current_tpt = win->average_tpt;
+
+        high_low =
+            il3945_get_adjacent_rate(rs_sta, idx, rate_mask, sband->band);
+        low = high_low & 0xff;
+        high = (high_low >> 8) & 0xff;
+
+        /* If user set max rate, dont allow higher than user constrain */
+        if (max_rate_idx != -1 && max_rate_idx < high)
+                high = RATE_INVALID;
+
+        /* Collect Measured throughputs of adjacent rates */
+        if (low != RATE_INVALID)
+                low_tpt = rs_sta->win[low].average_tpt;
+
+        if (high != RATE_INVALID)
+                high_tpt = rs_sta->win[high].average_tpt;
+
+        spin_unlock_irqrestore(&rs_sta->lock, flags);
+
+        scale_action = 0;
+
+        /* Low success ratio , need to drop the rate */
+        if (win->success_ratio < RATE_DECREASE_TH || !current_tpt) {
+                D_RATE("decrease rate because of low success_ratio\n");
+                scale_action = -1;
+                /* No throughput measured yet for adjacent rates,
+                 * try increase */
+        } else if (low_tpt == IL_INVALID_VALUE && high_tpt == IL_INVALID_VALUE) {
+
+                if (high != RATE_INVALID &&
+                    win->success_ratio >= RATE_INCREASE_TH)
+                        scale_action = 1;
+                else if (low != RATE_INVALID)
+                        scale_action = 0;
+
+                /* Both adjacent throughputs are measured, but neither one has
+                 * better throughput; we're using the best rate, don't change
+                 * it! */
+        } else if (low_tpt != IL_INVALID_VALUE && high_tpt != IL_INVALID_VALUE
+                   && low_tpt < current_tpt && high_tpt < current_tpt) {
+
+                D_RATE("No action -- low [%d] & high [%d] < "
+                       "current_tpt [%d]\n", low_tpt, high_tpt, current_tpt);
+                scale_action = 0;
+
+                /* At least one of the rates has better throughput */
+        } else {
+                if (high_tpt != IL_INVALID_VALUE) {
+
+                        /* High rate has better throughput, Increase
+                         * rate */
+                        if (high_tpt > current_tpt &&
+                            win->success_ratio >= RATE_INCREASE_TH)
+                                scale_action = 1;
+                        else {
+                                D_RATE("decrease rate because of high tpt\n");
+                                scale_action = 0;
+                        }
+                } else if (low_tpt != IL_INVALID_VALUE) {
+                        if (low_tpt > current_tpt) {
+                                D_RATE("decrease rate because of low tpt\n");
+                                scale_action = -1;
+                        } else if (win->success_ratio >= RATE_INCREASE_TH) {
+                                /* Lower rate has better
+                                 * throughput,decrease rate */
+                                scale_action = 1;
+                        }
+                }
+        }
+
+        /* Sanity check; asked for decrease, but success rate or throughput
+         * has been good at old rate.  Don't change it. */
+        if (scale_action == -1 && low != RATE_INVALID &&
+            (win->success_ratio > RATE_HIGH_TH ||
+             current_tpt > 100 * rs_sta->expected_tpt[low]))
+                scale_action = 0;
+
+        switch (scale_action) {
+        case -1:
+
+                /* Decrese rate */
+                if (low != RATE_INVALID)
+                        idx = low;
+                break;
+
+        case 1:
+                /* Increase rate */
+                if (high != RATE_INVALID)
+                        idx = high;
+
+                break;
+
+        case 0:
+        default:
+                /* No change */
+                break;
+        }
+
+        D_RATE("Selected %d (action %d) - low %d high %d\n", idx, scale_action,
+               low, high);
+
+out:
+
+        if (sband->band == IEEE80211_BAND_5GHZ) {
+                if (WARN_ON_ONCE(idx < IL_FIRST_OFDM_RATE))
+                        idx = IL_FIRST_OFDM_RATE;
+                rs_sta->last_txrate_idx = idx;
+                info->control.rates[0].idx = idx - IL_FIRST_OFDM_RATE;
+        } else {
+                rs_sta->last_txrate_idx = idx;
+                info->control.rates[0].idx = rs_sta->last_txrate_idx;
+        }
+
+        D_RATE("leave: %d\n", idx);
+}
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+static int
+il3945_open_file_generic(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->i_private;
+        return 0;
+}
+
+static ssize_t
+il3945_sta_dbgfs_stats_table_read(struct file *file, char __user *user_buf,
+                                  size_t count, loff_t *ppos)
+{
+        char *buff;
+        int desc = 0;
+        int j;
+        ssize_t ret;
+        struct il3945_rs_sta *lq_sta = file->private_data;
+
+        buff = kmalloc(1024, GFP_KERNEL);
+        if (!buff)
+                return -ENOMEM;
+
+        desc +=
+            sprintf(buff + desc,
+                    "tx packets=%d last rate idx=%d\n"
+                    "rate=0x%X flush time %d\n", lq_sta->tx_packets,
+                    lq_sta->last_txrate_idx, lq_sta->start_rate,
+                    jiffies_to_msecs(lq_sta->flush_time));
+        for (j = 0; j < RATE_COUNT_3945; j++) {
+                desc +=
+                    sprintf(buff + desc, "counter=%d success=%d %%=%d\n",
+                            lq_sta->win[j].counter,
+                            lq_sta->win[j].success_counter,
+                            lq_sta->win[j].success_ratio);
+        }
+        ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+        kfree(buff);
+        return ret;
+}
+
+static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
+        .read = il3945_sta_dbgfs_stats_table_read,
+        .open = il3945_open_file_generic,
+        .llseek = default_llseek,
+};
+
+static void
+il3945_add_debugfs(void *il, void *il_sta, struct dentry *dir)
+{
+        struct il3945_rs_sta *lq_sta = il_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);
+
+}
+
+static void
+il3945_remove_debugfs(void *il, void *il_sta)
+{
+        struct il3945_rs_sta *lq_sta = il_sta;
+        debugfs_remove(lq_sta->rs_sta_dbgfs_stats_table_file);
+}
+#endif
+
+/*
+ * Initialization of rate scaling information is done by driver after
+ * the station is added. Since mac80211 calls this function before a
+ * station is added we ignore it.
+ */
+static void
+il3945_rs_rate_init_stub(void *il_r, struct ieee80211_supported_band *sband,
+                         struct ieee80211_sta *sta, void *il_sta)
+{
+}
+
+static struct rate_control_ops rs_ops = {
+        .module = NULL,
+        .name = RS_NAME,
+        .tx_status = il3945_rs_tx_status,
+        .get_rate = il3945_rs_get_rate,
+        .rate_init = il3945_rs_rate_init_stub,
+        .alloc = il3945_rs_alloc,
+        .free = il3945_rs_free,
+        .alloc_sta = il3945_rs_alloc_sta,
+        .free_sta = il3945_rs_free_sta,
+#ifdef CONFIG_MAC80211_DEBUGFS
+        .add_sta_debugfs = il3945_add_debugfs,
+        .remove_sta_debugfs = il3945_remove_debugfs,
+#endif
+
+};
+
+void
+il3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
+{
+        struct il_priv *il = hw->priv;
+        s32 rssi = 0;
+        unsigned long flags;
+        struct il3945_rs_sta *rs_sta;
+        struct ieee80211_sta *sta;
+        struct il3945_sta_priv *psta;
+
+        D_RATE("enter\n");
+
+        rcu_read_lock();
+
+        sta =
+            ieee80211_find_sta(il->ctx.vif, il->stations[sta_id].sta.sta.addr);
+        if (!sta) {
+                D_RATE("Unable to find station to initialize rate scaling.\n");
+                rcu_read_unlock();
+                return;
+        }
+
+        psta = (void *)sta->drv_priv;
+        rs_sta = &psta->rs_sta;
+
+        spin_lock_irqsave(&rs_sta->lock, flags);
+
+        rs_sta->tgg = 0;
+        switch (il->band) {
+        case IEEE80211_BAND_2GHZ:
+                /* TODO: this always does G, not a regression */
+                if (il->ctx.active.flags & RXON_FLG_TGG_PROTECT_MSK) {
+                        rs_sta->tgg = 1;
+                        rs_sta->expected_tpt = il3945_expected_tpt_g_prot;
+                } else
+                        rs_sta->expected_tpt = il3945_expected_tpt_g;
+                break;
+
+        case IEEE80211_BAND_5GHZ:
+                rs_sta->expected_tpt = il3945_expected_tpt_a;
+                break;
+        case IEEE80211_NUM_BANDS:
+                BUG();
+                break;
+        }
+
+        spin_unlock_irqrestore(&rs_sta->lock, flags);
+
+        rssi = il->_3945.last_rx_rssi;
+        if (rssi == 0)
+                rssi = IL_MIN_RSSI_VAL;
+
+        D_RATE("Network RSSI: %d\n", rssi);
+
+        rs_sta->start_rate = il3945_get_rate_idx_by_rssi(rssi, il->band);
+
+        D_RATE("leave: rssi %d assign rate idx: " "%d (plcp 0x%x)\n", rssi,
+               rs_sta->start_rate, il3945_rates[rs_sta->start_rate].plcp);
+        rcu_read_unlock();
+}
+
+int
+il3945_rate_control_register(void)
+{
+        return ieee80211_rate_control_register(&rs_ops);
+}
+
+void
+il3945_rate_control_unregister(void)
+{
+        ieee80211_rate_control_unregister(&rs_ops);
+}
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c
new file mode 100644
index 000000000000..863664f9ba8b
--- /dev/null
+++ b/drivers/net/wireless/iwlegacy/3945.c
@@ -0,0 +1,2751 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2003 - 2011 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:
+ *  Intel Linux Wireless <ilw@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/init.h>
+#include <linux/slab.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/firmware.h>
+#include <linux/etherdevice.h>
+#include <asm/unaligned.h>
+#include <net/mac80211.h>
+
+#include "common.h"
+#include "3945.h"
+
+/* Send led command */
+static int
+il3945_send_led_cmd(struct il_priv *il, struct il_led_cmd *led_cmd)
+{
+        struct il_host_cmd cmd = {
+                .id = C_LEDS,
+                .len = sizeof(struct il_led_cmd),
+                .data = led_cmd,
+                .flags = CMD_ASYNC,
+                .callback = NULL,
+        };
+
+        return il_send_cmd(il, &cmd);
+}
+
+const struct il_led_ops il3945_led_ops = {
+        .cmd = il3945_send_led_cmd,
+};
+
+#define IL_DECLARE_RATE_INFO(r, ip, in, rp, rn, pp, np)    \
+        [RATE_##r##M_IDX] = { RATE_##r##M_PLCP,   \
+                                    RATE_##r##M_IEEE,   \
+                                    RATE_##ip##M_IDX, \
+                                    RATE_##in##M_IDX, \
+                                    RATE_##rp##M_IDX, \
+                                    RATE_##rn##M_IDX, \
+                                    RATE_##pp##M_IDX, \
+                                    RATE_##np##M_IDX, \
+                                    RATE_##r##M_IDX_TBL, \
+                                    RATE_##ip##M_IDX_TBL }
+
+/*
+ * Parameter order:
+ *   rate, prev rate, next rate, prev tgg rate, next tgg rate
+ *
+ * If there isn't a valid next or previous rate then INV is used which
+ * maps to RATE_INVALID
+ *
+ */
+const struct il3945_rate_info il3945_rates[RATE_COUNT_3945] = {
+        IL_DECLARE_RATE_INFO(1, INV, 2, INV, 2, INV, 2),        /*  1mbps */
+        IL_DECLARE_RATE_INFO(2, 1, 5, 1, 5, 1, 5),      /*  2mbps */
+        IL_DECLARE_RATE_INFO(5, 2, 6, 2, 11, 2, 11),    /*5.5mbps */
+        IL_DECLARE_RATE_INFO(11, 9, 12, 5, 12, 5, 18),  /* 11mbps */
+        IL_DECLARE_RATE_INFO(6, 5, 9, 5, 11, 5, 11),    /*  6mbps */
+        IL_DECLARE_RATE_INFO(9, 6, 11, 5, 11, 5, 11),   /*  9mbps */
+        IL_DECLARE_RATE_INFO(12, 11, 18, 11, 18, 11, 18),       /* 12mbps */
+        IL_DECLARE_RATE_INFO(18, 12, 24, 12, 24, 11, 24),       /* 18mbps */
+        IL_DECLARE_RATE_INFO(24, 18, 36, 18, 36, 18, 36),       /* 24mbps */
+        IL_DECLARE_RATE_INFO(36, 24, 48, 24, 48, 24, 48),       /* 36mbps */
+        IL_DECLARE_RATE_INFO(48, 36, 54, 36, 54, 36, 54),       /* 48mbps */
+        IL_DECLARE_RATE_INFO(54, 48, INV, 48, INV, 48, INV),    /* 54mbps */
+};
+
+static inline u8
+il3945_get_prev_ieee_rate(u8 rate_idx)
+{
+        u8 rate = il3945_rates[rate_idx].prev_ieee;
+
+        if (rate == RATE_INVALID)
+                rate = rate_idx;
+        return rate;
+}
+
+/* 1 = enable the il3945_disable_events() function */
+#define IL_EVT_DISABLE (0)
+#define IL_EVT_DISABLE_SIZE (1532/32)
+
+/**
+ * il3945_disable_events - Disable selected events in uCode event log
+ *
+ * Disable an event by writing "1"s into "disable"
+ *   bitmap in SRAM.  Bit position corresponds to Event # (id/type).
+ *   Default values of 0 enable uCode events to be logged.
+ * Use for only special debugging.  This function is just a placeholder as-is,
+ *   you'll need to provide the special bits! ...
+ *   ... and set IL_EVT_DISABLE to 1. */
+void
+il3945_disable_events(struct il_priv *il)
+{
+        int i;
+        u32 base;               /* SRAM address of event log header */
+        u32 disable_ptr;        /* SRAM address of event-disable bitmap array */
+        u32 array_size;         /* # of u32 entries in array */
+        static const u32 evt_disable[IL_EVT_DISABLE_SIZE] = {
+                0x00000000,     /*   31 -    0  Event id numbers */
+                0x00000000,     /*   63 -   32 */
+                0x00000000,     /*   95 -   64 */
+                0x00000000,     /*  127 -   96 */
+                0x00000000,     /*  159 -  128 */
+                0x00000000,     /*  191 -  160 */
+                0x00000000,     /*  223 -  192 */
+                0x00000000,     /*  255 -  224 */
+                0x00000000,     /*  287 -  256 */
+                0x00000000,     /*  319 -  288 */
+                0x00000000,     /*  351 -  320 */
+                0x00000000,     /*  383 -  352 */
+                0x00000000,     /*  415 -  384 */
+                0x00000000,     /*  447 -  416 */
+                0x00000000,     /*  479 -  448 */
+                0x00000000,     /*  511 -  480 */
+                0x00000000,     /*  543 -  512 */
+                0x00000000,     /*  575 -  544 */
+                0x00000000,     /*  607 -  576 */
+                0x00000000,     /*  639 -  608 */
+                0x00000000,     /*  671 -  640 */
+                0x00000000,     /*  703 -  672 */
+                0x00000000,     /*  735 -  704 */
+                0x00000000,     /*  767 -  736 */
+                0x00000000,     /*  799 -  768 */
+                0x00000000,     /*  831 -  800 */
+                0x00000000,     /*  863 -  832 */
+                0x00000000,     /*  895 -  864 */
+                0x00000000,     /*  927 -  896 */
+                0x00000000,     /*  959 -  928 */
+                0x00000000,     /*  991 -  960 */
+                0x00000000,     /* 1023 -  992 */
+                0x00000000,     /* 1055 - 1024 */
+                0x00000000,     /* 1087 - 1056 */
+                0x00000000,     /* 1119 - 1088 */
+                0x00000000,     /* 1151 - 1120 */
+                0x00000000,     /* 1183 - 1152 */
+                0x00000000,     /* 1215 - 1184 */
+                0x00000000,     /* 1247 - 1216 */
+                0x00000000,     /* 1279 - 1248 */
+                0x00000000,     /* 1311 - 1280 */
+                0x00000000,     /* 1343 - 1312 */
+                0x00000000,     /* 1375 - 1344 */
+                0x00000000,     /* 1407 - 1376 */
+                0x00000000,     /* 1439 - 1408 */
+                0x00000000,     /* 1471 - 1440 */
+                0x00000000,     /* 1503 - 1472 */
+        };
+
+        base = le32_to_cpu(il->card_alive.log_event_table_ptr);
+        if (!il3945_hw_valid_rtc_data_addr(base)) {
+                IL_ERR("Invalid event log pointer 0x%08X\n", base);
+                return;
+        }
+
+        disable_ptr = il_read_targ_mem(il, base + (4 * sizeof(u32)));
+        array_size = il_read_targ_mem(il, base + (5 * sizeof(u32)));
+
+        if (IL_EVT_DISABLE && array_size == IL_EVT_DISABLE_SIZE) {
+                D_INFO("Disabling selected uCode log events at 0x%x\n",
+                       disable_ptr);
+                for (i = 0; i < IL_EVT_DISABLE_SIZE; i++)
+                        il_write_targ_mem(il, disable_ptr + (i * sizeof(u32)),
+                                          evt_disable[i]);
+
+        } else {
+                D_INFO("Selected uCode log events may be disabled\n");
+                D_INFO("  by writing \"1\"s into disable bitmap\n");
+                D_INFO("  in SRAM at 0x%x, size %d u32s\n", disable_ptr,
+                       array_size);
+        }
+
+}
+
+static int
+il3945_hwrate_to_plcp_idx(u8 plcp)
+{
+        int idx;
+
+        for (idx = 0; idx < RATE_COUNT_3945; idx++)
+                if (il3945_rates[idx].plcp == plcp)
+                        return idx;
+        return -1;
+}
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+#define TX_STATUS_ENTRY(x) case TX_3945_STATUS_FAIL_ ## x: return #x
+
+static const char *
+il3945_get_tx_fail_reason(u32 status)
+{
+        switch (status & TX_STATUS_MSK) {
+        case TX_3945_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 *
+il3945_get_tx_fail_reason(u32 status)
+{
+        return "";
+}
+#endif
+
+/*
+ * get ieee prev rate from rate scale table.
+ * for A and B mode we need to overright prev
+ * value
+ */
+int
+il3945_rs_next_rate(struct il_priv *il, int rate)
+{
+        int next_rate = il3945_get_prev_ieee_rate(rate);
+
+        switch (il->band) {
+        case IEEE80211_BAND_5GHZ:
+                if (rate == RATE_12M_IDX)
+                        next_rate = RATE_9M_IDX;
+                else if (rate == RATE_6M_IDX)
+                        next_rate = RATE_6M_IDX;
+                break;
+        case IEEE80211_BAND_2GHZ:
+                if (!(il->_3945.sta_supp_rates & IL_OFDM_RATES_MASK) &&
+                    il_is_associated(il)) {
+                        if (rate == RATE_11M_IDX)
+                                next_rate = RATE_5M_IDX;
+                }
+                break;
+
+        default:
+                break;
+        }
+
+        return next_rate;
+}
+
+/**
+ * il3945_tx_queue_reclaim - Reclaim Tx queue entries already Tx'd
+ *
+ * When FW advances 'R' idx, all entries between old and new 'R' idx
+ * 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
+il3945_tx_queue_reclaim(struct il_priv *il, int txq_id, int idx)
+{
+        struct il_tx_queue *txq = &il->txq[txq_id];
+        struct il_queue *q = &txq->q;
+        struct il_tx_info *tx_info;
+
+        BUG_ON(txq_id == IL39_CMD_QUEUE_NUM);
+
+        for (idx = il_queue_inc_wrap(idx, q->n_bd); q->read_ptr != idx;
+             q->read_ptr = il_queue_inc_wrap(q->read_ptr, q->n_bd)) {
+
+                tx_info = &txq->txb[txq->q.read_ptr];
+                ieee80211_tx_status_irqsafe(il->hw, tx_info->skb);
+                tx_info->skb = NULL;
+                il->cfg->ops->lib->txq_free_tfd(il, txq);
+        }
+
+        if (il_queue_space(q) > q->low_mark && txq_id >= 0 &&
+            txq_id != IL39_CMD_QUEUE_NUM && il->mac80211_registered)
+                il_wake_queue(il, txq);
+}
+
+/**
+ * il3945_hdl_tx - Handle Tx response
+ */
+static void
+il3945_hdl_tx(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        u16 sequence = le16_to_cpu(pkt->hdr.sequence);
+        int txq_id = SEQ_TO_QUEUE(sequence);
+        int idx = SEQ_TO_IDX(sequence);
+        struct il_tx_queue *txq = &il->txq[txq_id];
+        struct ieee80211_tx_info *info;
+        struct il3945_tx_resp *tx_resp = (void *)&pkt->u.raw[0];
+        u32 status = le32_to_cpu(tx_resp->status);
+        int rate_idx;
+        int fail;
+
+        if (idx >= txq->q.n_bd || il_queue_used(&txq->q, idx) == 0) {
+                IL_ERR("Read idx for DMA queue txq_id (%d) idx %d "
+                       "is out of range [0-%d] %d %d\n", txq_id, idx,
+                       txq->q.n_bd, txq->q.write_ptr, txq->q.read_ptr);
+                return;
+        }
+
+        txq->time_stamp = jiffies;
+        info = IEEE80211_SKB_CB(txq->txb[txq->q.read_ptr].skb);
+        ieee80211_tx_info_clear_status(info);
+
+        /* Fill the MRR chain with some info about on-chip retransmissions */
+        rate_idx = il3945_hwrate_to_plcp_idx(tx_resp->rate);
+        if (info->band == IEEE80211_BAND_5GHZ)
+                rate_idx -= IL_FIRST_OFDM_RATE;
+
+        fail = tx_resp->failure_frame;
+
+        info->status.rates[0].idx = rate_idx;
+        info->status.rates[0].count = fail + 1; /* add final attempt */
+
+        /* tx_status->rts_retry_count = tx_resp->failure_rts; */
+        info->flags |=
+            ((status & TX_STATUS_MSK) ==
+             TX_STATUS_SUCCESS) ? IEEE80211_TX_STAT_ACK : 0;
+
+        D_TX("Tx queue %d Status %s (0x%08x) plcp rate %d retries %d\n", txq_id,
+             il3945_get_tx_fail_reason(status), status, tx_resp->rate,
+             tx_resp->failure_frame);
+
+        D_TX_REPLY("Tx queue reclaim %d\n", idx);
+        il3945_tx_queue_reclaim(il, txq_id, idx);
+
+        if (status & TX_ABORT_REQUIRED_MSK)
+                IL_ERR("TODO:  Implement Tx ABORT REQUIRED!!!\n");
+}
+
+/*****************************************************************************
+ *
+ * Intel PRO/Wireless 3945ABG/BG Network Connection
+ *
+ *  RX handler implementations
+ *
+ *****************************************************************************/
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+static void
+il3945_accumulative_stats(struct il_priv *il, __le32 * stats)
+{
+        int i;
+        __le32 *prev_stats;
+        u32 *accum_stats;
+        u32 *delta, *max_delta;
+
+        prev_stats = (__le32 *) &il->_3945.stats;
+        accum_stats = (u32 *) &il->_3945.accum_stats;
+        delta = (u32 *) &il->_3945.delta_stats;
+        max_delta = (u32 *) &il->_3945.max_delta;
+
+        for (i = sizeof(__le32); i < sizeof(struct il3945_notif_stats);
+             i +=
+             sizeof(__le32), stats++, prev_stats++, delta++, max_delta++,
+             accum_stats++) {
+                if (le32_to_cpu(*stats) > le32_to_cpu(*prev_stats)) {
+                        *delta =
+                            (le32_to_cpu(*stats) - le32_to_cpu(*prev_stats));
+                        *accum_stats += *delta;
+                        if (*delta > *max_delta)
+                                *max_delta = *delta;
+                }
+        }
+
+        /* reset accumulative stats for "no-counter" type stats */
+        il->_3945.accum_stats.general.temperature =
+            il->_3945.stats.general.temperature;
+        il->_3945.accum_stats.general.ttl_timestamp =
+            il->_3945.stats.general.ttl_timestamp;
+}
+#endif
+
+void
+il3945_hdl_stats(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+
+        D_RX("Statistics notification received (%d vs %d).\n",
+             (int)sizeof(struct il3945_notif_stats),
+             le32_to_cpu(pkt->len_n_flags) & IL_RX_FRAME_SIZE_MSK);
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+        il3945_accumulative_stats(il, (__le32 *) &pkt->u.raw);
+#endif
+
+        memcpy(&il->_3945.stats, pkt->u.raw, sizeof(il->_3945.stats));
+}
+
+void
+il3945_hdl_c_stats(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        __le32 *flag = (__le32 *) &pkt->u.raw;
+
+        if (le32_to_cpu(*flag) & UCODE_STATS_CLEAR_MSK) {
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+                memset(&il->_3945.accum_stats, 0,
+                       sizeof(struct il3945_notif_stats));
+                memset(&il->_3945.delta_stats, 0,
+                       sizeof(struct il3945_notif_stats));
+                memset(&il->_3945.max_delta, 0,
+                       sizeof(struct il3945_notif_stats));
+#endif
+                D_RX("Statistics have been cleared\n");
+        }
+        il3945_hdl_stats(il, rxb);
+}
+
+/******************************************************************************
+ *
+ * Misc. internal state and helper functions
+ *
+ ******************************************************************************/
+
+/* This is necessary only for a number of stats, see the caller. */
+static int
+il3945_is_network_packet(struct il_priv *il, struct ieee80211_hdr *header)
+{
+        /* Filter incoming packets to determine if they are targeted toward
+         * this network, discarding packets coming from ourselves */
+        switch (il->iw_mode) {
+        case NL80211_IFTYPE_ADHOC:      /* Header: Dest. | Source    | BSSID */
+                /* packets to our IBSS update information */
+                return !compare_ether_addr(header->addr3, il->bssid);
+        case NL80211_IFTYPE_STATION:    /* Header: Dest. | AP{BSSID} | Source */
+                /* packets to our IBSS update information */
+                return !compare_ether_addr(header->addr2, il->bssid);
+        default:
+                return 1;
+        }
+}
+
+static void
+il3945_pass_packet_to_mac80211(struct il_priv *il, struct il_rx_buf *rxb,
+                               struct ieee80211_rx_status *stats)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)IL_RX_DATA(pkt);
+        struct il3945_rx_frame_hdr *rx_hdr = IL_RX_HDR(pkt);
+        struct il3945_rx_frame_end *rx_end = IL_RX_END(pkt);
+        u16 len = le16_to_cpu(rx_hdr->len);
+        struct sk_buff *skb;
+        __le16 fc = hdr->frame_control;
+
+        /* We received data from the HW, so stop the watchdog */
+        if (unlikely
+            (len + IL39_RX_FRAME_SIZE >
+             PAGE_SIZE << il->hw_params.rx_page_order)) {
+                D_DROP("Corruption detected!\n");
+                return;
+        }
+
+        /* We only process data packets if the interface is open */
+        if (unlikely(!il->is_open)) {
+                D_DROP("Dropping packet while interface is not open.\n");
+                return;
+        }
+
+        skb = dev_alloc_skb(128);
+        if (!skb) {
+                IL_ERR("dev_alloc_skb failed\n");
+                return;
+        }
+
+        if (!il3945_mod_params.sw_crypto)
+                il_set_decrypted_flag(il, (struct ieee80211_hdr *)rxb_addr(rxb),
+                                      le32_to_cpu(rx_end->status), stats);
+
+        skb_add_rx_frag(skb, 0, rxb->page,
+                        (void *)rx_hdr->payload - (void *)pkt, len);
+
+        il_update_stats(il, false, fc, len);
+        memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats));
+
+        ieee80211_rx(il->hw, skb);
+        il->alloc_rxb_page--;
+        rxb->page = NULL;
+}
+
+#define IL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6)
+
+static void
+il3945_hdl_rx(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct ieee80211_hdr *header;
+        struct ieee80211_rx_status rx_status;
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct il3945_rx_frame_stats *rx_stats = IL_RX_STATS(pkt);
+        struct il3945_rx_frame_hdr *rx_hdr = IL_RX_HDR(pkt);
+        struct il3945_rx_frame_end *rx_end = IL_RX_END(pkt);
+        u16 rx_stats_sig_avg __maybe_unused = le16_to_cpu(rx_stats->sig_avg);
+        u16 rx_stats_noise_diff __maybe_unused =
+            le16_to_cpu(rx_stats->noise_diff);
+        u8 network_packet;
+
+        rx_status.flag = 0;
+        rx_status.mactime = le64_to_cpu(rx_end->timestamp);
+        rx_status.band =
+            (rx_hdr->
+             phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK) ? IEEE80211_BAND_2GHZ :
+            IEEE80211_BAND_5GHZ;
+        rx_status.freq =
+            ieee80211_channel_to_frequency(le16_to_cpu(rx_hdr->channel),
+                                           rx_status.band);
+
+        rx_status.rate_idx = il3945_hwrate_to_plcp_idx(rx_hdr->rate);
+        if (rx_status.band == IEEE80211_BAND_5GHZ)
+                rx_status.rate_idx -= IL_FIRST_OFDM_RATE;
+
+        rx_status.antenna =
+            (le16_to_cpu(rx_hdr->phy_flags) & RX_RES_PHY_FLAGS_ANTENNA_MSK) >>
+            4;
+
+        /* set the preamble flag if appropriate */
+        if (rx_hdr->phy_flags & RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)
+                rx_status.flag |= RX_FLAG_SHORTPRE;
+
+        if ((unlikely(rx_stats->phy_count > 20))) {
+                D_DROP("dsp size out of range [0,20]: %d/n",
+                       rx_stats->phy_count);
+                return;
+        }
+
+        if (!(rx_end->status & RX_RES_STATUS_NO_CRC32_ERROR) ||
+            !(rx_end->status & RX_RES_STATUS_NO_RXE_OVERFLOW)) {
+                D_RX("Bad CRC or FIFO: 0x%08X.\n", rx_end->status);
+                return;
+        }
+
+        /* Convert 3945's rssi indicator to dBm */
+        rx_status.signal = rx_stats->rssi - IL39_RSSI_OFFSET;
+
+        D_STATS("Rssi %d sig_avg %d noise_diff %d\n", rx_status.signal,
+                rx_stats_sig_avg, rx_stats_noise_diff);
+
+        header = (struct ieee80211_hdr *)IL_RX_DATA(pkt);
+
+        network_packet = il3945_is_network_packet(il, header);
+
+        D_STATS("[%c] %d RSSI:%d Signal:%u, Rate:%u\n",
+                network_packet ? '*' : ' ', le16_to_cpu(rx_hdr->channel),
+                rx_status.signal, rx_status.signal, rx_status.rate_idx);
+
+        il_dbg_log_rx_data_frame(il, le16_to_cpu(rx_hdr->len), header);
+
+        if (network_packet) {
+                il->_3945.last_beacon_time =
+                    le32_to_cpu(rx_end->beacon_timestamp);
+                il->_3945.last_tsf = le64_to_cpu(rx_end->timestamp);
+                il->_3945.last_rx_rssi = rx_status.signal;
+        }
+
+        il3945_pass_packet_to_mac80211(il, rxb, &rx_status);
+}
+
+int
+il3945_hw_txq_attach_buf_to_tfd(struct il_priv *il, struct il_tx_queue *txq,
+                                dma_addr_t addr, u16 len, u8 reset, u8 pad)
+{
+        int count;
+        struct il_queue *q;
+        struct il3945_tfd *tfd, *tfd_tmp;
+
+        q = &txq->q;
+        tfd_tmp = (struct il3945_tfd *)txq->tfds;
+        tfd = &tfd_tmp[q->write_ptr];
+
+        if (reset)
+                memset(tfd, 0, sizeof(*tfd));
+
+        count = TFD_CTL_COUNT_GET(le32_to_cpu(tfd->control_flags));
+
+        if (count >= NUM_TFD_CHUNKS || count < 0) {
+                IL_ERR("Error can not send more than %d chunks\n",
+                       NUM_TFD_CHUNKS);
+                return -EINVAL;
+        }
+
+        tfd->tbs[count].addr = cpu_to_le32(addr);
+        tfd->tbs[count].len = cpu_to_le32(len);
+
+        count++;
+
+        tfd->control_flags =
+            cpu_to_le32(TFD_CTL_COUNT_SET(count) | TFD_CTL_PAD_SET(pad));
+
+        return 0;
+}
+
+/**
+ * il3945_hw_txq_free_tfd - Free one TFD, those at idx [txq->q.read_ptr]
+ *
+ * Does NOT advance any idxes
+ */
+void
+il3945_hw_txq_free_tfd(struct il_priv *il, struct il_tx_queue *txq)
+{
+        struct il3945_tfd *tfd_tmp = (struct il3945_tfd *)txq->tfds;
+        int idx = txq->q.read_ptr;
+        struct il3945_tfd *tfd = &tfd_tmp[idx];
+        struct pci_dev *dev = il->pci_dev;
+        int i;
+        int counter;
+
+        /* sanity check */
+        counter = TFD_CTL_COUNT_GET(le32_to_cpu(tfd->control_flags));
+        if (counter > NUM_TFD_CHUNKS) {
+                IL_ERR("Too many chunks: %i\n", counter);
+                /* @todo issue fatal error, it is quite serious situation */
+                return;
+        }
+
+        /* Unmap tx_cmd */
+        if (counter)
+                pci_unmap_single(dev, dma_unmap_addr(&txq->meta[idx], mapping),
+                                 dma_unmap_len(&txq->meta[idx], len),
+                                 PCI_DMA_TODEVICE);
+
+        /* unmap chunks if any */
+
+        for (i = 1; i < counter; i++)
+                pci_unmap_single(dev, le32_to_cpu(tfd->tbs[i].addr),
+                                 le32_to_cpu(tfd->tbs[i].len),
+                                 PCI_DMA_TODEVICE);
+
+        /* free SKB */
+        if (txq->txb) {
+                struct sk_buff *skb;
+
+                skb = txq->txb[txq->q.read_ptr].skb;
+
+                /* can be called from irqs-disabled context */
+                if (skb) {
+                        dev_kfree_skb_any(skb);
+                        txq->txb[txq->q.read_ptr].skb = NULL;
+                }
+        }
+}
+
+/**
+ * il3945_hw_build_tx_cmd_rate - Add rate portion to TX_CMD:
+ *
+*/
+void
+il3945_hw_build_tx_cmd_rate(struct il_priv *il, struct il_device_cmd *cmd,
+                            struct ieee80211_tx_info *info,
+                            struct ieee80211_hdr *hdr, int sta_id, int tx_id)
+{
+        u16 hw_value = ieee80211_get_tx_rate(il->hw, info)->hw_value;
+        u16 rate_idx = min(hw_value & 0xffff, RATE_COUNT_3945);
+        u16 rate_mask;
+        int rate;
+        u8 rts_retry_limit;
+        u8 data_retry_limit;
+        __le32 tx_flags;
+        __le16 fc = hdr->frame_control;
+        struct il3945_tx_cmd *tx_cmd = (struct il3945_tx_cmd *)cmd->cmd.payload;
+
+        rate = il3945_rates[rate_idx].plcp;
+        tx_flags = tx_cmd->tx_flags;
+
+        /* We need to figure out how to get the sta->supp_rates while
+         * in this running context */
+        rate_mask = RATES_MASK_3945;
+
+        /* Set retry limit on DATA packets and Probe Responses */
+        if (ieee80211_is_probe_resp(fc))
+                data_retry_limit = 3;
+        else
+                data_retry_limit = IL_DEFAULT_TX_RETRY;
+        tx_cmd->data_retry_limit = data_retry_limit;
+
+        if (tx_id >= IL39_CMD_QUEUE_NUM)
+                rts_retry_limit = 3;
+        else
+                rts_retry_limit = 7;
+
+        if (data_retry_limit < rts_retry_limit)
+                rts_retry_limit = data_retry_limit;
+        tx_cmd->rts_retry_limit = rts_retry_limit;
+
+        tx_cmd->rate = rate;
+        tx_cmd->tx_flags = tx_flags;
+
+        /* OFDM */
+        tx_cmd->supp_rates[0] =
+            ((rate_mask & IL_OFDM_RATES_MASK) >> IL_FIRST_OFDM_RATE) & 0xFF;
+
+        /* CCK */
+        tx_cmd->supp_rates[1] = (rate_mask & 0xF);
+
+        D_RATE("Tx sta id: %d, rate: %d (plcp), flags: 0x%4X "
+               "cck/ofdm mask: 0x%x/0x%x\n", sta_id, tx_cmd->rate,
+               le32_to_cpu(tx_cmd->tx_flags), tx_cmd->supp_rates[1],
+               tx_cmd->supp_rates[0]);
+}
+
+static u8
+il3945_sync_sta(struct il_priv *il, int sta_id, u16 tx_rate)
+{
+        unsigned long flags_spin;
+        struct il_station_entry *station;
+
+        if (sta_id == IL_INVALID_STATION)
+                return IL_INVALID_STATION;
+
+        spin_lock_irqsave(&il->sta_lock, flags_spin);
+        station = &il->stations[sta_id];
+
+        station->sta.sta.modify_mask = STA_MODIFY_TX_RATE_MSK;
+        station->sta.rate_n_flags = cpu_to_le16(tx_rate);
+        station->sta.mode = STA_CONTROL_MODIFY_MSK;
+        il_send_add_sta(il, &station->sta, CMD_ASYNC);
+        spin_unlock_irqrestore(&il->sta_lock, flags_spin);
+
+        D_RATE("SCALE sync station %d to rate %d\n", sta_id, tx_rate);
+        return sta_id;
+}
+
+static void
+il3945_set_pwr_vmain(struct il_priv *il)
+{
+/*
+ * (for documentation purposes)
+ * to set power to V_AUX, do
+
+                if (pci_pme_capable(il->pci_dev, PCI_D3cold)) {
+                        il_set_bits_mask_prph(il, APMG_PS_CTRL_REG,
+                                        APMG_PS_CTRL_VAL_PWR_SRC_VAUX,
+                                        ~APMG_PS_CTRL_MSK_PWR_SRC);
+
+                        _il_poll_bit(il, CSR_GPIO_IN,
+                                     CSR_GPIO_IN_VAL_VAUX_PWR_SRC,
+                                     CSR_GPIO_IN_BIT_AUX_POWER, 5000);
+                }
+ */
+
+        il_set_bits_mask_prph(il, APMG_PS_CTRL_REG,
+                              APMG_PS_CTRL_VAL_PWR_SRC_VMAIN,
+                              ~APMG_PS_CTRL_MSK_PWR_SRC);
+
+        _il_poll_bit(il, CSR_GPIO_IN, CSR_GPIO_IN_VAL_VMAIN_PWR_SRC,
+                     CSR_GPIO_IN_BIT_AUX_POWER, 5000);
+}
+
+static int
+il3945_rx_init(struct il_priv *il, struct il_rx_queue *rxq)
+{
+        il_wr(il, FH39_RCSR_RBD_BASE(0), rxq->bd_dma);
+        il_wr(il, FH39_RCSR_RPTR_ADDR(0), rxq->rb_stts_dma);
+        il_wr(il, FH39_RCSR_WPTR(0), 0);
+        il_wr(il, FH39_RCSR_CONFIG(0),
+              FH39_RCSR_RX_CONFIG_REG_VAL_DMA_CHNL_EN_ENABLE |
+              FH39_RCSR_RX_CONFIG_REG_VAL_RDRBD_EN_ENABLE |
+              FH39_RCSR_RX_CONFIG_REG_BIT_WR_STTS_EN |
+              FH39_RCSR_RX_CONFIG_REG_VAL_MAX_FRAG_SIZE_128 | (RX_QUEUE_SIZE_LOG
+                                                               <<
+                                                               FH39_RCSR_RX_CONFIG_REG_POS_RBDC_SIZE)
+              | FH39_RCSR_RX_CONFIG_REG_VAL_IRQ_DEST_INT_HOST | (1 <<
+                                                                 FH39_RCSR_RX_CONFIG_REG_POS_IRQ_RBTH)
+              | FH39_RCSR_RX_CONFIG_REG_VAL_MSG_MODE_FH);
+
+        /* fake read to flush all prev I/O */
+        il_rd(il, FH39_RSSR_CTRL);
+
+        return 0;
+}
+
+static int
+il3945_tx_reset(struct il_priv *il)
+{
+
+        /* bypass mode */
+        il_wr_prph(il, ALM_SCD_MODE_REG, 0x2);
+
+        /* RA 0 is active */
+        il_wr_prph(il, ALM_SCD_ARASTAT_REG, 0x01);
+
+        /* all 6 fifo are active */
+        il_wr_prph(il, ALM_SCD_TXFACT_REG, 0x3f);
+
+        il_wr_prph(il, ALM_SCD_SBYP_MODE_1_REG, 0x010000);
+        il_wr_prph(il, ALM_SCD_SBYP_MODE_2_REG, 0x030002);
+        il_wr_prph(il, ALM_SCD_TXF4MF_REG, 0x000004);
+        il_wr_prph(il, ALM_SCD_TXF5MF_REG, 0x000005);
+
+        il_wr(il, FH39_TSSR_CBB_BASE, il->_3945.shared_phys);
+
+        il_wr(il, FH39_TSSR_MSG_CONFIG,
+              FH39_TSSR_TX_MSG_CONFIG_REG_VAL_SNOOP_RD_TXPD_ON |
+              FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RD_TXPD_ON |
+              FH39_TSSR_TX_MSG_CONFIG_REG_VAL_MAX_FRAG_SIZE_128B |
+              FH39_TSSR_TX_MSG_CONFIG_REG_VAL_SNOOP_RD_TFD_ON |
+              FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RD_CBB_ON |
+              FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RSP_WAIT_TH |
+              FH39_TSSR_TX_MSG_CONFIG_REG_VAL_RSP_WAIT_TH);
+
+        return 0;
+}
+
+/**
+ * il3945_txq_ctx_reset - Reset TX queue context
+ *
+ * Destroys all DMA structures and initialize them again
+ */
+static int
+il3945_txq_ctx_reset(struct il_priv *il)
+{
+        int rc;
+        int txq_id, slots_num;
+
+        il3945_hw_txq_ctx_free(il);
+
+        /* allocate tx queue structure */
+        rc = il_alloc_txq_mem(il);
+        if (rc)
+                return rc;
+
+        /* Tx CMD queue */
+        rc = il3945_tx_reset(il);
+        if (rc)
+                goto error;
+
+        /* Tx queue(s) */
+        for (txq_id = 0; txq_id < il->hw_params.max_txq_num; txq_id++) {
+                slots_num =
+                    (txq_id ==
+                     IL39_CMD_QUEUE_NUM) ? TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;
+                rc = il_tx_queue_init(il, &il->txq[txq_id], slots_num, txq_id);
+                if (rc) {
+                        IL_ERR("Tx %d queue init failed\n", txq_id);
+                        goto error;
+                }
+        }
+
+        return rc;
+
+error:
+        il3945_hw_txq_ctx_free(il);
+        return rc;
+}
+
+/*
+ * Start up 3945's basic functionality after it has been reset
+ * (e.g. after platform boot, or shutdown via il_apm_stop())
+ * NOTE:  This does not load uCode nor start the embedded processor
+ */
+static int
+il3945_apm_init(struct il_priv *il)
+{
+        int ret = il_apm_init(il);
+
+        /* Clear APMG (NIC's internal power management) interrupts */
+        il_wr_prph(il, APMG_RTC_INT_MSK_REG, 0x0);
+        il_wr_prph(il, APMG_RTC_INT_STT_REG, 0xFFFFFFFF);
+
+        /* Reset radio chip */
+        il_set_bits_prph(il, APMG_PS_CTRL_REG, APMG_PS_CTRL_VAL_RESET_REQ);
+        udelay(5);
+        il_clear_bits_prph(il, APMG_PS_CTRL_REG, APMG_PS_CTRL_VAL_RESET_REQ);
+
+        return ret;
+}
+
+static void
+il3945_nic_config(struct il_priv *il)
+{
+        struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il->eeprom;
+        unsigned long flags;
+        u8 rev_id = il->pci_dev->revision;
+
+        spin_lock_irqsave(&il->lock, flags);
+
+        /* Determine HW type */
+        D_INFO("HW Revision ID = 0x%X\n", rev_id);
+
+        if (rev_id & PCI_CFG_REV_ID_BIT_RTP)
+                D_INFO("RTP type\n");
+        else if (rev_id & PCI_CFG_REV_ID_BIT_BASIC_SKU) {
+                D_INFO("3945 RADIO-MB type\n");
+                il_set_bit(il, CSR_HW_IF_CONFIG_REG,
+                           CSR39_HW_IF_CONFIG_REG_BIT_3945_MB);
+        } else {
+                D_INFO("3945 RADIO-MM type\n");
+                il_set_bit(il, CSR_HW_IF_CONFIG_REG,
+                           CSR39_HW_IF_CONFIG_REG_BIT_3945_MM);
+        }
+
+        if (EEPROM_SKU_CAP_OP_MODE_MRC == eeprom->sku_cap) {
+                D_INFO("SKU OP mode is mrc\n");
+                il_set_bit(il, CSR_HW_IF_CONFIG_REG,
+                           CSR39_HW_IF_CONFIG_REG_BIT_SKU_MRC);
+        } else
+                D_INFO("SKU OP mode is basic\n");
+
+        if ((eeprom->board_revision & 0xF0) == 0xD0) {
+                D_INFO("3945ABG revision is 0x%X\n", eeprom->board_revision);
+                il_set_bit(il, CSR_HW_IF_CONFIG_REG,
+                           CSR39_HW_IF_CONFIG_REG_BIT_BOARD_TYPE);
+        } else {
+                D_INFO("3945ABG revision is 0x%X\n", eeprom->board_revision);
+                il_clear_bit(il, CSR_HW_IF_CONFIG_REG,
+                             CSR39_HW_IF_CONFIG_REG_BIT_BOARD_TYPE);
+        }
+
+        if (eeprom->almgor_m_version <= 1) {
+                il_set_bit(il, CSR_HW_IF_CONFIG_REG,
+                           CSR39_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_A);
+                D_INFO("Card M type A version is 0x%X\n",
+                       eeprom->almgor_m_version);
+        } else {
+                D_INFO("Card M type B version is 0x%X\n",
+                       eeprom->almgor_m_version);
+                il_set_bit(il, CSR_HW_IF_CONFIG_REG,
+                           CSR39_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_B);
+        }
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        if (eeprom->sku_cap & EEPROM_SKU_CAP_SW_RF_KILL_ENABLE)
+                D_RF_KILL("SW RF KILL supported in EEPROM.\n");
+
+        if (eeprom->sku_cap & EEPROM_SKU_CAP_HW_RF_KILL_ENABLE)
+                D_RF_KILL("HW RF KILL supported in EEPROM.\n");
+}
+
+int
+il3945_hw_nic_init(struct il_priv *il)
+{
+        int rc;
+        unsigned long flags;
+        struct il_rx_queue *rxq = &il->rxq;
+
+        spin_lock_irqsave(&il->lock, flags);
+        il->cfg->ops->lib->apm_ops.init(il);
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        il3945_set_pwr_vmain(il);
+
+        il->cfg->ops->lib->apm_ops.config(il);
+
+        /* Allocate the RX queue, or reset if it is already allocated */
+        if (!rxq->bd) {
+                rc = il_rx_queue_alloc(il);
+                if (rc) {
+                        IL_ERR("Unable to initialize Rx queue\n");
+                        return -ENOMEM;
+                }
+        } else
+                il3945_rx_queue_reset(il, rxq);
+
+        il3945_rx_replenish(il);
+
+        il3945_rx_init(il, rxq);
+
+        /* Look at using this instead:
+           rxq->need_update = 1;
+           il_rx_queue_update_write_ptr(il, rxq);
+         */
+
+        il_wr(il, FH39_RCSR_WPTR(0), rxq->write & ~7);
+
+        rc = il3945_txq_ctx_reset(il);
+        if (rc)
+                return rc;
+
+        set_bit(S_INIT, &il->status);
+
+        return 0;
+}
+
+/**
+ * il3945_hw_txq_ctx_free - Free TXQ Context
+ *
+ * Destroy all TX DMA queues and structures
+ */
+void
+il3945_hw_txq_ctx_free(struct il_priv *il)
+{
+        int txq_id;
+
+        /* Tx queues */
+        if (il->txq)
+                for (txq_id = 0; txq_id < il->hw_params.max_txq_num; txq_id++)
+                        if (txq_id == IL39_CMD_QUEUE_NUM)
+                                il_cmd_queue_free(il);
+                        else
+                                il_tx_queue_free(il, txq_id);
+
+        /* free tx queue structure */
+        il_txq_mem(il);
+}
+
+void
+il3945_hw_txq_ctx_stop(struct il_priv *il)
+{
+        int txq_id;
+
+        /* stop SCD */
+        il_wr_prph(il, ALM_SCD_MODE_REG, 0);
+        il_wr_prph(il, ALM_SCD_TXFACT_REG, 0);
+
+        /* reset TFD queues */
+        for (txq_id = 0; txq_id < il->hw_params.max_txq_num; txq_id++) {
+                il_wr(il, FH39_TCSR_CONFIG(txq_id), 0x0);
+                il_poll_bit(il, FH39_TSSR_TX_STATUS,
+                            FH39_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(txq_id),
+                            1000);
+        }
+
+        il3945_hw_txq_ctx_free(il);
+}
+
+/**
+ * il3945_hw_reg_adjust_power_by_temp
+ * return idx delta into power gain settings table
+*/
+static int
+il3945_hw_reg_adjust_power_by_temp(int new_reading, int old_reading)
+{
+        return (new_reading - old_reading) * (-11) / 100;
+}
+
+/**
+ * il3945_hw_reg_temp_out_of_range - Keep temperature in sane range
+ */
+static inline int
+il3945_hw_reg_temp_out_of_range(int temperature)
+{
+        return (temperature < -260 || temperature > 25) ? 1 : 0;
+}
+
+int
+il3945_hw_get_temperature(struct il_priv *il)
+{
+        return _il_rd(il, CSR_UCODE_DRV_GP2);
+}
+
+/**
+ * il3945_hw_reg_txpower_get_temperature
+ * get the current temperature by reading from NIC
+*/
+static int
+il3945_hw_reg_txpower_get_temperature(struct il_priv *il)
+{
+        struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il->eeprom;
+        int temperature;
+
+        temperature = il3945_hw_get_temperature(il);
+
+        /* driver's okay range is -260 to +25.
+         *   human readable okay range is 0 to +285 */
+        D_INFO("Temperature: %d\n", temperature + IL_TEMP_CONVERT);
+
+        /* handle insane temp reading */
+        if (il3945_hw_reg_temp_out_of_range(temperature)) {
+                IL_ERR("Error bad temperature value  %d\n", temperature);
+
+                /* if really really hot(?),
+                 *   substitute the 3rd band/group's temp measured at factory */
+                if (il->last_temperature > 100)
+                        temperature = eeprom->groups[2].temperature;
+                else            /* else use most recent "sane" value from driver */
+                        temperature = il->last_temperature;
+        }
+
+        return temperature;     /* raw, not "human readable" */
+}
+
+/* Adjust Txpower only if temperature variance is greater than threshold.
+ *
+ * Both are lower than older versions' 9 degrees */
+#define IL_TEMPERATURE_LIMIT_TIMER   6
+
+/**
+ * il3945_is_temp_calib_needed - determines if new calibration is needed
+ *
+ * records new temperature in tx_mgr->temperature.
+ * replaces tx_mgr->last_temperature *only* if calib needed
+ *    (assumes caller will actually do the calibration!). */
+static int
+il3945_is_temp_calib_needed(struct il_priv *il)
+{
+        int temp_diff;
+
+        il->temperature = il3945_hw_reg_txpower_get_temperature(il);
+        temp_diff = il->temperature - il->last_temperature;
+
+        /* get absolute value */
+        if (temp_diff < 0) {
+                D_POWER("Getting cooler, delta %d,\n", temp_diff);
+                temp_diff = -temp_diff;
+        } else if (temp_diff == 0)
+                D_POWER("Same temp,\n");
+        else
+                D_POWER("Getting warmer, delta %d,\n", temp_diff);
+
+        /* if we don't need calibration, *don't* update last_temperature */
+        if (temp_diff < IL_TEMPERATURE_LIMIT_TIMER) {
+                D_POWER("Timed thermal calib not needed\n");
+                return 0;
+        }
+
+        D_POWER("Timed thermal calib needed\n");
+
+        /* assume that caller will actually do calib ...
+         *   update the "last temperature" value */
+        il->last_temperature = il->temperature;
+        return 1;
+}
+
+#define IL_MAX_GAIN_ENTRIES 78
+#define IL_CCK_FROM_OFDM_POWER_DIFF  -5
+#define IL_CCK_FROM_OFDM_IDX_DIFF (10)
+
+/* radio and DSP power table, each step is 1/2 dB.
+ * 1st number is for RF analog gain, 2nd number is for DSP pre-DAC gain. */
+static struct il3945_tx_power power_gain_table[2][IL_MAX_GAIN_ENTRIES] = {
+        {
+         {251, 127},            /* 2.4 GHz, highest power */
+         {251, 127},
+         {251, 127},
+         {251, 127},
+         {251, 125},
+         {251, 110},
+         {251, 105},
+         {251, 98},
+         {187, 125},
+         {187, 115},
+         {187, 108},
+         {187, 99},
+         {243, 119},
+         {243, 111},
+         {243, 105},
+         {243, 97},
+         {243, 92},
+         {211, 106},
+         {211, 100},
+         {179, 120},
+         {179, 113},
+         {179, 107},
+         {147, 125},
+         {147, 119},
+         {147, 112},
+         {147, 106},
+         {147, 101},
+         {147, 97},
+         {147, 91},
+         {115, 107},
+         {235, 121},
+         {235, 115},
+         {235, 109},
+         {203, 127},
+         {203, 121},
+         {203, 115},
+         {203, 108},
+         {203, 102},
+         {203, 96},
+         {203, 92},
+         {171, 110},
+         {171, 104},
+         {171, 98},
+         {139, 116},
+         {227, 125},
+         {227, 119},
+         {227, 113},
+         {227, 107},
+         {227, 101},
+         {227, 96},
+         {195, 113},
+         {195, 106},
+         {195, 102},
+         {195, 95},
+         {163, 113},
+         {163, 106},
+         {163, 102},
+         {163, 95},
+         {131, 113},
+         {131, 106},
+         {131, 102},
+         {131, 95},
+         {99, 113},
+         {99, 106},
+         {99, 102},
+         {99, 95},
+         {67, 113},
+         {67, 106},
+         {67, 102},
+         {67, 95},
+         {35, 113},
+         {35, 106},
+         {35, 102},
+         {35, 95},
+         {3, 113},
+         {3, 106},
+         {3, 102},
+         {3, 95}                /* 2.4 GHz, lowest power */
+        },
+        {
+         {251, 127},            /* 5.x GHz, highest power */
+         {251, 120},
+         {251, 114},
+         {219, 119},
+         {219, 101},
+         {187, 113},
+         {187, 102},
+         {155, 114},
+         {155, 103},
+         {123, 117},
+         {123, 107},
+         {123, 99},
+         {123, 92},
+         {91, 108},
+         {59, 125},
+         {59, 118},
+         {59, 109},
+         {59, 102},
+         {59, 96},
+         {59, 90},
+         {27, 104},
+         {27, 98},
+         {27, 92},
+         {115, 118},
+         {115, 111},
+         {115, 104},
+         {83, 126},
+         {83, 121},
+         {83, 113},
+         {83, 105},
+         {83, 99},
+         {51, 118},
+         {51, 111},
+         {51, 104},
+         {51, 98},
+         {19, 116},
+         {19, 109},
+         {19, 102},
+         {19, 98},
+         {19, 93},
+         {171, 113},
+         {171, 107},
+         {171, 99},
+         {139, 120},
+         {139, 113},
+         {139, 107},
+         {139, 99},
+         {107, 120},
+         {107, 113},
+         {107, 107},
+         {107, 99},
+         {75, 120},
+         {75, 113},
+         {75, 107},
+         {75, 99},
+         {43, 120},
+         {43, 113},
+         {43, 107},
+         {43, 99},
+         {11, 120},
+         {11, 113},
+         {11, 107},
+         {11, 99},
+         {131, 107},
+         {131, 99},
+         {99, 120},
+         {99, 113},
+         {99, 107},
+         {99, 99},
+         {67, 120},
+         {67, 113},
+         {67, 107},
+         {67, 99},
+         {35, 120},
+         {35, 113},
+         {35, 107},
+         {35, 99},
+         {3, 120}               /* 5.x GHz, lowest power */
+        }
+};
+
+static inline u8
+il3945_hw_reg_fix_power_idx(int idx)
+{
+        if (idx < 0)
+                return 0;
+        if (idx >= IL_MAX_GAIN_ENTRIES)
+                return IL_MAX_GAIN_ENTRIES - 1;
+        return (u8) idx;
+}
+
+/* Kick off thermal recalibration check every 60 seconds */
+#define REG_RECALIB_PERIOD (60)
+
+/**
+ * il3945_hw_reg_set_scan_power - Set Tx power for scan probe requests
+ *
+ * Set (in our channel info database) the direct scan Tx power for 1 Mbit (CCK)
+ * or 6 Mbit (OFDM) rates.
+ */
+static void
+il3945_hw_reg_set_scan_power(struct il_priv *il, u32 scan_tbl_idx, s32 rate_idx,
+                             const s8 *clip_pwrs,
+                             struct il_channel_info *ch_info, int band_idx)
+{
+        struct il3945_scan_power_info *scan_power_info;
+        s8 power;
+        u8 power_idx;
+
+        scan_power_info = &ch_info->scan_pwr_info[scan_tbl_idx];
+
+        /* use this channel group's 6Mbit clipping/saturation pwr,
+         *   but cap at regulatory scan power restriction (set during init
+         *   based on eeprom channel data) for this channel.  */
+        power = min(ch_info->scan_power, clip_pwrs[RATE_6M_IDX_TBL]);
+
+        power = min(power, il->tx_power_user_lmt);
+        scan_power_info->requested_power = power;
+
+        /* find difference between new scan *power* and current "normal"
+         *   Tx *power* for 6Mb.  Use this difference (x2) to adjust the
+         *   current "normal" temperature-compensated Tx power *idx* for
+         *   this rate (1Mb or 6Mb) to yield new temp-compensated scan power
+         *   *idx*. */
+        power_idx =
+            ch_info->power_info[rate_idx].power_table_idx - (power -
+                                                             ch_info->
+                                                             power_info
+                                                             [RATE_6M_IDX_TBL].
+                                                             requested_power) *
+            2;
+
+        /* store reference idx that we use when adjusting *all* scan
+         *   powers.  So we can accommodate user (all channel) or spectrum
+         *   management (single channel) power changes "between" temperature
+         *   feedback compensation procedures.
+         * don't force fit this reference idx into gain table; it may be a
+         *   negative number.  This will help avoid errors when we're at
+         *   the lower bounds (highest gains, for warmest temperatures)
+         *   of the table. */
+
+        /* don't exceed table bounds for "real" setting */
+        power_idx = il3945_hw_reg_fix_power_idx(power_idx);
+
+        scan_power_info->power_table_idx = power_idx;
+        scan_power_info->tpc.tx_gain =
+            power_gain_table[band_idx][power_idx].tx_gain;
+        scan_power_info->tpc.dsp_atten =
+            power_gain_table[band_idx][power_idx].dsp_atten;
+}
+
+/**
+ * il3945_send_tx_power - fill in Tx Power command with gain settings
+ *
+ * Configures power settings for all rates for the current channel,
+ * using values from channel info struct, and send to NIC
+ */
+static int
+il3945_send_tx_power(struct il_priv *il)
+{
+        int rate_idx, i;
+        const struct il_channel_info *ch_info = NULL;
+        struct il3945_txpowertable_cmd txpower = {
+                .channel = il->ctx.active.channel,
+        };
+        u16 chan;
+
+        if (WARN_ONCE
+            (test_bit(S_SCAN_HW, &il->status),
+             "TX Power requested while scanning!\n"))
+                return -EAGAIN;
+
+        chan = le16_to_cpu(il->ctx.active.channel);
+
+        txpower.band = (il->band == IEEE80211_BAND_5GHZ) ? 0 : 1;
+        ch_info = il_get_channel_info(il, il->band, chan);
+        if (!ch_info) {
+                IL_ERR("Failed to get channel info for channel %d [%d]\n", chan,
+                       il->band);
+                return -EINVAL;
+        }
+
+        if (!il_is_channel_valid(ch_info)) {
+                D_POWER("Not calling TX_PWR_TBL_CMD on " "non-Tx channel.\n");
+                return 0;
+        }
+
+        /* fill cmd with power settings for all rates for current channel */
+        /* Fill OFDM rate */
+        for (rate_idx = IL_FIRST_OFDM_RATE, i = 0;
+             rate_idx <= IL39_LAST_OFDM_RATE; rate_idx++, i++) {
+
+                txpower.power[i].tpc = ch_info->power_info[i].tpc;
+                txpower.power[i].rate = il3945_rates[rate_idx].plcp;
+
+                D_POWER("ch %d:%d rf %d dsp %3d rate code 0x%02x\n",
+                        le16_to_cpu(txpower.channel), txpower.band,
+                        txpower.power[i].tpc.tx_gain,
+                        txpower.power[i].tpc.dsp_atten, txpower.power[i].rate);
+        }
+        /* Fill CCK rates */
+        for (rate_idx = IL_FIRST_CCK_RATE; rate_idx <= IL_LAST_CCK_RATE;
+             rate_idx++, i++) {
+                txpower.power[i].tpc = ch_info->power_info[i].tpc;
+                txpower.power[i].rate = il3945_rates[rate_idx].plcp;
+
+                D_POWER("ch %d:%d rf %d dsp %3d rate code 0x%02x\n",
+                        le16_to_cpu(txpower.channel), txpower.band,
+                        txpower.power[i].tpc.tx_gain,
+                        txpower.power[i].tpc.dsp_atten, txpower.power[i].rate);
+        }
+
+        return il_send_cmd_pdu(il, C_TX_PWR_TBL,
+                               sizeof(struct il3945_txpowertable_cmd),
+                               &txpower);
+
+}
+
+/**
+ * il3945_hw_reg_set_new_power - Configures power tables at new levels
+ * @ch_info: Channel to update.  Uses power_info.requested_power.
+ *
+ * Replace requested_power and base_power_idx ch_info fields for
+ * one channel.
+ *
+ * Called if user or spectrum management changes power preferences.
+ * Takes into account h/w and modulation limitations (clip power).
+ *
+ * This does *not* send anything to NIC, just sets up ch_info for one channel.
+ *
+ * NOTE: reg_compensate_for_temperature_dif() *must* be run after this to
+ *       properly fill out the scan powers, and actual h/w gain settings,
+ *       and send changes to NIC
+ */
+static int
+il3945_hw_reg_set_new_power(struct il_priv *il, struct il_channel_info *ch_info)
+{
+        struct il3945_channel_power_info *power_info;
+        int power_changed = 0;
+        int i;
+        const s8 *clip_pwrs;
+        int power;
+
+        /* Get this chnlgrp's rate-to-max/clip-powers table */
+        clip_pwrs = il->_3945.clip_groups[ch_info->group_idx].clip_powers;
+
+        /* Get this channel's rate-to-current-power settings table */
+        power_info = ch_info->power_info;
+
+        /* update OFDM Txpower settings */
+        for (i = RATE_6M_IDX_TBL; i <= RATE_54M_IDX_TBL; i++, ++power_info) {
+                int delta_idx;
+
+                /* limit new power to be no more than h/w capability */
+                power = min(ch_info->curr_txpow, clip_pwrs[i]);
+                if (power == power_info->requested_power)
+                        continue;
+
+                /* find difference between old and new requested powers,
+                 *    update base (non-temp-compensated) power idx */
+                delta_idx = (power - power_info->requested_power) * 2;
+                power_info->base_power_idx -= delta_idx;
+
+                /* save new requested power value */
+                power_info->requested_power = power;
+
+                power_changed = 1;
+        }
+
+        /* update CCK Txpower settings, based on OFDM 12M setting ...
+         *    ... all CCK power settings for a given channel are the *same*. */
+        if (power_changed) {
+                power =
+                    ch_info->power_info[RATE_12M_IDX_TBL].requested_power +
+                    IL_CCK_FROM_OFDM_POWER_DIFF;
+
+                /* do all CCK rates' il3945_channel_power_info structures */
+                for (i = RATE_1M_IDX_TBL; i <= RATE_11M_IDX_TBL; i++) {
+                        power_info->requested_power = power;
+                        power_info->base_power_idx =
+                            ch_info->power_info[RATE_12M_IDX_TBL].
+                            base_power_idx + IL_CCK_FROM_OFDM_IDX_DIFF;
+                        ++power_info;
+                }
+        }
+
+        return 0;
+}
+
+/**
+ * il3945_hw_reg_get_ch_txpower_limit - returns new power limit for channel
+ *
+ * NOTE: Returned power limit may be less (but not more) than requested,
+ *       based strictly on regulatory (eeprom and spectrum mgt) limitations
+ *       (no consideration for h/w clipping limitations).
+ */
+static int
+il3945_hw_reg_get_ch_txpower_limit(struct il_channel_info *ch_info)
+{
+        s8 max_power;
+
+#if 0
+        /* if we're using TGd limits, use lower of TGd or EEPROM */
+        if (ch_info->tgd_data.max_power != 0)
+                max_power =
+                    min(ch_info->tgd_data.max_power,
+                        ch_info->eeprom.max_power_avg);
+
+        /* else just use EEPROM limits */
+        else
+#endif
+                max_power = ch_info->eeprom.max_power_avg;
+
+        return min(max_power, ch_info->max_power_avg);
+}
+
+/**
+ * il3945_hw_reg_comp_txpower_temp - Compensate for temperature
+ *
+ * Compensate txpower settings of *all* channels for temperature.
+ * This only accounts for the difference between current temperature
+ *   and the factory calibration temperatures, and bases the new settings
+ *   on the channel's base_power_idx.
+ *
+ * If RxOn is "associated", this sends the new Txpower to NIC!
+ */
+static int
+il3945_hw_reg_comp_txpower_temp(struct il_priv *il)
+{
+        struct il_channel_info *ch_info = NULL;
+        struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il->eeprom;
+        int delta_idx;
+        const s8 *clip_pwrs;    /* array of h/w max power levels for each rate */
+        u8 a_band;
+        u8 rate_idx;
+        u8 scan_tbl_idx;
+        u8 i;
+        int ref_temp;
+        int temperature = il->temperature;
+
+        if (il->disable_tx_power_cal || test_bit(S_SCANNING, &il->status)) {
+                /* do not perform tx power calibration */
+                return 0;
+        }
+        /* set up new Tx power info for each and every channel, 2.4 and 5.x */
+        for (i = 0; i < il->channel_count; i++) {
+                ch_info = &il->channel_info[i];
+                a_band = il_is_channel_a_band(ch_info);
+
+                /* Get this chnlgrp's factory calibration temperature */
+                ref_temp = (s16) eeprom->groups[ch_info->group_idx].temperature;
+
+                /* get power idx adjustment based on current and factory
+                 * temps */
+                delta_idx =
+                    il3945_hw_reg_adjust_power_by_temp(temperature, ref_temp);
+
+                /* set tx power value for all rates, OFDM and CCK */
+                for (rate_idx = 0; rate_idx < RATE_COUNT_3945; rate_idx++) {
+                        int power_idx =
+                            ch_info->power_info[rate_idx].base_power_idx;
+
+                        /* temperature compensate */
+                        power_idx += delta_idx;
+
+                        /* stay within table range */
+                        power_idx = il3945_hw_reg_fix_power_idx(power_idx);
+                        ch_info->power_info[rate_idx].power_table_idx =
+                            (u8) power_idx;
+                        ch_info->power_info[rate_idx].tpc =
+                            power_gain_table[a_band][power_idx];
+                }
+
+                /* Get this chnlgrp's rate-to-max/clip-powers table */
+                clip_pwrs =
+                    il->_3945.clip_groups[ch_info->group_idx].clip_powers;
+
+                /* set scan tx power, 1Mbit for CCK, 6Mbit for OFDM */
+                for (scan_tbl_idx = 0; scan_tbl_idx < IL_NUM_SCAN_RATES;
+                     scan_tbl_idx++) {
+                        s32 actual_idx =
+                            (scan_tbl_idx ==
+                             0) ? RATE_1M_IDX_TBL : RATE_6M_IDX_TBL;
+                        il3945_hw_reg_set_scan_power(il, scan_tbl_idx,
+                                                     actual_idx, clip_pwrs,
+                                                     ch_info, a_band);
+                }
+        }
+
+        /* send Txpower command for current channel to ucode */
+        return il->cfg->ops->lib->send_tx_power(il);
+}
+
+int
+il3945_hw_reg_set_txpower(struct il_priv *il, s8 power)
+{
+        struct il_channel_info *ch_info;
+        s8 max_power;
+        u8 a_band;
+        u8 i;
+
+        if (il->tx_power_user_lmt == power) {
+                D_POWER("Requested Tx power same as current " "limit: %ddBm.\n",
+                        power);
+                return 0;
+        }
+
+        D_POWER("Setting upper limit clamp to %ddBm.\n", power);
+        il->tx_power_user_lmt = power;
+
+        /* set up new Tx powers for each and every channel, 2.4 and 5.x */
+
+        for (i = 0; i < il->channel_count; i++) {
+                ch_info = &il->channel_info[i];
+                a_band = il_is_channel_a_band(ch_info);
+
+                /* find minimum power of all user and regulatory constraints
+                 *    (does not consider h/w clipping limitations) */
+                max_power = il3945_hw_reg_get_ch_txpower_limit(ch_info);
+                max_power = min(power, max_power);
+                if (max_power != ch_info->curr_txpow) {
+                        ch_info->curr_txpow = max_power;
+
+                        /* this considers the h/w clipping limitations */
+                        il3945_hw_reg_set_new_power(il, ch_info);
+                }
+        }
+
+        /* update txpower settings for all channels,
+         *   send to NIC if associated. */
+        il3945_is_temp_calib_needed(il);
+        il3945_hw_reg_comp_txpower_temp(il);
+
+        return 0;
+}
+
+static int
+il3945_send_rxon_assoc(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        int rc = 0;
+        struct il_rx_pkt *pkt;
+        struct il3945_rxon_assoc_cmd rxon_assoc;
+        struct il_host_cmd cmd = {
+                .id = C_RXON_ASSOC,
+                .len = sizeof(rxon_assoc),
+                .flags = CMD_WANT_SKB,
+                .data = &rxon_assoc,
+        };
+        const struct il_rxon_cmd *rxon1 = &ctx->staging;
+        const struct il_rxon_cmd *rxon2 = &ctx->active;
+
+        if (rxon1->flags == rxon2->flags &&
+            rxon1->filter_flags == rxon2->filter_flags &&
+            rxon1->cck_basic_rates == rxon2->cck_basic_rates &&
+            rxon1->ofdm_basic_rates == rxon2->ofdm_basic_rates) {
+                D_INFO("Using current RXON_ASSOC.  Not resending.\n");
+                return 0;
+        }
+
+        rxon_assoc.flags = ctx->staging.flags;
+        rxon_assoc.filter_flags = ctx->staging.filter_flags;
+        rxon_assoc.ofdm_basic_rates = ctx->staging.ofdm_basic_rates;
+        rxon_assoc.cck_basic_rates = ctx->staging.cck_basic_rates;
+        rxon_assoc.reserved = 0;
+
+        rc = il_send_cmd_sync(il, &cmd);
+        if (rc)
+                return rc;
+
+        pkt = (struct il_rx_pkt *)cmd.reply_page;
+        if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {
+                IL_ERR("Bad return from C_RXON_ASSOC command\n");
+                rc = -EIO;
+        }
+
+        il_free_pages(il, cmd.reply_page);
+
+        return rc;
+}
+
+/**
+ * il3945_commit_rxon - commit staging_rxon to hardware
+ *
+ * The RXON command in staging_rxon is committed to the hardware and
+ * the active_rxon structure is updated with the new data.  This
+ * function correctly transitions out of the RXON_ASSOC_MSK state if
+ * a HW tune is required based on the RXON structure changes.
+ */
+int
+il3945_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        /* cast away the const for active_rxon in this function */
+        struct il3945_rxon_cmd *active_rxon = (void *)&ctx->active;
+        struct il3945_rxon_cmd *staging_rxon = (void *)&ctx->staging;
+        int rc = 0;
+        bool new_assoc = !!(staging_rxon->filter_flags & RXON_FILTER_ASSOC_MSK);
+
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                return -EINVAL;
+
+        if (!il_is_alive(il))
+                return -1;
+
+        /* always get timestamp with Rx frame */
+        staging_rxon->flags |= RXON_FLG_TSF2HOST_MSK;
+
+        /* select antenna */
+        staging_rxon->flags &= ~(RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_SEL_MSK);
+        staging_rxon->flags |= il3945_get_antenna_flags(il);
+
+        rc = il_check_rxon_cmd(il, ctx);
+        if (rc) {
+                IL_ERR("Invalid RXON configuration.  Not committing.\n");
+                return -EINVAL;
+        }
+
+        /* If we don't need to send a full RXON, we can use
+         * il3945_rxon_assoc_cmd which is used to reconfigure filter
+         * and other flags for the current radio configuration. */
+        if (!il_full_rxon_required(il, &il->ctx)) {
+                rc = il_send_rxon_assoc(il, &il->ctx);
+                if (rc) {
+                        IL_ERR("Error setting RXON_ASSOC "
+                               "configuration (%d).\n", rc);
+                        return rc;
+                }
+
+                memcpy(active_rxon, staging_rxon, sizeof(*active_rxon));
+                /*
+                 * We do not commit tx power settings while channel changing,
+                 * do it now if tx power changed.
+                 */
+                il_set_tx_power(il, il->tx_power_next, false);
+                return 0;
+        }
+
+        /* If we are currently associated and the new config requires
+         * 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 (il_is_associated(il) && new_assoc) {
+                D_INFO("Toggling associated bit on current RXON\n");
+                active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+
+                /*
+                 * reserved4 and 5 could have been filled by the iwlcore code.
+                 * Let's clear them before pushing to the 3945.
+                 */
+                active_rxon->reserved4 = 0;
+                active_rxon->reserved5 = 0;
+                rc = il_send_cmd_pdu(il, C_RXON, sizeof(struct il3945_rxon_cmd),
+                                     &il->ctx.active);
+
+                /* If the mask clearing failed then we set
+                 * active_rxon back to what it was previously */
+                if (rc) {
+                        active_rxon->filter_flags |= RXON_FILTER_ASSOC_MSK;
+                        IL_ERR("Error clearing ASSOC_MSK on current "
+                               "configuration (%d).\n", rc);
+                        return rc;
+                }
+                il_clear_ucode_stations(il, &il->ctx);
+                il_restore_stations(il, &il->ctx);
+        }
+
+        D_INFO("Sending RXON\n" "* with%s RXON_FILTER_ASSOC_MSK\n"
+               "* channel = %d\n" "* bssid = %pM\n", (new_assoc ? "" : "out"),
+               le16_to_cpu(staging_rxon->channel), staging_rxon->bssid_addr);
+
+        /*
+         * reserved4 and 5 could have been filled by the iwlcore code.
+         * Let's clear them before pushing to the 3945.
+         */
+        staging_rxon->reserved4 = 0;
+        staging_rxon->reserved5 = 0;
+
+        il_set_rxon_hwcrypto(il, ctx, !il3945_mod_params.sw_crypto);
+
+        /* Apply the new configuration */
+        rc = il_send_cmd_pdu(il, C_RXON, sizeof(struct il3945_rxon_cmd),
+                             staging_rxon);
+        if (rc) {
+                IL_ERR("Error setting new configuration (%d).\n", rc);
+                return rc;
+        }
+
+        memcpy(active_rxon, staging_rxon, sizeof(*active_rxon));
+
+        if (!new_assoc) {
+                il_clear_ucode_stations(il, &il->ctx);
+                il_restore_stations(il, &il->ctx);
+        }
+
+        /* If we issue a new RXON command which required a tune then we must
+         * send a new TXPOWER command or we won't be able to Tx any frames */
+        rc = il_set_tx_power(il, il->tx_power_next, true);
+        if (rc) {
+                IL_ERR("Error setting Tx power (%d).\n", rc);
+                return rc;
+        }
+
+        /* Init the hardware's rate fallback order based on the band */
+        rc = il3945_init_hw_rate_table(il);
+        if (rc) {
+                IL_ERR("Error setting HW rate table: %02X\n", rc);
+                return -EIO;
+        }
+
+        return 0;
+}
+
+/**
+ * il3945_reg_txpower_periodic -  called when time to check our temperature.
+ *
+ * -- reset periodic timer
+ * -- see if temp has changed enough to warrant re-calibration ... if so:
+ *     -- correct coeffs for temp (can reset temp timer)
+ *     -- save this temp as "last",
+ *     -- send new set of gain settings to NIC
+ * NOTE:  This should continue working, even when we're not associated,
+ *   so we can keep our internal table of scan powers current. */
+void
+il3945_reg_txpower_periodic(struct il_priv *il)
+{
+        /* This will kick in the "brute force"
+         * il3945_hw_reg_comp_txpower_temp() below */
+        if (!il3945_is_temp_calib_needed(il))
+                goto reschedule;
+
+        /* Set up a new set of temp-adjusted TxPowers, send to NIC.
+         * This is based *only* on current temperature,
+         * ignoring any previous power measurements */
+        il3945_hw_reg_comp_txpower_temp(il);
+
+reschedule:
+        queue_delayed_work(il->workqueue, &il->_3945.thermal_periodic,
+                           REG_RECALIB_PERIOD * HZ);
+}
+
+static void
+il3945_bg_reg_txpower_periodic(struct work_struct *work)
+{
+        struct il_priv *il = container_of(work, struct il_priv,
+                                          _3945.thermal_periodic.work);
+
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                return;
+
+        mutex_lock(&il->mutex);
+        il3945_reg_txpower_periodic(il);
+        mutex_unlock(&il->mutex);
+}
+
+/**
+ * il3945_hw_reg_get_ch_grp_idx - find the channel-group idx (0-4) for channel.
+ *
+ * This function is used when initializing channel-info structs.
+ *
+ * NOTE: These channel groups do *NOT* match the bands above!
+ *       These channel groups are based on factory-tested channels;
+ *       on A-band, EEPROM's "group frequency" entries represent the top
+ *       channel in each group 1-4.  Group 5 All B/G channels are in group 0.
+ */
+static u16
+il3945_hw_reg_get_ch_grp_idx(struct il_priv *il,
+                             const struct il_channel_info *ch_info)
+{
+        struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il->eeprom;
+        struct il3945_eeprom_txpower_group *ch_grp = &eeprom->groups[0];
+        u8 group;
+        u16 group_idx = 0;      /* based on factory calib frequencies */
+        u8 grp_channel;
+
+        /* Find the group idx for the channel ... don't use idx 1(?) */
+        if (il_is_channel_a_band(ch_info)) {
+                for (group = 1; group < 5; group++) {
+                        grp_channel = ch_grp[group].group_channel;
+                        if (ch_info->channel <= grp_channel) {
+                                group_idx = group;
+                                break;
+                        }
+                }
+                /* group 4 has a few channels *above* its factory cal freq */
+                if (group == 5)
+                        group_idx = 4;
+        } else
+                group_idx = 0;  /* 2.4 GHz, group 0 */
+
+        D_POWER("Chnl %d mapped to grp %d\n", ch_info->channel, group_idx);
+        return group_idx;
+}
+
+/**
+ * il3945_hw_reg_get_matched_power_idx - Interpolate to get nominal idx
+ *
+ * Interpolate to get nominal (i.e. at factory calibration temperature) idx
+ *   into radio/DSP gain settings table for requested power.
+ */
+static int
+il3945_hw_reg_get_matched_power_idx(struct il_priv *il, s8 requested_power,
+                                    s32 setting_idx, s32 *new_idx)
+{
+        const struct il3945_eeprom_txpower_group *chnl_grp = NULL;
+        struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il->eeprom;
+        s32 idx0, idx1;
+        s32 power = 2 * requested_power;
+        s32 i;
+        const struct il3945_eeprom_txpower_sample *samples;
+        s32 gains0, gains1;
+        s32 res;
+        s32 denominator;
+
+        chnl_grp = &eeprom->groups[setting_idx];
+        samples = chnl_grp->samples;
+        for (i = 0; i < 5; i++) {
+                if (power == samples[i].power) {
+                        *new_idx = samples[i].gain_idx;
+                        return 0;
+                }
+        }
+
+        if (power > samples[1].power) {
+                idx0 = 0;
+                idx1 = 1;
+        } else if (power > samples[2].power) {
+                idx0 = 1;
+                idx1 = 2;
+        } else if (power > samples[3].power) {
+                idx0 = 2;
+                idx1 = 3;
+        } else {
+                idx0 = 3;
+                idx1 = 4;
+        }
+
+        denominator = (s32) samples[idx1].power - (s32) samples[idx0].power;
+        if (denominator == 0)
+                return -EINVAL;
+        gains0 = (s32) samples[idx0].gain_idx * (1 << 19);
+        gains1 = (s32) samples[idx1].gain_idx * (1 << 19);
+        res =
+            gains0 + (gains1 - gains0) * ((s32) power -
+                                          (s32) samples[idx0].power) /
+            denominator + (1 << 18);
+        *new_idx = res >> 19;
+        return 0;
+}
+
+static void
+il3945_hw_reg_init_channel_groups(struct il_priv *il)
+{
+        u32 i;
+        s32 rate_idx;
+        struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il->eeprom;
+        const struct il3945_eeprom_txpower_group *group;
+
+        D_POWER("Initializing factory calib info from EEPROM\n");
+
+        for (i = 0; i < IL_NUM_TX_CALIB_GROUPS; i++) {
+                s8 *clip_pwrs;  /* table of power levels for each rate */
+                s8 satur_pwr;   /* saturation power for each chnl group */
+                group = &eeprom->groups[i];
+
+                /* sanity check on factory saturation power value */
+                if (group->saturation_power < 40) {
+                        IL_WARN("Error: saturation power is %d, "
+                                "less than minimum expected 40\n",
+                                group->saturation_power);
+                        return;
+                }
+
+                /*
+                 * Derive requested power levels for each rate, based on
+                 *   hardware capabilities (saturation power for band).
+                 * Basic value is 3dB down from saturation, with further
+                 *   power reductions for highest 3 data rates.  These
+                 *   backoffs provide headroom for high rate modulation
+                 *   power peaks, without too much distortion (clipping).
+                 */
+                /* we'll fill in this array with h/w max power levels */
+                clip_pwrs = (s8 *) il->_3945.clip_groups[i].clip_powers;
+
+                /* divide factory saturation power by 2 to find -3dB level */
+                satur_pwr = (s8) (group->saturation_power >> 1);
+
+                /* fill in channel group's nominal powers for each rate */
+                for (rate_idx = 0; rate_idx < RATE_COUNT_3945;
+                     rate_idx++, clip_pwrs++) {
+                        switch (rate_idx) {
+                        case RATE_36M_IDX_TBL:
+                                if (i == 0)     /* B/G */
+                                        *clip_pwrs = satur_pwr;
+                                else    /* A */
+                                        *clip_pwrs = satur_pwr - 5;
+                                break;
+                        case RATE_48M_IDX_TBL:
+                                if (i == 0)
+                                        *clip_pwrs = satur_pwr - 7;
+                                else
+                                        *clip_pwrs = satur_pwr - 10;
+                                break;
+                        case RATE_54M_IDX_TBL:
+                                if (i == 0)
+                                        *clip_pwrs = satur_pwr - 9;
+                                else
+                                        *clip_pwrs = satur_pwr - 12;
+                                break;
+                        default:
+                                *clip_pwrs = satur_pwr;
+                                break;
+                        }
+                }
+        }
+}
+
+/**
+ * il3945_txpower_set_from_eeprom - Set channel power info based on EEPROM
+ *
+ * Second pass (during init) to set up il->channel_info
+ *
+ * Set up Tx-power settings in our channel info database for each VALID
+ * (for this geo/SKU) channel, at all Tx data rates, based on eeprom values
+ * and current temperature.
+ *
+ * Since this is based on current temperature (at init time), these values may
+ * not be valid for very long, but it gives us a starting/default point,
+ * and allows us to active (i.e. using Tx) scan.
+ *
+ * This does *not* write values to NIC, just sets up our internal table.
+ */
+int
+il3945_txpower_set_from_eeprom(struct il_priv *il)
+{
+        struct il_channel_info *ch_info = NULL;
+        struct il3945_channel_power_info *pwr_info;
+        struct il3945_eeprom *eeprom = (struct il3945_eeprom *)il->eeprom;
+        int delta_idx;
+        u8 rate_idx;
+        u8 scan_tbl_idx;
+        const s8 *clip_pwrs;    /* array of power levels for each rate */
+        u8 gain, dsp_atten;
+        s8 power;
+        u8 pwr_idx, base_pwr_idx, a_band;
+        u8 i;
+        int temperature;
+
+        /* save temperature reference,
+         *   so we can determine next time to calibrate */
+        temperature = il3945_hw_reg_txpower_get_temperature(il);
+        il->last_temperature = temperature;
+
+        il3945_hw_reg_init_channel_groups(il);
+
+        /* initialize Tx power info for each and every channel, 2.4 and 5.x */
+        for (i = 0, ch_info = il->channel_info; i < il->channel_count;
+             i++, ch_info++) {
+                a_band = il_is_channel_a_band(ch_info);
+                if (!il_is_channel_valid(ch_info))
+                        continue;
+
+                /* find this channel's channel group (*not* "band") idx */
+                ch_info->group_idx = il3945_hw_reg_get_ch_grp_idx(il, ch_info);
+
+                /* Get this chnlgrp's rate->max/clip-powers table */
+                clip_pwrs =
+                    il->_3945.clip_groups[ch_info->group_idx].clip_powers;
+
+                /* calculate power idx *adjustment* value according to
+                 *  diff between current temperature and factory temperature */
+                delta_idx =
+                    il3945_hw_reg_adjust_power_by_temp(temperature,
+                                                       eeprom->groups[ch_info->
+                                                                      group_idx].
+                                                       temperature);
+
+                D_POWER("Delta idx for channel %d: %d [%d]\n", ch_info->channel,
+                        delta_idx, temperature + IL_TEMP_CONVERT);
+
+                /* set tx power value for all OFDM rates */
+                for (rate_idx = 0; rate_idx < IL_OFDM_RATES; rate_idx++) {
+                        s32 uninitialized_var(power_idx);
+                        int rc;
+
+                        /* use channel group's clip-power table,
+                         *   but don't exceed channel's max power */
+                        s8 pwr = min(ch_info->max_power_avg,
+                                     clip_pwrs[rate_idx]);
+
+                        pwr_info = &ch_info->power_info[rate_idx];
+
+                        /* get base (i.e. at factory-measured temperature)
+                         *    power table idx for this rate's power */
+                        rc = il3945_hw_reg_get_matched_power_idx(il, pwr,
+                                                                 ch_info->
+                                                                 group_idx,
+                                                                 &power_idx);
+                        if (rc) {
+                                IL_ERR("Invalid power idx\n");
+                                return rc;
+                        }
+                        pwr_info->base_power_idx = (u8) power_idx;
+
+                        /* temperature compensate */
+                        power_idx += delta_idx;
+
+                        /* stay within range of gain table */
+                        power_idx = il3945_hw_reg_fix_power_idx(power_idx);
+
+                        /* fill 1 OFDM rate's il3945_channel_power_info struct */
+                        pwr_info->requested_power = pwr;
+                        pwr_info->power_table_idx = (u8) power_idx;
+                        pwr_info->tpc.tx_gain =
+                            power_gain_table[a_band][power_idx].tx_gain;
+                        pwr_info->tpc.dsp_atten =
+                            power_gain_table[a_band][power_idx].dsp_atten;
+                }
+
+                /* set tx power for CCK rates, based on OFDM 12 Mbit settings */
+                pwr_info = &ch_info->power_info[RATE_12M_IDX_TBL];
+                power = pwr_info->requested_power + IL_CCK_FROM_OFDM_POWER_DIFF;
+                pwr_idx = pwr_info->power_table_idx + IL_CCK_FROM_OFDM_IDX_DIFF;
+                base_pwr_idx =
+                    pwr_info->base_power_idx + IL_CCK_FROM_OFDM_IDX_DIFF;
+
+                /* stay within table range */
+                pwr_idx = il3945_hw_reg_fix_power_idx(pwr_idx);
+                gain = power_gain_table[a_band][pwr_idx].tx_gain;
+                dsp_atten = power_gain_table[a_band][pwr_idx].dsp_atten;
+
+                /* fill each CCK rate's il3945_channel_power_info structure
+                 * NOTE:  All CCK-rate Txpwrs are the same for a given chnl!
+                 * NOTE:  CCK rates start at end of OFDM rates! */
+                for (rate_idx = 0; rate_idx < IL_CCK_RATES; rate_idx++) {
+                        pwr_info =
+                            &ch_info->power_info[rate_idx + IL_OFDM_RATES];
+                        pwr_info->requested_power = power;
+                        pwr_info->power_table_idx = pwr_idx;
+                        pwr_info->base_power_idx = base_pwr_idx;
+                        pwr_info->tpc.tx_gain = gain;
+                        pwr_info->tpc.dsp_atten = dsp_atten;
+                }
+
+                /* set scan tx power, 1Mbit for CCK, 6Mbit for OFDM */
+                for (scan_tbl_idx = 0; scan_tbl_idx < IL_NUM_SCAN_RATES;
+                     scan_tbl_idx++) {
+                        s32 actual_idx =
+                            (scan_tbl_idx ==
+                             0) ? RATE_1M_IDX_TBL : RATE_6M_IDX_TBL;
+                        il3945_hw_reg_set_scan_power(il, scan_tbl_idx,
+                                                     actual_idx, clip_pwrs,
+                                                     ch_info, a_band);
+                }
+        }
+
+        return 0;
+}
+
+int
+il3945_hw_rxq_stop(struct il_priv *il)
+{
+        int rc;
+
+        il_wr(il, FH39_RCSR_CONFIG(0), 0);
+        rc = il_poll_bit(il, FH39_RSSR_STATUS,
+                         FH39_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000);
+        if (rc < 0)
+                IL_ERR("Can't stop Rx DMA.\n");
+
+        return 0;
+}
+
+int
+il3945_hw_tx_queue_init(struct il_priv *il, struct il_tx_queue *txq)
+{
+        int txq_id = txq->q.id;
+
+        struct il3945_shared *shared_data = il->_3945.shared_virt;
+
+        shared_data->tx_base_ptr[txq_id] = cpu_to_le32((u32) txq->q.dma_addr);
+
+        il_wr(il, FH39_CBCC_CTRL(txq_id), 0);
+        il_wr(il, FH39_CBCC_BASE(txq_id), 0);
+
+        il_wr(il, FH39_TCSR_CONFIG(txq_id),
+              FH39_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_NOINT |
+              FH39_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_TXF |
+              FH39_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_IFTFD |
+              FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE_VAL |
+              FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE);
+
+        /* fake read to flush all prev. writes */
+        _il_rd(il, FH39_TSSR_CBB_BASE);
+
+        return 0;
+}
+
+/*
+ * HCMD utils
+ */
+static u16
+il3945_get_hcmd_size(u8 cmd_id, u16 len)
+{
+        switch (cmd_id) {
+        case C_RXON:
+                return sizeof(struct il3945_rxon_cmd);
+        case C_POWER_TBL:
+                return sizeof(struct il3945_powertable_cmd);
+        default:
+                return len;
+        }
+}
+
+static u16
+il3945_build_addsta_hcmd(const struct il_addsta_cmd *cmd, u8 * data)
+{
+        struct il3945_addsta_cmd *addsta = (struct il3945_addsta_cmd *)data;
+        addsta->mode = cmd->mode;
+        memcpy(&addsta->sta, &cmd->sta, sizeof(struct sta_id_modify));
+        memcpy(&addsta->key, &cmd->key, sizeof(struct il4965_keyinfo));
+        addsta->station_flags = cmd->station_flags;
+        addsta->station_flags_msk = cmd->station_flags_msk;
+        addsta->tid_disable_tx = cpu_to_le16(0);
+        addsta->rate_n_flags = cmd->rate_n_flags;
+        addsta->add_immediate_ba_tid = cmd->add_immediate_ba_tid;
+        addsta->remove_immediate_ba_tid = cmd->remove_immediate_ba_tid;
+        addsta->add_immediate_ba_ssn = cmd->add_immediate_ba_ssn;
+
+        return (u16) sizeof(struct il3945_addsta_cmd);
+}
+
+static int
+il3945_add_bssid_station(struct il_priv *il, const u8 * addr, u8 * sta_id_r)
+{
+        struct il_rxon_context *ctx = &il->ctx;
+        int ret;
+        u8 sta_id;
+        unsigned long flags;
+
+        if (sta_id_r)
+                *sta_id_r = IL_INVALID_STATION;
+
+        ret = il_add_station_common(il, ctx, addr, 0, NULL, &sta_id);
+        if (ret) {
+                IL_ERR("Unable to add station %pM\n", addr);
+                return ret;
+        }
+
+        if (sta_id_r)
+                *sta_id_r = sta_id;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        il->stations[sta_id].used |= IL_STA_LOCAL;
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        return 0;
+}
+
+static int
+il3945_manage_ibss_station(struct il_priv *il, struct ieee80211_vif *vif,
+                           bool add)
+{
+        struct il_vif_priv *vif_priv = (void *)vif->drv_priv;
+        int ret;
+
+        if (add) {
+                ret =
+                    il3945_add_bssid_station(il, vif->bss_conf.bssid,
+                                             &vif_priv->ibss_bssid_sta_id);
+                if (ret)
+                        return ret;
+
+                il3945_sync_sta(il, vif_priv->ibss_bssid_sta_id,
+                                (il->band ==
+                                 IEEE80211_BAND_5GHZ) ? RATE_6M_PLCP :
+                                RATE_1M_PLCP);
+                il3945_rate_scale_init(il->hw, vif_priv->ibss_bssid_sta_id);
+
+                return 0;
+        }
+
+        return il_remove_station(il, vif_priv->ibss_bssid_sta_id,
+                                 vif->bss_conf.bssid);
+}
+
+/**
+ * il3945_init_hw_rate_table - Initialize the hardware rate fallback table
+ */
+int
+il3945_init_hw_rate_table(struct il_priv *il)
+{
+        int rc, i, idx, prev_idx;
+        struct il3945_rate_scaling_cmd rate_cmd = {
+                .reserved = {0, 0, 0},
+        };
+        struct il3945_rate_scaling_info *table = rate_cmd.table;
+
+        for (i = 0; i < ARRAY_SIZE(il3945_rates); i++) {
+                idx = il3945_rates[i].table_rs_idx;
+
+                table[idx].rate_n_flags =
+                    il3945_hw_set_rate_n_flags(il3945_rates[i].plcp, 0);
+                table[idx].try_cnt = il->retry_rate;
+                prev_idx = il3945_get_prev_ieee_rate(i);
+                table[idx].next_rate_idx = il3945_rates[prev_idx].table_rs_idx;
+        }
+
+        switch (il->band) {
+        case IEEE80211_BAND_5GHZ:
+                D_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 */
+                for (i = RATE_1M_IDX_TBL; i <= RATE_11M_IDX_TBL; i++)
+                        table[i].next_rate_idx =
+                            il3945_rates[IL_FIRST_OFDM_RATE].table_rs_idx;
+
+                /* Don't fall back to CCK rates */
+                table[RATE_12M_IDX_TBL].next_rate_idx = RATE_9M_IDX_TBL;
+
+                /* Don't drop out of OFDM rates */
+                table[RATE_6M_IDX_TBL].next_rate_idx =
+                    il3945_rates[IL_FIRST_OFDM_RATE].table_rs_idx;
+                break;
+
+        case IEEE80211_BAND_2GHZ:
+                D_RATE("Select B/G mode rate scale\n");
+                /* If an OFDM rate is used, have it fall back to the
+                 * 1M CCK rates */
+
+                if (!(il->_3945.sta_supp_rates & IL_OFDM_RATES_MASK) &&
+                    il_is_associated(il)) {
+
+                        idx = IL_FIRST_CCK_RATE;
+                        for (i = RATE_6M_IDX_TBL; i <= RATE_54M_IDX_TBL; i++)
+                                table[i].next_rate_idx =
+                                    il3945_rates[idx].table_rs_idx;
+
+                        idx = RATE_11M_IDX_TBL;
+                        /* CCK shouldn't fall back to OFDM... */
+                        table[idx].next_rate_idx = RATE_5M_IDX_TBL;
+                }
+                break;
+
+        default:
+                WARN_ON(1);
+                break;
+        }
+
+        /* Update the rate scaling for control frame Tx */
+        rate_cmd.table_id = 0;
+        rc = il_send_cmd_pdu(il, C_RATE_SCALE, sizeof(rate_cmd), &rate_cmd);
+        if (rc)
+                return rc;
+
+        /* Update the rate scaling for data frame Tx */
+        rate_cmd.table_id = 1;
+        return il_send_cmd_pdu(il, C_RATE_SCALE, sizeof(rate_cmd), &rate_cmd);
+}
+
+/* Called when initializing driver */
+int
+il3945_hw_set_hw_params(struct il_priv *il)
+{
+        memset((void *)&il->hw_params, 0, sizeof(struct il_hw_params));
+
+        il->_3945.shared_virt =
+            dma_alloc_coherent(&il->pci_dev->dev, sizeof(struct il3945_shared),
+                               &il->_3945.shared_phys, GFP_KERNEL);
+        if (!il->_3945.shared_virt) {
+                IL_ERR("failed to allocate pci memory\n");
+                return -ENOMEM;
+        }
+
+        /* Assign number of Usable TX queues */
+        il->hw_params.max_txq_num = il->cfg->base_params->num_of_queues;
+
+        il->hw_params.tfd_size = sizeof(struct il3945_tfd);
+        il->hw_params.rx_page_order = get_order(IL_RX_BUF_SIZE_3K);
+        il->hw_params.max_rxq_size = RX_QUEUE_SIZE;
+        il->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;
+        il->hw_params.max_stations = IL3945_STATION_COUNT;
+        il->ctx.bcast_sta_id = IL3945_BROADCAST_ID;
+
+        il->sta_key_max_num = STA_KEY_MAX_NUM;
+
+        il->hw_params.rx_wrt_ptr_reg = FH39_RSCSR_CHNL0_WPTR;
+        il->hw_params.max_beacon_itrvl = IL39_MAX_UCODE_BEACON_INTERVAL;
+        il->hw_params.beacon_time_tsf_bits = IL3945_EXT_BEACON_TIME_POS;
+
+        return 0;
+}
+
+unsigned int
+il3945_hw_get_beacon_cmd(struct il_priv *il, struct il3945_frame *frame,
+                         u8 rate)
+{
+        struct il3945_tx_beacon_cmd *tx_beacon_cmd;
+        unsigned int frame_size;
+
+        tx_beacon_cmd = (struct il3945_tx_beacon_cmd *)&frame->u;
+        memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd));
+
+        tx_beacon_cmd->tx.sta_id = il->ctx.bcast_sta_id;
+        tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
+
+        frame_size =
+            il3945_fill_beacon_frame(il, tx_beacon_cmd->frame,
+                                     sizeof(frame->u) - sizeof(*tx_beacon_cmd));
+
+        BUG_ON(frame_size > MAX_MPDU_SIZE);
+        tx_beacon_cmd->tx.len = cpu_to_le16((u16) frame_size);
+
+        tx_beacon_cmd->tx.rate = rate;
+        tx_beacon_cmd->tx.tx_flags =
+            (TX_CMD_FLG_SEQ_CTL_MSK | TX_CMD_FLG_TSF_MSK);
+
+        /* supp_rates[0] == OFDM start at IL_FIRST_OFDM_RATE */
+        tx_beacon_cmd->tx.supp_rates[0] =
+            (IL_OFDM_BASIC_RATES_MASK >> IL_FIRST_OFDM_RATE) & 0xFF;
+
+        tx_beacon_cmd->tx.supp_rates[1] = (IL_CCK_BASIC_RATES_MASK & 0xF);
+
+        return sizeof(struct il3945_tx_beacon_cmd) + frame_size;
+}
+
+void
+il3945_hw_handler_setup(struct il_priv *il)
+{
+        il->handlers[C_TX] = il3945_hdl_tx;
+        il->handlers[N_3945_RX] = il3945_hdl_rx;
+}
+
+void
+il3945_hw_setup_deferred_work(struct il_priv *il)
+{
+        INIT_DELAYED_WORK(&il->_3945.thermal_periodic,
+                          il3945_bg_reg_txpower_periodic);
+}
+
+void
+il3945_hw_cancel_deferred_work(struct il_priv *il)
+{
+        cancel_delayed_work(&il->_3945.thermal_periodic);
+}
+
+/* check contents of special bootstrap uCode SRAM */
+static int
+il3945_verify_bsm(struct il_priv *il)
+{
+        __le32 *image = il->ucode_boot.v_addr;
+        u32 len = il->ucode_boot.len;
+        u32 reg;
+        u32 val;
+
+        D_INFO("Begin verify bsm\n");
+
+        /* verify BSM SRAM contents */
+        val = il_rd_prph(il, BSM_WR_DWCOUNT_REG);
+        for (reg = BSM_SRAM_LOWER_BOUND; reg < BSM_SRAM_LOWER_BOUND + len;
+             reg += sizeof(u32), image++) {
+                val = il_rd_prph(il, reg);
+                if (val != le32_to_cpu(*image)) {
+                        IL_ERR("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;
+                }
+        }
+
+        D_INFO("BSM bootstrap uCode image OK\n");
+
+        return 0;
+}
+
+/******************************************************************************
+ *
+ * EEPROM related functions
+ *
+ ******************************************************************************/
+
+/*
+ * Clear the OWNER_MSK, to establish driver (instead of uCode running on
+ * embedded controller) as EEPROM reader; each read 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 some ownership mechanism.  Here, the driver
+ * simply claims ownership, which should be safe when this function is called
+ * (i.e. before loading uCode!).
+ */
+static int
+il3945_eeprom_acquire_semaphore(struct il_priv *il)
+{
+        _il_clear_bit(il, CSR_EEPROM_GP, CSR_EEPROM_GP_IF_OWNER_MSK);
+        return 0;
+}
+
+static void
+il3945_eeprom_release_semaphore(struct il_priv *il)
+{
+        return;
+}
+
+ /**
+  * il3945_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
+il3945_load_bsm(struct il_priv *il)
+{
+        __le32 *image = il->ucode_boot.v_addr;
+        u32 len = il->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;
+
+        D_INFO("Begin load bsm\n");
+
+        /* make sure bootstrap program is no larger than BSM's SRAM size */
+        if (len > IL39_MAX_BSM_SIZE)
+                return -EINVAL;
+
+        /* Tell bootstrap uCode where to find the "Initialize" uCode
+         *   in host DRAM ... host DRAM physical address bits 31:0 for 3945.
+         * NOTE:  il3945_initialize_alive_start() will replace these values,
+         *        after the "initialize" uCode has run, to point to
+         *        runtime/protocol instructions and backup data cache. */
+        pinst = il->ucode_init.p_addr;
+        pdata = il->ucode_init_data.p_addr;
+        inst_len = il->ucode_init.len;
+        data_len = il->ucode_init_data.len;
+
+        il_wr_prph(il, BSM_DRAM_INST_PTR_REG, pinst);
+        il_wr_prph(il, BSM_DRAM_DATA_PTR_REG, pdata);
+        il_wr_prph(il, BSM_DRAM_INST_BYTECOUNT_REG, inst_len);
+        il_wr_prph(il, 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++)
+                _il_wr_prph(il, reg_offset, le32_to_cpu(*image));
+
+        rc = il3945_verify_bsm(il);
+        if (rc)
+                return rc;
+
+        /* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */
+        il_wr_prph(il, BSM_WR_MEM_SRC_REG, 0x0);
+        il_wr_prph(il, BSM_WR_MEM_DST_REG, IL39_RTC_INST_LOWER_BOUND);
+        il_wr_prph(il, BSM_WR_DWCOUNT_REG, len / sizeof(u32));
+
+        /* Load bootstrap code into instruction SRAM now,
+         *   to prepare to load "initialize" uCode */
+        il_wr_prph(il, 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 = il_rd_prph(il, BSM_WR_CTRL_REG);
+                if (!(done & BSM_WR_CTRL_REG_BIT_START))
+                        break;
+                udelay(10);
+        }
+        if (i < 100)
+                D_INFO("BSM write complete, poll %d iterations\n", i);
+        else {
+                IL_ERR("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) */
+        il_wr_prph(il, BSM_WR_CTRL_REG, BSM_WR_CTRL_REG_BIT_START_EN);
+
+        return 0;
+}
+
+static struct il_hcmd_ops il3945_hcmd = {
+        .rxon_assoc = il3945_send_rxon_assoc,
+        .commit_rxon = il3945_commit_rxon,
+};
+
+static struct il_lib_ops il3945_lib = {
+        .txq_attach_buf_to_tfd = il3945_hw_txq_attach_buf_to_tfd,
+        .txq_free_tfd = il3945_hw_txq_free_tfd,
+        .txq_init = il3945_hw_tx_queue_init,
+        .load_ucode = il3945_load_bsm,
+        .dump_nic_error_log = il3945_dump_nic_error_log,
+        .apm_ops = {
+                    .init = il3945_apm_init,
+                    .config = il3945_nic_config,
+                    },
+        .eeprom_ops = {
+                       .regulatory_bands = {
+                                            EEPROM_REGULATORY_BAND_1_CHANNELS,
+                                            EEPROM_REGULATORY_BAND_2_CHANNELS,
+                                            EEPROM_REGULATORY_BAND_3_CHANNELS,
+                                            EEPROM_REGULATORY_BAND_4_CHANNELS,
+                                            EEPROM_REGULATORY_BAND_5_CHANNELS,
+                                            EEPROM_REGULATORY_BAND_NO_HT40,
+                                            EEPROM_REGULATORY_BAND_NO_HT40,
+                                            },
+                       .acquire_semaphore = il3945_eeprom_acquire_semaphore,
+                       .release_semaphore = il3945_eeprom_release_semaphore,
+                       },
+        .send_tx_power = il3945_send_tx_power,
+        .is_valid_rtc_data_addr = il3945_hw_valid_rtc_data_addr,
+
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+        .debugfs_ops = {
+                        .rx_stats_read = il3945_ucode_rx_stats_read,
+                        .tx_stats_read = il3945_ucode_tx_stats_read,
+                        .general_stats_read = il3945_ucode_general_stats_read,
+                        },
+#endif
+};
+
+static const struct il_legacy_ops il3945_legacy_ops = {
+        .post_associate = il3945_post_associate,
+        .config_ap = il3945_config_ap,
+        .manage_ibss_station = il3945_manage_ibss_station,
+};
+
+static struct il_hcmd_utils_ops il3945_hcmd_utils = {
+        .get_hcmd_size = il3945_get_hcmd_size,
+        .build_addsta_hcmd = il3945_build_addsta_hcmd,
+        .request_scan = il3945_request_scan,
+        .post_scan = il3945_post_scan,
+};
+
+static const struct il_ops il3945_ops = {
+        .lib = &il3945_lib,
+        .hcmd = &il3945_hcmd,
+        .utils = &il3945_hcmd_utils,
+        .led = &il3945_led_ops,
+        .legacy = &il3945_legacy_ops,
+        .ieee80211_ops = &il3945_hw_ops,
+};
+
+static struct il_base_params il3945_base_params = {
+        .eeprom_size = IL3945_EEPROM_IMG_SIZE,
+        .num_of_queues = IL39_NUM_QUEUES,
+        .pll_cfg_val = CSR39_ANA_PLL_CFG_VAL,
+        .set_l0s = false,
+        .use_bsm = true,
+        .led_compensation = 64,
+        .wd_timeout = IL_DEF_WD_TIMEOUT,
+};
+
+static struct il_cfg il3945_bg_cfg = {
+        .name = "3945BG",
+        .fw_name_pre = IL3945_FW_PRE,
+        .ucode_api_max = IL3945_UCODE_API_MAX,
+        .ucode_api_min = IL3945_UCODE_API_MIN,
+        .sku = IL_SKU_G,
+        .eeprom_ver = EEPROM_3945_EEPROM_VERSION,
+        .ops = &il3945_ops,
+        .mod_params = &il3945_mod_params,
+        .base_params = &il3945_base_params,
+        .led_mode = IL_LED_BLINK,
+};
+
+static struct il_cfg il3945_abg_cfg = {
+        .name = "3945ABG",
+        .fw_name_pre = IL3945_FW_PRE,
+        .ucode_api_max = IL3945_UCODE_API_MAX,
+        .ucode_api_min = IL3945_UCODE_API_MIN,
+        .sku = IL_SKU_A | IL_SKU_G,
+        .eeprom_ver = EEPROM_3945_EEPROM_VERSION,
+        .ops = &il3945_ops,
+        .mod_params = &il3945_mod_params,
+        .base_params = &il3945_base_params,
+        .led_mode = IL_LED_BLINK,
+};
+
+DEFINE_PCI_DEVICE_TABLE(il3945_hw_card_ids) = {
+        {IL_PCI_DEVICE(0x4222, 0x1005, il3945_bg_cfg)},
+        {IL_PCI_DEVICE(0x4222, 0x1034, il3945_bg_cfg)},
+        {IL_PCI_DEVICE(0x4222, 0x1044, il3945_bg_cfg)},
+        {IL_PCI_DEVICE(0x4227, 0x1014, il3945_bg_cfg)},
+        {IL_PCI_DEVICE(0x4222, PCI_ANY_ID, il3945_abg_cfg)},
+        {IL_PCI_DEVICE(0x4227, PCI_ANY_ID, il3945_abg_cfg)},
+        {0}
+};
+
+MODULE_DEVICE_TABLE(pci, il3945_hw_card_ids);
diff --git a/drivers/net/wireless/iwlegacy/3945.h b/drivers/net/wireless/iwlegacy/3945.h
new file mode 100644
index 000000000000..2b2895c544d7
--- /dev/null
+++ b/drivers/net/wireless/iwlegacy/3945.h
@@ -0,0 +1,626 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2003 - 2011 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:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+
+#ifndef __il_3945_h__
+#define __il_3945_h__
+
+#include <linux/pci.h>          /* for struct pci_device_id */
+#include <linux/kernel.h>
+#include <net/ieee80211_radiotap.h>
+
+/* Hardware specific file defines the PCI IDs table for that hardware module */
+extern const struct pci_device_id il3945_hw_card_ids[];
+
+#include "common.h"
+
+/* Highest firmware API version supported */
+#define IL3945_UCODE_API_MAX 2
+
+/* Lowest firmware API version supported */
+#define IL3945_UCODE_API_MIN 1
+
+#define IL3945_FW_PRE   "iwlwifi-3945-"
+#define _IL3945_MODULE_FIRMWARE(api) IL3945_FW_PRE #api ".ucode"
+#define IL3945_MODULE_FIRMWARE(api) _IL3945_MODULE_FIRMWARE(api)
+
+/* Default noise level to report when noise measurement is not available.
+ *   This may be because we're:
+ *   1)  Not associated (4965, no beacon stats being sent to driver)
+ *   2)  Scanning (noise measurement does not apply to associated channel)
+ *   3)  Receiving CCK (3945 delivers noise info only for OFDM frames)
+ * Use default noise value of -127 ... this is below the range of measurable
+ *   Rx dBm for either 3945 or 4965, so it can indicate "unmeasurable" to user.
+ *   Also, -127 works better than 0 when averaging frames with/without
+ *   noise info (e.g. averaging might be done in app); measured dBm values are
+ *   always negative ... using a negative value as the default keeps all
+ *   averages within an s8's (used in some apps) range of negative values. */
+#define IL_NOISE_MEAS_NOT_AVAILABLE (-127)
+
+/* Module parameters accessible from iwl-*.c */
+extern struct il_mod_params il3945_mod_params;
+
+struct il3945_rate_scale_data {
+        u64 data;
+        s32 success_counter;
+        s32 success_ratio;
+        s32 counter;
+        s32 average_tpt;
+        unsigned long stamp;
+};
+
+struct il3945_rs_sta {
+        spinlock_t lock;
+        struct il_priv *il;
+        s32 *expected_tpt;
+        unsigned long last_partial_flush;
+        unsigned long last_flush;
+        u32 flush_time;
+        u32 last_tx_packets;
+        u32 tx_packets;
+        u8 tgg;
+        u8 flush_pending;
+        u8 start_rate;
+        struct timer_list rate_scale_flush;
+        struct il3945_rate_scale_data win[RATE_COUNT_3945];
+#ifdef CONFIG_MAC80211_DEBUGFS
+        struct dentry *rs_sta_dbgfs_stats_table_file;
+#endif
+
+        /* used to be in sta_info */
+        int last_txrate_idx;
+};
+
+/*
+ * The common struct MUST be first because it is shared between
+ * 3945 and 4965!
+ */
+struct il3945_sta_priv {
+        struct il_station_priv_common common;
+        struct il3945_rs_sta rs_sta;
+};
+
+enum il3945_antenna {
+        IL_ANTENNA_DIVERSITY,
+        IL_ANTENNA_MAIN,
+        IL_ANTENNA_AUX
+};
+
+/*
+ * RTS threshold here is total size [2347] minus 4 FCS bytes
+ * Per spec:
+ *   a value of 0 means RTS on all data/management packets
+ *   a value > max MSDU size means no RTS
+ * else RTS for data/management frames where MPDU is larger
+ *   than RTS value.
+ */
+#define DEFAULT_RTS_THRESHOLD     2347U
+#define MIN_RTS_THRESHOLD         0U
+#define MAX_RTS_THRESHOLD         2347U
+#define MAX_MSDU_SIZE             2304U
+#define MAX_MPDU_SIZE             2346U
+#define DEFAULT_BEACON_INTERVAL   100U
+#define DEFAULT_SHORT_RETRY_LIMIT 7U
+#define DEFAULT_LONG_RETRY_LIMIT  4U
+
+#define IL_TX_FIFO_AC0  0
+#define IL_TX_FIFO_AC1  1
+#define IL_TX_FIFO_AC2  2
+#define IL_TX_FIFO_AC3  3
+#define IL_TX_FIFO_HCCA_1       5
+#define IL_TX_FIFO_HCCA_2       6
+#define IL_TX_FIFO_NONE 7
+
+#define IEEE80211_DATA_LEN              2304
+#define IEEE80211_4ADDR_LEN             30
+#define IEEE80211_HLEN                  (IEEE80211_4ADDR_LEN)
+#define IEEE80211_FRAME_LEN             (IEEE80211_DATA_LEN + IEEE80211_HLEN)
+
+struct il3945_frame {
+        union {
+                struct ieee80211_hdr frame;
+                struct il3945_tx_beacon_cmd beacon;
+                u8 raw[IEEE80211_FRAME_LEN];
+                u8 cmd[360];
+        } u;
+        struct list_head list;
+};
+
+#define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)
+#define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)
+#define MAX_SN ((IEEE80211_SCTL_SEQ) >> 4)
+
+#define SUP_RATE_11A_MAX_NUM_CHANNELS  8
+#define SUP_RATE_11B_MAX_NUM_CHANNELS  4
+#define SUP_RATE_11G_MAX_NUM_CHANNELS  12
+
+#define IL_SUPPORTED_RATES_IE_LEN         8
+
+#define SCAN_INTERVAL 100
+
+#define MAX_TID_COUNT        9
+
+#define IL_INVALID_RATE     0xFF
+#define IL_INVALID_VALUE    -1
+
+#define STA_PS_STATUS_WAKE             0
+#define STA_PS_STATUS_SLEEP            1
+
+struct il3945_ibss_seq {
+        u8 mac[ETH_ALEN];
+        u16 seq_num;
+        u16 frag_num;
+        unsigned long packet_time;
+        struct list_head list;
+};
+
+#define IL_RX_HDR(x) ((struct il3945_rx_frame_hdr *)(\
+                       x->u.rx_frame.stats.payload + \
+                       x->u.rx_frame.stats.phy_count))
+#define IL_RX_END(x) ((struct il3945_rx_frame_end *)(\
+                       IL_RX_HDR(x)->payload + \
+                       le16_to_cpu(IL_RX_HDR(x)->len)))
+#define IL_RX_STATS(x) (&x->u.rx_frame.stats)
+#define IL_RX_DATA(x) (IL_RX_HDR(x)->payload)
+
+/******************************************************************************
+ *
+ * Functions implemented in iwl3945-base.c which are forward declared here
+ * for use by iwl-*.c
+ *
+ *****************************************************************************/
+extern int il3945_calc_db_from_ratio(int sig_ratio);
+extern void il3945_rx_replenish(void *data);
+extern void il3945_rx_queue_reset(struct il_priv *il, struct il_rx_queue *rxq);
+extern unsigned int il3945_fill_beacon_frame(struct il_priv *il,
+                                             struct ieee80211_hdr *hdr,
+                                             int left);
+extern int il3945_dump_nic_event_log(struct il_priv *il, bool full_log,
+                                     char **buf, bool display);
+extern void il3945_dump_nic_error_log(struct il_priv *il);
+
+/******************************************************************************
+ *
+ * Functions implemented in iwl-[34]*.c which are forward declared here
+ * for use by iwl3945-base.c
+ *
+ * NOTE:  The implementation of these functions are hardware specific
+ * which is why they are in the hardware specific files (vs. iwl-base.c)
+ *
+ * Naming convention --
+ * il3945_         <-- Its part of iwlwifi (should be changed to il3945_)
+ * il3945_hw_      <-- Hardware specific (implemented in iwl-XXXX.c by all HW)
+ * iwlXXXX_     <-- Hardware specific (implemented in iwl-XXXX.c for XXXX)
+ * il3945_bg_      <-- Called from work queue context
+ * il3945_mac_     <-- mac80211 callback
+ *
+ ****************************************************************************/
+extern void il3945_hw_handler_setup(struct il_priv *il);
+extern void il3945_hw_setup_deferred_work(struct il_priv *il);
+extern void il3945_hw_cancel_deferred_work(struct il_priv *il);
+extern int il3945_hw_rxq_stop(struct il_priv *il);
+extern int il3945_hw_set_hw_params(struct il_priv *il);
+extern int il3945_hw_nic_init(struct il_priv *il);
+extern int il3945_hw_nic_stop_master(struct il_priv *il);
+extern void il3945_hw_txq_ctx_free(struct il_priv *il);
+extern void il3945_hw_txq_ctx_stop(struct il_priv *il);
+extern int il3945_hw_nic_reset(struct il_priv *il);
+extern int il3945_hw_txq_attach_buf_to_tfd(struct il_priv *il,
+                                           struct il_tx_queue *txq,
+                                           dma_addr_t addr, u16 len, u8 reset,
+                                           u8 pad);
+extern void il3945_hw_txq_free_tfd(struct il_priv *il, struct il_tx_queue *txq);
+extern int il3945_hw_get_temperature(struct il_priv *il);
+extern int il3945_hw_tx_queue_init(struct il_priv *il, struct il_tx_queue *txq);
+extern unsigned int il3945_hw_get_beacon_cmd(struct il_priv *il,
+                                             struct il3945_frame *frame,
+                                             u8 rate);
+void il3945_hw_build_tx_cmd_rate(struct il_priv *il, struct il_device_cmd *cmd,
+                                 struct ieee80211_tx_info *info,
+                                 struct ieee80211_hdr *hdr, int sta_id,
+                                 int tx_id);
+extern int il3945_hw_reg_send_txpower(struct il_priv *il);
+extern int il3945_hw_reg_set_txpower(struct il_priv *il, s8 power);
+extern void il3945_hdl_stats(struct il_priv *il, struct il_rx_buf *rxb);
+void il3945_hdl_c_stats(struct il_priv *il, struct il_rx_buf *rxb);
+extern void il3945_disable_events(struct il_priv *il);
+extern int il4965_get_temperature(const struct il_priv *il);
+extern void il3945_post_associate(struct il_priv *il);
+extern void il3945_config_ap(struct il_priv *il);
+
+extern int il3945_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx);
+
+/**
+ * il3945_hw_find_station - Find station id for a given BSSID
+ * @bssid: MAC address of station ID to find
+ *
+ * NOTE:  This should not be hardware specific but the code has
+ * not yet been merged into a single common layer for managing the
+ * station tables.
+ */
+extern u8 il3945_hw_find_station(struct il_priv *il, const u8 * bssid);
+
+extern struct ieee80211_ops il3945_hw_ops;
+
+extern __le32 il3945_get_antenna_flags(const struct il_priv *il);
+extern int il3945_init_hw_rate_table(struct il_priv *il);
+extern void il3945_reg_txpower_periodic(struct il_priv *il);
+extern int il3945_txpower_set_from_eeprom(struct il_priv *il);
+
+extern int il3945_rs_next_rate(struct il_priv *il, int rate);
+
+/* scanning */
+int il3945_request_scan(struct il_priv *il, struct ieee80211_vif *vif);
+void il3945_post_scan(struct il_priv *il);
+
+/* rates */
+extern const struct il3945_rate_info il3945_rates[RATE_COUNT_3945];
+
+/* RSSI to dBm */
+#define IL39_RSSI_OFFSET        95
+
+/*
+ * EEPROM related constants, enums, and structures.
+ */
+#define EEPROM_SKU_CAP_OP_MODE_MRC                      (1 << 7)
+
+/*
+ * Mapping of a Tx power level, at factory calibration temperature,
+ *   to a radio/DSP gain table idx.
+ * One for each of 5 "sample" power levels in each band.
+ * v_det is measured at the factory, using the 3945's built-in power amplifier
+ *   (PA) output voltage detector.  This same detector is used during Tx of
+ *   long packets in normal operation to provide feedback as to proper output
+ *   level.
+ * Data copied from EEPROM.
+ * DO NOT ALTER THIS STRUCTURE!!!
+ */
+struct il3945_eeprom_txpower_sample {
+        u8 gain_idx;            /* idx into power (gain) setup table ... */
+        s8 power;               /* ... for this pwr level for this chnl group */
+        u16 v_det;              /* PA output voltage */
+} __packed;
+
+/*
+ * Mappings of Tx power levels -> nominal radio/DSP gain table idxes.
+ * One for each channel group (a.k.a. "band") (1 for BG, 4 for A).
+ * Tx power setup code interpolates between the 5 "sample" power levels
+ *    to determine the nominal setup for a requested power level.
+ * Data copied from EEPROM.
+ * DO NOT ALTER THIS STRUCTURE!!!
+ */
+struct il3945_eeprom_txpower_group {
+        struct il3945_eeprom_txpower_sample samples[5]; /* 5 power levels */
+        s32 a, b, c, d, e;      /* coefficients for voltage->power
+                                 * formula (signed) */
+        s32 Fa, Fb, Fc, Fd, Fe; /* these modify coeffs based on
+                                 * frequency (signed) */
+        s8 saturation_power;    /* highest power possible by h/w in this
+                                 * band */
+        u8 group_channel;       /* "representative" channel # in this band */
+        s16 temperature;        /* h/w temperature at factory calib this band
+                                 * (signed) */
+} __packed;
+
+/*
+ * Temperature-based Tx-power compensation data, not band-specific.
+ * These coefficients are use to modify a/b/c/d/e coeffs based on
+ *   difference between current temperature and factory calib temperature.
+ * Data copied from EEPROM.
+ */
+struct il3945_eeprom_temperature_corr {
+        u32 Ta;
+        u32 Tb;
+        u32 Tc;
+        u32 Td;
+        u32 Te;
+} __packed;
+
+/*
+ * EEPROM map
+ */
+struct il3945_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[42];
+        u8 sku_id[4];           /* abs.ofs: 192 */
+
+/*
+ * Per-channel regulatory data.
+ *
+ * Each channel that *might* be supported by 3945 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.
+ *
+ * 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 il_eeprom_channel band_1_channels[14];   /* abs.ofs: 198 */
+
+/*
+ * 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 il_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 il_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 il_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 il_eeprom_channel band_5_channels[6];    /* abs.ofs: 306 */
+
+        u8 reserved9[194];
+
+/*
+ * 3945 Txpower calibration data.
+ */
+#define IL_NUM_TX_CALIB_GROUPS 5
+        struct il3945_eeprom_txpower_group groups[IL_NUM_TX_CALIB_GROUPS];
+/* abs.ofs: 512 */
+        struct il3945_eeprom_temperature_corr corrections;      /* abs.ofs: 832 */
+        u8 reserved16[172];     /* fill out to full 1024 byte block */
+} __packed;
+
+#define IL3945_EEPROM_IMG_SIZE 1024
+
+/* End of EEPROM */
+
+#define PCI_CFG_REV_ID_BIT_BASIC_SKU                (0x40)      /* bit 6    */
+#define PCI_CFG_REV_ID_BIT_RTP                      (0x80)      /* bit 7    */
+
+/* 4 DATA + 1 CMD. There are 2 HCCA queues that are not used. */
+#define IL39_NUM_QUEUES        5
+#define IL39_CMD_QUEUE_NUM      4
+
+#define IL_DEFAULT_TX_RETRY  15
+
+/*********************************************/
+
+#define RFD_SIZE                              4
+#define NUM_TFD_CHUNKS                        4
+
+#define TFD_CTL_COUNT_SET(n)       (n << 24)
+#define TFD_CTL_COUNT_GET(ctl)     ((ctl >> 24) & 7)
+#define TFD_CTL_PAD_SET(n)         (n << 28)
+#define TFD_CTL_PAD_GET(ctl)       (ctl >> 28)
+
+/* Sizes and addresses for instruction and data memory (SRAM) in
+ * 3945's embedded processor.  Driver access is via HBUS_TARG_MEM_* regs. */
+#define IL39_RTC_INST_LOWER_BOUND               (0x000000)
+#define IL39_RTC_INST_UPPER_BOUND               (0x014000)
+
+#define IL39_RTC_DATA_LOWER_BOUND               (0x800000)
+#define IL39_RTC_DATA_UPPER_BOUND               (0x808000)
+
+#define IL39_RTC_INST_SIZE (IL39_RTC_INST_UPPER_BOUND - \
+                                IL39_RTC_INST_LOWER_BOUND)
+#define IL39_RTC_DATA_SIZE (IL39_RTC_DATA_UPPER_BOUND - \
+                                IL39_RTC_DATA_LOWER_BOUND)
+
+#define IL39_MAX_INST_SIZE IL39_RTC_INST_SIZE
+#define IL39_MAX_DATA_SIZE IL39_RTC_DATA_SIZE
+
+/* Size of uCode instruction memory in bootstrap state machine */
+#define IL39_MAX_BSM_SIZE IL39_RTC_INST_SIZE
+
+static inline int
+il3945_hw_valid_rtc_data_addr(u32 addr)
+{
+        return (addr >= IL39_RTC_DATA_LOWER_BOUND &&
+                addr < IL39_RTC_DATA_UPPER_BOUND);
+}
+
+/* Base physical address of il3945_shared is provided to FH39_TSSR_CBB_BASE
+ * and &il3945_shared.rx_read_ptr[0] is provided to FH39_RCSR_RPTR_ADDR(0) */
+struct il3945_shared {
+        __le32 tx_base_ptr[8];
+} __packed;
+
+static inline u8
+il3945_hw_get_rate(__le16 rate_n_flags)
+{
+        return le16_to_cpu(rate_n_flags) & 0xFF;
+}
+
+static inline u16
+il3945_hw_get_rate_n_flags(__le16 rate_n_flags)
+{
+        return le16_to_cpu(rate_n_flags);
+}
+
+static inline __le16
+il3945_hw_set_rate_n_flags(u8 rate, u16 flags)
+{
+        return cpu_to_le16((u16) rate | flags);
+}
+
+/************************************/
+/* iwl3945 Flow Handler Definitions */
+/************************************/
+
+/**
+ * This I/O area is directly read/writable by driver (e.g. Linux uses writel())
+ * Addresses are offsets from device's PCI hardware base address.
+ */
+#define FH39_MEM_LOWER_BOUND                   (0x0800)
+#define FH39_MEM_UPPER_BOUND                   (0x1000)
+
+#define FH39_CBCC_TBL           (FH39_MEM_LOWER_BOUND + 0x140)
+#define FH39_TFDB_TBL           (FH39_MEM_LOWER_BOUND + 0x180)
+#define FH39_RCSR_TBL           (FH39_MEM_LOWER_BOUND + 0x400)
+#define FH39_RSSR_TBL           (FH39_MEM_LOWER_BOUND + 0x4c0)
+#define FH39_TCSR_TBL           (FH39_MEM_LOWER_BOUND + 0x500)
+#define FH39_TSSR_TBL           (FH39_MEM_LOWER_BOUND + 0x680)
+
+/* TFDB (Transmit Frame Buffer Descriptor) */
+#define FH39_TFDB(_ch, buf)                     (FH39_TFDB_TBL + \
+                                                 ((_ch) * 2 + (buf)) * 0x28)
+#define FH39_TFDB_CHNL_BUF_CTRL_REG(_ch)        (FH39_TFDB_TBL + 0x50 * (_ch))
+
+/* CBCC channel is [0,2] */
+#define FH39_CBCC(_ch)          (FH39_CBCC_TBL + (_ch) * 0x8)
+#define FH39_CBCC_CTRL(_ch)     (FH39_CBCC(_ch) + 0x00)
+#define FH39_CBCC_BASE(_ch)     (FH39_CBCC(_ch) + 0x04)
+
+/* RCSR channel is [0,2] */
+#define FH39_RCSR(_ch)                  (FH39_RCSR_TBL + (_ch) * 0x40)
+#define FH39_RCSR_CONFIG(_ch)           (FH39_RCSR(_ch) + 0x00)
+#define FH39_RCSR_RBD_BASE(_ch)         (FH39_RCSR(_ch) + 0x04)
+#define FH39_RCSR_WPTR(_ch)             (FH39_RCSR(_ch) + 0x20)
+#define FH39_RCSR_RPTR_ADDR(_ch)        (FH39_RCSR(_ch) + 0x24)
+
+#define FH39_RSCSR_CHNL0_WPTR           (FH39_RCSR_WPTR(0))
+
+/* RSSR */
+#define FH39_RSSR_CTRL                  (FH39_RSSR_TBL + 0x000)
+#define FH39_RSSR_STATUS                (FH39_RSSR_TBL + 0x004)
+
+/* TCSR */
+#define FH39_TCSR(_ch)                  (FH39_TCSR_TBL + (_ch) * 0x20)
+#define FH39_TCSR_CONFIG(_ch)           (FH39_TCSR(_ch) + 0x00)
+#define FH39_TCSR_CREDIT(_ch)           (FH39_TCSR(_ch) + 0x04)
+#define FH39_TCSR_BUFF_STTS(_ch)        (FH39_TCSR(_ch) + 0x08)
+
+/* TSSR */
+#define FH39_TSSR_CBB_BASE        (FH39_TSSR_TBL + 0x000)
+#define FH39_TSSR_MSG_CONFIG      (FH39_TSSR_TBL + 0x008)
+#define FH39_TSSR_TX_STATUS       (FH39_TSSR_TBL + 0x010)
+
+/* DBM */
+
+#define FH39_SRVC_CHNL                            (6)
+
+#define FH39_RCSR_RX_CONFIG_REG_POS_RBDC_SIZE     (20)
+#define FH39_RCSR_RX_CONFIG_REG_POS_IRQ_RBTH      (4)
+
+#define FH39_RCSR_RX_CONFIG_REG_BIT_WR_STTS_EN    (0x08000000)
+
+#define FH39_RCSR_RX_CONFIG_REG_VAL_DMA_CHNL_EN_ENABLE        (0x80000000)
+
+#define FH39_RCSR_RX_CONFIG_REG_VAL_RDRBD_EN_ENABLE           (0x20000000)
+
+#define FH39_RCSR_RX_CONFIG_REG_VAL_MAX_FRAG_SIZE_128           (0x01000000)
+
+#define FH39_RCSR_RX_CONFIG_REG_VAL_IRQ_DEST_INT_HOST           (0x00001000)
+
+#define FH39_RCSR_RX_CONFIG_REG_VAL_MSG_MODE_FH                 (0x00000000)
+
+#define FH39_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_TXF                (0x00000000)
+#define FH39_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_DRIVER             (0x00000001)
+
+#define FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE_VAL      (0x00000000)
+#define FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE_VAL       (0x00000008)
+
+#define FH39_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_IFTFD             (0x00200000)
+
+#define FH39_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_NOINT              (0x00000000)
+
+#define FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE              (0x00000000)
+#define FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE             (0x80000000)
+
+#define FH39_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_VALID            (0x00004000)
+
+#define FH39_TCSR_CHNL_TX_BUF_STS_REG_BIT_TFDB_WPTR             (0x00000001)
+
+#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_SNOOP_RD_TXPD_ON        (0xFF000000)
+#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RD_TXPD_ON        (0x00FF0000)
+
+#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_MAX_FRAG_SIZE_128B      (0x00000400)
+
+#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_SNOOP_RD_TFD_ON         (0x00000100)
+#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RD_CBB_ON         (0x00000080)
+
+#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RSP_WAIT_TH       (0x00000020)
+#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_RSP_WAIT_TH             (0x00000005)
+
+#define FH39_TSSR_TX_STATUS_REG_BIT_BUFS_EMPTY(_ch)     (BIT(_ch) << 24)
+#define FH39_TSSR_TX_STATUS_REG_BIT_NO_PEND_REQ(_ch)    (BIT(_ch) << 16)
+
+#define FH39_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(_ch) \
+        (FH39_TSSR_TX_STATUS_REG_BIT_BUFS_EMPTY(_ch) | \
+         FH39_TSSR_TX_STATUS_REG_BIT_NO_PEND_REQ(_ch))
+
+#define FH39_RSSR_CHNL0_RX_STATUS_CHNL_IDLE                     (0x01000000)
+
+struct il3945_tfd_tb {
+        __le32 addr;
+        __le32 len;
+} __packed;
+
+struct il3945_tfd {
+        __le32 control_flags;
+        struct il3945_tfd_tb tbs[4];
+        u8 __pad[28];
+} __packed;
+
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+ssize_t il3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,
+                                   size_t count, loff_t *ppos);
+ssize_t il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,
+                                   size_t count, loff_t *ppos);
+ssize_t il3945_ucode_general_stats_read(struct file *file,
+                                        char __user *user_buf, size_t count,
+                                        loff_t *ppos);
+#endif
+
+#endif
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-calib.c b/drivers/net/wireless/iwlegacy/4965-calib.c
index 162d877e6869..d3248e3ef23b 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-calib.c
+++ b/drivers/net/wireless/iwlegacy/4965-calib.c
@@ -63,15 +63,14 @@
 #include <linux/slab.h>
 #include <net/mac80211.h>
 
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-4965-calib.h"
+#include "common.h"
+#include "4965.h"
 
 /*****************************************************************************
  * INIT calibrations framework
  *****************************************************************************/
 
-struct statistics_general_data {
+struct stats_general_data {
         u32 beacon_silence_rssi_a;
         u32 beacon_silence_rssi_b;
         u32 beacon_silence_rssi_c;
@@ -80,14 +79,15 @@ struct statistics_general_data {
         u32 beacon_energy_c;
 };
 
-void iwl4965_calib_free_results(struct iwl_priv *priv)
+void
+il4965_calib_free_results(struct il_priv *il)
 {
         int i;
 
-        for (i = 0; i < IWL_CALIB_MAX; i++) {
-                kfree(priv->calib_results[i].buf);
-                priv->calib_results[i].buf = NULL;
-                priv->calib_results[i].buf_len = 0;
+        for (i = 0; i < IL_CALIB_MAX; i++) {
+                kfree(il->calib_results[i].buf);
+                il->calib_results[i].buf = NULL;
+                il->calib_results[i].buf_len = 0;
         }
 }
 
@@ -103,10 +103,9 @@ void iwl4965_calib_free_results(struct iwl_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 iwl_priv *priv,
-                                   u32 norm_fa,
-                                   u32 rx_enable_time,
-                                   struct statistics_general_data *rx_info)
+static int
+il4965_sens_energy_cck(struct il_priv *il, u32 norm_fa, u32 rx_enable_time,
+                       struct stats_general_data *rx_info)
 {
         u32 max_nrg_cck = 0;
         int i = 0;
@@ -129,22 +128,22 @@ static int iwl4965_sens_energy_cck(struct iwl_priv *priv,
         u32 false_alarms = norm_fa * 200 * 1024;
         u32 max_false_alarms = MAX_FA_CCK * rx_enable_time;
         u32 min_false_alarms = MIN_FA_CCK * rx_enable_time;
-        struct iwl_sensitivity_data *data = NULL;
-        const struct iwl_sensitivity_ranges *ranges = priv->hw_params.sens;
+        struct il_sensitivity_data *data = NULL;
+        const struct il_sensitivity_ranges *ranges = il->hw_params.sens;
 
-        data = &(priv->sensitivity_data);
+        data = &(il->sensitivity_data);
 
         data->nrg_auto_corr_silence_diff = 0;
 
         /* Find max silence rssi among all 3 receivers.
          * This is background noise, which may include transmissions from other
          *    networks, measured during silence before our network's beacon */
-        silence_rssi_a = (u8)((rx_info->beacon_silence_rssi_a &
-                            ALL_BAND_FILTER) >> 8);
-        silence_rssi_b = (u8)((rx_info->beacon_silence_rssi_b &
-                            ALL_BAND_FILTER) >> 8);
-        silence_rssi_c = (u8)((rx_info->beacon_silence_rssi_c &
-                            ALL_BAND_FILTER) >> 8);
+        silence_rssi_a =
+            (u8) ((rx_info->beacon_silence_rssi_a & ALL_BAND_FILTER) >> 8);
+        silence_rssi_b =
+            (u8) ((rx_info->beacon_silence_rssi_b & ALL_BAND_FILTER) >> 8);
+        silence_rssi_c =
+            (u8) ((rx_info->beacon_silence_rssi_c & ALL_BAND_FILTER) >> 8);
 
         val = max(silence_rssi_b, silence_rssi_c);
         max_silence_rssi = max(silence_rssi_a, (u8) val);
@@ -160,9 +159,8 @@ static int iwl4965_sens_energy_cck(struct iwl_priv *priv,
                 val = data->nrg_silence_rssi[i];
                 silence_ref = max(silence_ref, val);
         }
-        IWL_DEBUG_CALIB(priv, "silence a %u, b %u, c %u, 20-bcn max %u\n",
-                        silence_rssi_a, silence_rssi_b, silence_rssi_c,
-                        silence_ref);
+        D_CALIB("silence a %u, b %u, c %u, 20-bcn max %u\n", silence_rssi_a,
+                silence_rssi_b, silence_rssi_c, silence_ref);
 
         /* Find max rx energy (min value!) among all 3 receivers,
          *   measured during beacon frame.
@@ -184,9 +182,9 @@ static int iwl4965_sens_energy_cck(struct iwl_priv *priv,
                 max_nrg_cck = (u32) max(max_nrg_cck, (data->nrg_value[i]));
         max_nrg_cck += 6;
 
-        IWL_DEBUG_CALIB(priv, "rx energy a %u, b %u, c %u, 10-bcn max/min %u\n",
-                        rx_info->beacon_energy_a, rx_info->beacon_energy_b,
-                        rx_info->beacon_energy_c, max_nrg_cck - 6);
+        D_CALIB("rx energy a %u, b %u, c %u, 10-bcn max/min %u\n",
+                rx_info->beacon_energy_a, rx_info->beacon_energy_b,
+                rx_info->beacon_energy_c, max_nrg_cck - 6);
 
         /* Count number of consecutive beacons with fewer-than-desired
          *   false alarms. */
@@ -194,35 +192,34 @@ static int iwl4965_sens_energy_cck(struct iwl_priv *priv,
                 data->num_in_cck_no_fa++;
         else
                 data->num_in_cck_no_fa = 0;
-        IWL_DEBUG_CALIB(priv, "consecutive bcns with few false alarms = %u\n",
-                        data->num_in_cck_no_fa);
+        D_CALIB("consecutive bcns with few false alarms = %u\n",
+                data->num_in_cck_no_fa);
 
         /* If we got too many false alarms this time, reduce sensitivity */
-        if ((false_alarms > max_false_alarms) &&
-                (data->auto_corr_cck > AUTO_CORR_MAX_TH_CCK)) {
-                IWL_DEBUG_CALIB(priv, "norm FA %u > max FA %u\n",
-                     false_alarms, max_false_alarms);
-                IWL_DEBUG_CALIB(priv, "... reducing sensitivity\n");
-                data->nrg_curr_state = IWL_FA_TOO_MANY;
+        if (false_alarms > max_false_alarms &&
+            data->auto_corr_cck > AUTO_CORR_MAX_TH_CCK) {
+                D_CALIB("norm FA %u > max FA %u\n", false_alarms,
+                        max_false_alarms);
+                D_CALIB("... reducing sensitivity\n");
+                data->nrg_curr_state = IL_FA_TOO_MANY;
                 /* Store for "fewer than desired" on later beacon */
                 data->nrg_silence_ref = silence_ref;
 
                 /* increase energy threshold (reduce nrg value)
                  *   to decrease sensitivity */
                 data->nrg_th_cck = data->nrg_th_cck - NRG_STEP_CCK;
-        /* Else if we got fewer than desired, increase sensitivity */
+                /* Else if we got fewer than desired, increase sensitivity */
         } else if (false_alarms < min_false_alarms) {
-                data->nrg_curr_state = IWL_FA_TOO_FEW;
+                data->nrg_curr_state = IL_FA_TOO_FEW;
 
                 /* Compare silence level with silence level for most recent
                  *   healthy number or too many false alarms */
-                data->nrg_auto_corr_silence_diff = (s32)data->nrg_silence_ref -
-                                                   (s32)silence_ref;
+                data->nrg_auto_corr_silence_diff =
+                    (s32) data->nrg_silence_ref - (s32) silence_ref;
 
-                IWL_DEBUG_CALIB(priv,
-                         "norm FA %u < min FA %u, silence diff %d\n",
-                         false_alarms, min_false_alarms,
-                         data->nrg_auto_corr_silence_diff);
+                D_CALIB("norm FA %u < min FA %u, silence diff %d\n",
+                        false_alarms, min_false_alarms,
+                        data->nrg_auto_corr_silence_diff);
 
                 /* Increase value to increase sensitivity, but only if:
                  * 1a) previous beacon did *not* have *too many* false alarms
@@ -230,23 +227,22 @@ static int iwl4965_sens_energy_cck(struct iwl_priv *priv,
                  *      from a previous beacon with too many, or healthy # FAs
                  * OR 2) We've seen a lot of beacons (100) with too few
                  *       false alarms */
-                if ((data->nrg_prev_state != IWL_FA_TOO_MANY) &&
-                        ((data->nrg_auto_corr_silence_diff > NRG_DIFF) ||
-                        (data->num_in_cck_no_fa > MAX_NUMBER_CCK_NO_FA))) {
+                if (data->nrg_prev_state != IL_FA_TOO_MANY &&
+                    (data->nrg_auto_corr_silence_diff > NRG_DIFF ||
+                     data->num_in_cck_no_fa > MAX_NUMBER_CCK_NO_FA)) {
 
-                        IWL_DEBUG_CALIB(priv, "... increasing sensitivity\n");
+                        D_CALIB("... increasing sensitivity\n");
                         /* Increase nrg value to increase sensitivity */
                         val = data->nrg_th_cck + NRG_STEP_CCK;
-                        data->nrg_th_cck = min((u32)ranges->min_nrg_cck, val);
+                        data->nrg_th_cck = min((u32) ranges->min_nrg_cck, val);
                 } else {
-                        IWL_DEBUG_CALIB(priv,
-                                         "... but not changing sensitivity\n");
+                        D_CALIB("... but not changing sensitivity\n");
                 }
 
-        /* Else we got a healthy number of false alarms, keep status quo */
+                /* Else we got a healthy number of false alarms, keep status quo */
         } else {
-                IWL_DEBUG_CALIB(priv, " FA in safe zone\n");
-                data->nrg_curr_state = IWL_FA_GOOD_RANGE;
+                D_CALIB(" FA in safe zone\n");
+                data->nrg_curr_state = IL_FA_GOOD_RANGE;
 
                 /* Store for use in "fewer than desired" with later beacon */
                 data->nrg_silence_ref = silence_ref;
@@ -254,8 +250,8 @@ static int iwl4965_sens_energy_cck(struct iwl_priv *priv,
                 /* If previous beacon had too many false alarms,
                  *   give it some extra margin by reducing sensitivity again
                  *   (but don't go below measured energy of desired Rx) */
-                if (IWL_FA_TOO_MANY == data->nrg_prev_state) {
-                        IWL_DEBUG_CALIB(priv, "... increasing margin\n");
+                if (IL_FA_TOO_MANY == data->nrg_prev_state) {
+                        D_CALIB("... increasing margin\n");
                         if (data->nrg_th_cck > (max_nrg_cck + NRG_MARGIN))
                                 data->nrg_th_cck -= NRG_MARGIN;
                         else
@@ -269,7 +265,7 @@ static int iwl4965_sens_energy_cck(struct iwl_priv *priv,
          * Lower value is higher energy, so we use max()!
          */
         data->nrg_th_cck = max(max_nrg_cck, data->nrg_th_cck);
-        IWL_DEBUG_CALIB(priv, "new nrg_th_cck %u\n", data->nrg_th_cck);
+        D_CALIB("new nrg_th_cck %u\n", data->nrg_th_cck);
 
         data->nrg_prev_state = data->nrg_curr_state;
 
@@ -284,190 +280,187 @@ static int iwl4965_sens_energy_cck(struct iwl_priv *priv,
                 else {
                         val = data->auto_corr_cck + AUTO_CORR_STEP_CCK;
                         data->auto_corr_cck =
-                                min((u32)ranges->auto_corr_max_cck, val);
+                            min((u32) ranges->auto_corr_max_cck, val);
                 }
                 val = data->auto_corr_cck_mrc + AUTO_CORR_STEP_CCK;
                 data->auto_corr_cck_mrc =
-                        min((u32)ranges->auto_corr_max_cck_mrc, val);
-        } else if ((false_alarms < min_false_alarms) &&
-           ((data->nrg_auto_corr_silence_diff > NRG_DIFF) ||
-           (data->num_in_cck_no_fa > MAX_NUMBER_CCK_NO_FA))) {
+                    min((u32) ranges->auto_corr_max_cck_mrc, val);
+        } else if (false_alarms < min_false_alarms &&
+                   (data->nrg_auto_corr_silence_diff > NRG_DIFF ||
+                    data->num_in_cck_no_fa > MAX_NUMBER_CCK_NO_FA)) {
 
                 /* Decrease auto_corr values to increase sensitivity */
                 val = data->auto_corr_cck - AUTO_CORR_STEP_CCK;
-                data->auto_corr_cck =
-                        max((u32)ranges->auto_corr_min_cck, val);
+                data->auto_corr_cck = max((u32) ranges->auto_corr_min_cck, val);
                 val = data->auto_corr_cck_mrc - AUTO_CORR_STEP_CCK;
                 data->auto_corr_cck_mrc =
-                        max((u32)ranges->auto_corr_min_cck_mrc, val);
+                    max((u32) ranges->auto_corr_min_cck_mrc, val);
         }
 
         return 0;
 }
 
-
-static int iwl4965_sens_auto_corr_ofdm(struct iwl_priv *priv,
-                                       u32 norm_fa,
-                                       u32 rx_enable_time)
+static int
+il4965_sens_auto_corr_ofdm(struct il_priv *il, u32 norm_fa, u32 rx_enable_time)
 {
         u32 val;
         u32 false_alarms = norm_fa * 200 * 1024;
         u32 max_false_alarms = MAX_FA_OFDM * rx_enable_time;
         u32 min_false_alarms = MIN_FA_OFDM * rx_enable_time;
-        struct iwl_sensitivity_data *data = NULL;
-        const struct iwl_sensitivity_ranges *ranges = priv->hw_params.sens;
+        struct il_sensitivity_data *data = NULL;
+        const struct il_sensitivity_ranges *ranges = il->hw_params.sens;
 
-        data = &(priv->sensitivity_data);
+        data = &(il->sensitivity_data);
 
         /* If we got too many false alarms this time, reduce sensitivity */
         if (false_alarms > max_false_alarms) {
 
-                IWL_DEBUG_CALIB(priv, "norm FA %u > max FA %u)\n",
-                             false_alarms, max_false_alarms);
+                D_CALIB("norm FA %u > max FA %u)\n", false_alarms,
+                        max_false_alarms);
 
                 val = data->auto_corr_ofdm + AUTO_CORR_STEP_OFDM;
                 data->auto_corr_ofdm =
-                        min((u32)ranges->auto_corr_max_ofdm, val);
+                    min((u32) ranges->auto_corr_max_ofdm, val);
 
                 val = data->auto_corr_ofdm_mrc + AUTO_CORR_STEP_OFDM;
                 data->auto_corr_ofdm_mrc =
-                        min((u32)ranges->auto_corr_max_ofdm_mrc, val);
+                    min((u32) ranges->auto_corr_max_ofdm_mrc, val);
 
                 val = data->auto_corr_ofdm_x1 + AUTO_CORR_STEP_OFDM;
                 data->auto_corr_ofdm_x1 =
-                        min((u32)ranges->auto_corr_max_ofdm_x1, val);
+                    min((u32) ranges->auto_corr_max_ofdm_x1, val);
 
                 val = data->auto_corr_ofdm_mrc_x1 + AUTO_CORR_STEP_OFDM;
                 data->auto_corr_ofdm_mrc_x1 =
-                        min((u32)ranges->auto_corr_max_ofdm_mrc_x1, val);
+                    min((u32) ranges->auto_corr_max_ofdm_mrc_x1, val);
         }
 
         /* Else if we got fewer than desired, increase sensitivity */
         else if (false_alarms < min_false_alarms) {
 
-                IWL_DEBUG_CALIB(priv, "norm FA %u < min FA %u\n",
-                             false_alarms, min_false_alarms);
+                D_CALIB("norm FA %u < min FA %u\n", false_alarms,
+                        min_false_alarms);
 
                 val = data->auto_corr_ofdm - AUTO_CORR_STEP_OFDM;
                 data->auto_corr_ofdm =
-                        max((u32)ranges->auto_corr_min_ofdm, val);
+                    max((u32) ranges->auto_corr_min_ofdm, val);
 
                 val = data->auto_corr_ofdm_mrc - AUTO_CORR_STEP_OFDM;
                 data->auto_corr_ofdm_mrc =
-                        max((u32)ranges->auto_corr_min_ofdm_mrc, val);
+                    max((u32) ranges->auto_corr_min_ofdm_mrc, val);
 
                 val = data->auto_corr_ofdm_x1 - AUTO_CORR_STEP_OFDM;
                 data->auto_corr_ofdm_x1 =
-                        max((u32)ranges->auto_corr_min_ofdm_x1, val);
+                    max((u32) ranges->auto_corr_min_ofdm_x1, val);
 
                 val = data->auto_corr_ofdm_mrc_x1 - AUTO_CORR_STEP_OFDM;
                 data->auto_corr_ofdm_mrc_x1 =
-                        max((u32)ranges->auto_corr_min_ofdm_mrc_x1, val);
+                    max((u32) ranges->auto_corr_min_ofdm_mrc_x1, val);
         } else {
-                IWL_DEBUG_CALIB(priv, "min FA %u < norm FA %u < max FA %u OK\n",
-                         min_false_alarms, false_alarms, max_false_alarms);
+                D_CALIB("min FA %u < norm FA %u < max FA %u OK\n",
+                        min_false_alarms, false_alarms, max_false_alarms);
         }
         return 0;
 }
 
-static void iwl4965_prepare_legacy_sensitivity_tbl(struct iwl_priv *priv,
-                                struct iwl_sensitivity_data *data,
-                                __le16 *tbl)
+static void
+il4965_prepare_legacy_sensitivity_tbl(struct il_priv *il,
+                                      struct il_sensitivity_data *data,
+                                      __le16 *tbl)
 {
-        tbl[HD_AUTO_CORR32_X4_TH_ADD_MIN_INDEX] =
-                                cpu_to_le16((u16)data->auto_corr_ofdm);
-        tbl[HD_AUTO_CORR32_X4_TH_ADD_MIN_MRC_INDEX] =
-                                cpu_to_le16((u16)data->auto_corr_ofdm_mrc);
-        tbl[HD_AUTO_CORR32_X1_TH_ADD_MIN_INDEX] =
-                                cpu_to_le16((u16)data->auto_corr_ofdm_x1);
-        tbl[HD_AUTO_CORR32_X1_TH_ADD_MIN_MRC_INDEX] =
-                                cpu_to_le16((u16)data->auto_corr_ofdm_mrc_x1);
-
-        tbl[HD_AUTO_CORR40_X4_TH_ADD_MIN_INDEX] =
-                                cpu_to_le16((u16)data->auto_corr_cck);
-        tbl[HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_INDEX] =
-                                cpu_to_le16((u16)data->auto_corr_cck_mrc);
-
-        tbl[HD_MIN_ENERGY_CCK_DET_INDEX] =
-                                cpu_to_le16((u16)data->nrg_th_cck);
-        tbl[HD_MIN_ENERGY_OFDM_DET_INDEX] =
-                                cpu_to_le16((u16)data->nrg_th_ofdm);
-
-        tbl[HD_BARKER_CORR_TH_ADD_MIN_INDEX] =
-                                cpu_to_le16(data->barker_corr_th_min);
-        tbl[HD_BARKER_CORR_TH_ADD_MIN_MRC_INDEX] =
-                                cpu_to_le16(data->barker_corr_th_min_mrc);
-        tbl[HD_OFDM_ENERGY_TH_IN_INDEX] =
-                                cpu_to_le16(data->nrg_th_cca);
-
-        IWL_DEBUG_CALIB(priv, "ofdm: ac %u mrc %u x1 %u mrc_x1 %u thresh %u\n",
-                        data->auto_corr_ofdm, data->auto_corr_ofdm_mrc,
-                        data->auto_corr_ofdm_x1, data->auto_corr_ofdm_mrc_x1,
-                        data->nrg_th_ofdm);
-
-        IWL_DEBUG_CALIB(priv, "cck: ac %u mrc %u thresh %u\n",
-                        data->auto_corr_cck, data->auto_corr_cck_mrc,
-                        data->nrg_th_cck);
+        tbl[HD_AUTO_CORR32_X4_TH_ADD_MIN_IDX] =
+            cpu_to_le16((u16) data->auto_corr_ofdm);
+        tbl[HD_AUTO_CORR32_X4_TH_ADD_MIN_MRC_IDX] =
+            cpu_to_le16((u16) data->auto_corr_ofdm_mrc);
+        tbl[HD_AUTO_CORR32_X1_TH_ADD_MIN_IDX] =
+            cpu_to_le16((u16) data->auto_corr_ofdm_x1);
+        tbl[HD_AUTO_CORR32_X1_TH_ADD_MIN_MRC_IDX] =
+            cpu_to_le16((u16) data->auto_corr_ofdm_mrc_x1);
+
+        tbl[HD_AUTO_CORR40_X4_TH_ADD_MIN_IDX] =
+            cpu_to_le16((u16) data->auto_corr_cck);
+        tbl[HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_IDX] =
+            cpu_to_le16((u16) data->auto_corr_cck_mrc);
+
+        tbl[HD_MIN_ENERGY_CCK_DET_IDX] = cpu_to_le16((u16) data->nrg_th_cck);
+        tbl[HD_MIN_ENERGY_OFDM_DET_IDX] = cpu_to_le16((u16) data->nrg_th_ofdm);
+
+        tbl[HD_BARKER_CORR_TH_ADD_MIN_IDX] =
+            cpu_to_le16(data->barker_corr_th_min);
+        tbl[HD_BARKER_CORR_TH_ADD_MIN_MRC_IDX] =
+            cpu_to_le16(data->barker_corr_th_min_mrc);
+        tbl[HD_OFDM_ENERGY_TH_IN_IDX] = cpu_to_le16(data->nrg_th_cca);
+
+        D_CALIB("ofdm: ac %u mrc %u x1 %u mrc_x1 %u thresh %u\n",
+                data->auto_corr_ofdm, data->auto_corr_ofdm_mrc,
+                data->auto_corr_ofdm_x1, data->auto_corr_ofdm_mrc_x1,
+                data->nrg_th_ofdm);
+
+        D_CALIB("cck: ac %u mrc %u thresh %u\n", data->auto_corr_cck,
+                data->auto_corr_cck_mrc, data->nrg_th_cck);
 }
 
-/* Prepare a SENSITIVITY_CMD, send to uCode if values have changed */
-static int iwl4965_sensitivity_write(struct iwl_priv *priv)
+/* Prepare a C_SENSITIVITY, send to uCode if values have changed */
+static int
+il4965_sensitivity_write(struct il_priv *il)
 {
-        struct iwl_sensitivity_cmd cmd;
-        struct iwl_sensitivity_data *data = NULL;
-        struct iwl_host_cmd cmd_out = {
-                .id = SENSITIVITY_CMD,
-                .len = sizeof(struct iwl_sensitivity_cmd),
+        struct il_sensitivity_cmd cmd;
+        struct il_sensitivity_data *data = NULL;
+        struct il_host_cmd cmd_out = {
+                .id = C_SENSITIVITY,
+                .len = sizeof(struct il_sensitivity_cmd),
                 .flags = CMD_ASYNC,
                 .data = &cmd,
         };
 
-        data = &(priv->sensitivity_data);
+        data = &(il->sensitivity_data);
 
         memset(&cmd, 0, sizeof(cmd));
 
-        iwl4965_prepare_legacy_sensitivity_tbl(priv, data, &cmd.table[0]);
+        il4965_prepare_legacy_sensitivity_tbl(il, data, &cmd.table[0]);
 
         /* Update uCode's "work" table, and copy it to DSP */
-        cmd.control = SENSITIVITY_CMD_CONTROL_WORK_TABLE;
+        cmd.control = C_SENSITIVITY_CONTROL_WORK_TBL;
 
         /* Don't send command to uCode if nothing has changed */
-        if (!memcmp(&cmd.table[0], &(priv->sensitivity_tbl[0]),
-                    sizeof(u16)*HD_TABLE_SIZE)) {
-                IWL_DEBUG_CALIB(priv, "No change in SENSITIVITY_CMD\n");
+        if (!memcmp
+            (&cmd.table[0], &(il->sensitivity_tbl[0]),
+             sizeof(u16) * HD_TBL_SIZE)) {
+                D_CALIB("No change in C_SENSITIVITY\n");
                 return 0;
         }
 
         /* Copy table for comparison next time */
-        memcpy(&(priv->sensitivity_tbl[0]), &(cmd.table[0]),
-               sizeof(u16)*HD_TABLE_SIZE);
+        memcpy(&(il->sensitivity_tbl[0]), &(cmd.table[0]),
+               sizeof(u16) * HD_TBL_SIZE);
 
-        return iwl_legacy_send_cmd(priv, &cmd_out);
+        return il_send_cmd(il, &cmd_out);
 }
 
-void iwl4965_init_sensitivity(struct iwl_priv *priv)
+void
+il4965_init_sensitivity(struct il_priv *il)
 {
         int ret = 0;
         int i;
-        struct iwl_sensitivity_data *data = NULL;
-        const struct iwl_sensitivity_ranges *ranges = priv->hw_params.sens;
+        struct il_sensitivity_data *data = NULL;
+        const struct il_sensitivity_ranges *ranges = il->hw_params.sens;
 
-        if (priv->disable_sens_cal)
+        if (il->disable_sens_cal)
                 return;
 
-        IWL_DEBUG_CALIB(priv, "Start iwl4965_init_sensitivity\n");
+        D_CALIB("Start il4965_init_sensitivity\n");
 
         /* Clear driver's sensitivity algo data */
-        data = &(priv->sensitivity_data);
+        data = &(il->sensitivity_data);
 
         if (ranges == NULL)
                 return;
 
-        memset(data, 0, sizeof(struct iwl_sensitivity_data));
+        memset(data, 0, sizeof(struct il_sensitivity_data));
 
         data->num_in_cck_no_fa = 0;
-        data->nrg_curr_state = IWL_FA_TOO_MANY;
-        data->nrg_prev_state = IWL_FA_TOO_MANY;
+        data->nrg_curr_state = IL_FA_TOO_MANY;
+        data->nrg_prev_state = IL_FA_TOO_MANY;
         data->nrg_silence_ref = 0;
         data->nrg_silence_idx = 0;
         data->nrg_energy_idx = 0;
@@ -478,9 +471,9 @@ void iwl4965_init_sensitivity(struct iwl_priv *priv)
         for (i = 0; i < NRG_NUM_PREV_STAT_L; i++)
                 data->nrg_silence_rssi[i] = 0;
 
-        data->auto_corr_ofdm =  ranges->auto_corr_min_ofdm;
+        data->auto_corr_ofdm = ranges->auto_corr_min_ofdm;
         data->auto_corr_ofdm_mrc = ranges->auto_corr_min_ofdm_mrc;
-        data->auto_corr_ofdm_x1  = ranges->auto_corr_min_ofdm_x1;
+        data->auto_corr_ofdm_x1 = ranges->auto_corr_min_ofdm_x1;
         data->auto_corr_ofdm_mrc_x1 = ranges->auto_corr_min_ofdm_mrc_x1;
         data->auto_corr_cck = AUTO_CORR_CCK_MIN_VAL_DEF;
         data->auto_corr_cck_mrc = ranges->auto_corr_min_cck_mrc;
@@ -495,11 +488,12 @@ void iwl4965_init_sensitivity(struct iwl_priv *priv)
         data->last_bad_plcp_cnt_cck = 0;
         data->last_fa_cnt_cck = 0;
 
-        ret |= iwl4965_sensitivity_write(priv);
-        IWL_DEBUG_CALIB(priv, "<<return 0x%X\n", ret);
+        ret |= il4965_sensitivity_write(il);
+        D_CALIB("<<return 0x%X\n", ret);
 }
 
-void iwl4965_sensitivity_calibration(struct iwl_priv *priv, void *resp)
+void
+il4965_sensitivity_calibration(struct il_priv *il, void *resp)
 {
         u32 rx_enable_time;
         u32 fa_cck;
@@ -508,31 +502,31 @@ void iwl4965_sensitivity_calibration(struct iwl_priv *priv, void *resp)
         u32 bad_plcp_ofdm;
         u32 norm_fa_ofdm;
         u32 norm_fa_cck;
-        struct iwl_sensitivity_data *data = NULL;
-        struct statistics_rx_non_phy *rx_info;
-        struct statistics_rx_phy *ofdm, *cck;
+        struct il_sensitivity_data *data = NULL;
+        struct stats_rx_non_phy *rx_info;
+        struct stats_rx_phy *ofdm, *cck;
         unsigned long flags;
-        struct statistics_general_data statis;
+        struct stats_general_data statis;
 
-        if (priv->disable_sens_cal)
+        if (il->disable_sens_cal)
                 return;
 
-        data = &(priv->sensitivity_data);
+        data = &(il->sensitivity_data);
 
-        if (!iwl_legacy_is_any_associated(priv)) {
-                IWL_DEBUG_CALIB(priv, "<< - not associated\n");
+        if (!il_is_any_associated(il)) {
+                D_CALIB("<< - not associated\n");
                 return;
         }
 
-        spin_lock_irqsave(&priv->lock, flags);
+        spin_lock_irqsave(&il->lock, flags);
 
-        rx_info = &(((struct iwl_notif_statistics *)resp)->rx.general);
-        ofdm = &(((struct iwl_notif_statistics *)resp)->rx.ofdm);
-        cck = &(((struct iwl_notif_statistics *)resp)->rx.cck);
+        rx_info = &(((struct il_notif_stats *)resp)->rx.general);
+        ofdm = &(((struct il_notif_stats *)resp)->rx.ofdm);
+        cck = &(((struct il_notif_stats *)resp)->rx.cck);
 
         if (rx_info->interference_data_flag != INTERFERENCE_DATA_AVAILABLE) {
-                IWL_DEBUG_CALIB(priv, "<< invalid data.\n");
-                spin_unlock_irqrestore(&priv->lock, flags);
+                D_CALIB("<< invalid data.\n");
+                spin_unlock_irqrestore(&il->lock, flags);
                 return;
         }
 
@@ -544,30 +538,27 @@ void iwl4965_sensitivity_calibration(struct iwl_priv *priv, void *resp)
         bad_plcp_ofdm = le32_to_cpu(ofdm->plcp_err);
 
         statis.beacon_silence_rssi_a =
-                        le32_to_cpu(rx_info->beacon_silence_rssi_a);
+            le32_to_cpu(rx_info->beacon_silence_rssi_a);
         statis.beacon_silence_rssi_b =
-                        le32_to_cpu(rx_info->beacon_silence_rssi_b);
+            le32_to_cpu(rx_info->beacon_silence_rssi_b);
         statis.beacon_silence_rssi_c =
-                        le32_to_cpu(rx_info->beacon_silence_rssi_c);
-        statis.beacon_energy_a =
-                        le32_to_cpu(rx_info->beacon_energy_a);
-        statis.beacon_energy_b =
-                        le32_to_cpu(rx_info->beacon_energy_b);
-        statis.beacon_energy_c =
-                        le32_to_cpu(rx_info->beacon_energy_c);
+            le32_to_cpu(rx_info->beacon_silence_rssi_c);
+        statis.beacon_energy_a = le32_to_cpu(rx_info->beacon_energy_a);
+        statis.beacon_energy_b = le32_to_cpu(rx_info->beacon_energy_b);
+        statis.beacon_energy_c = le32_to_cpu(rx_info->beacon_energy_c);
 
-        spin_unlock_irqrestore(&priv->lock, flags);
+        spin_unlock_irqrestore(&il->lock, flags);
 
-        IWL_DEBUG_CALIB(priv, "rx_enable_time = %u usecs\n", rx_enable_time);
+        D_CALIB("rx_enable_time = %u usecs\n", rx_enable_time);
 
         if (!rx_enable_time) {
-                IWL_DEBUG_CALIB(priv, "<< RX Enable Time == 0!\n");
+                D_CALIB("<< RX Enable Time == 0!\n");
                 return;
         }
 
-        /* These statistics increase monotonically, and do not reset
+        /* These stats increase monotonically, and do not reset
          *   at each beacon.  Calculate difference from last value, or just
-         *   use the new statistics value if it has reset or wrapped around. */
+         *   use the new stats value if it has reset or wrapped around. */
         if (data->last_bad_plcp_cnt_cck > bad_plcp_cck)
                 data->last_bad_plcp_cnt_cck = bad_plcp_cck;
         else {
@@ -600,17 +591,17 @@ void iwl4965_sensitivity_calibration(struct iwl_priv *priv, void *resp)
         norm_fa_ofdm = fa_ofdm + bad_plcp_ofdm;
         norm_fa_cck = fa_cck + bad_plcp_cck;
 
-        IWL_DEBUG_CALIB(priv,
-                         "cck: fa %u badp %u  ofdm: fa %u badp %u\n", fa_cck,
-                        bad_plcp_cck, fa_ofdm, bad_plcp_ofdm);
+        D_CALIB("cck: fa %u badp %u  ofdm: fa %u badp %u\n", fa_cck,
+                bad_plcp_cck, fa_ofdm, bad_plcp_ofdm);
 
-        iwl4965_sens_auto_corr_ofdm(priv, norm_fa_ofdm, rx_enable_time);
-        iwl4965_sens_energy_cck(priv, norm_fa_cck, rx_enable_time, &statis);
+        il4965_sens_auto_corr_ofdm(il, norm_fa_ofdm, rx_enable_time);
+        il4965_sens_energy_cck(il, norm_fa_cck, rx_enable_time, &statis);
 
-        iwl4965_sensitivity_write(priv);
+        il4965_sensitivity_write(il);
 }
 
-static inline u8 iwl4965_find_first_chain(u8 mask)
+static inline u8
+il4965_find_first_chain(u8 mask)
 {
         if (mask & ANT_A)
                 return CHAIN_A;
@@ -624,8 +615,8 @@ static inline u8 iwl4965_find_first_chain(u8 mask)
  * disconnected.
  */
 static void
-iwl4965_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,
-                                     struct iwl_chain_noise_data *data)
+il4965_find_disconn_antenna(struct il_priv *il, u32 * average_sig,
+                            struct il_chain_noise_data *data)
 {
         u32 active_chains = 0;
         u32 max_average_sig;
@@ -634,12 +625,15 @@ iwl4965_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,
         u8 first_chain;
         u16 i = 0;
 
-        average_sig[0] = data->chain_signal_a /
-                         priv->cfg->base_params->chain_noise_num_beacons;
-        average_sig[1] = data->chain_signal_b /
-                         priv->cfg->base_params->chain_noise_num_beacons;
-        average_sig[2] = data->chain_signal_c /
-                         priv->cfg->base_params->chain_noise_num_beacons;
+        average_sig[0] =
+            data->chain_signal_a /
+            il->cfg->base_params->chain_noise_num_beacons;
+        average_sig[1] =
+            data->chain_signal_b /
+            il->cfg->base_params->chain_noise_num_beacons;
+        average_sig[2] =
+            data->chain_signal_c /
+            il->cfg->base_params->chain_noise_num_beacons;
 
         if (average_sig[0] >= average_sig[1]) {
                 max_average_sig = average_sig[0];
@@ -657,10 +651,10 @@ iwl4965_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,
                 active_chains = (1 << max_average_sig_antenna_i);
         }
 
-        IWL_DEBUG_CALIB(priv, "average_sig: a %d b %d c %d\n",
-                     average_sig[0], average_sig[1], average_sig[2]);
-        IWL_DEBUG_CALIB(priv, "max_average_sig = %d, antenna %d\n",
-                     max_average_sig, max_average_sig_antenna_i);
+        D_CALIB("average_sig: a %d b %d c %d\n", average_sig[0], average_sig[1],
+                average_sig[2]);
+        D_CALIB("max_average_sig = %d, antenna %d\n", max_average_sig,
+                max_average_sig_antenna_i);
 
         /* Compare signal strengths for all 3 receivers. */
         for (i = 0; i < NUM_RX_CHAINS; i++) {
@@ -673,9 +667,9 @@ iwl4965_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,
                                 data->disconn_array[i] = 1;
                         else
                                 active_chains |= (1 << i);
-                        IWL_DEBUG_CALIB(priv, "i = %d  rssiDelta = %d  "
-                             "disconn_array[i] = %d\n",
-                             i, rssi_delta, data->disconn_array[i]);
+                        D_CALIB("i = %d  rssiDelta = %d  "
+                                "disconn_array[i] = %d\n", i, rssi_delta,
+                                data->disconn_array[i]);
                 }
         }
 
@@ -689,119 +683,110 @@ iwl4965_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,
          * To be safe, simply mask out any chains that we know
          * are not on the device.
          */
-        active_chains &= priv->hw_params.valid_rx_ant;
+        active_chains &= il->hw_params.valid_rx_ant;
 
         num_tx_chains = 0;
         for (i = 0; i < NUM_RX_CHAINS; i++) {
                 /* loops on all the bits of
-                 * priv->hw_setting.valid_tx_ant */
+                 * il->hw_setting.valid_tx_ant */
                 u8 ant_msk = (1 << i);
-                if (!(priv->hw_params.valid_tx_ant & ant_msk))
+                if (!(il->hw_params.valid_tx_ant & ant_msk))
                         continue;
 
                 num_tx_chains++;
                 if (data->disconn_array[i] == 0)
                         /* there is a Tx antenna connected */
                         break;
-                if (num_tx_chains == priv->hw_params.tx_chains_num &&
+                if (num_tx_chains == il->hw_params.tx_chains_num &&
                     data->disconn_array[i]) {
                         /*
                          * If all chains are disconnected
                          * connect the first valid tx chain
                          */
                         first_chain =
-                        iwl4965_find_first_chain(priv->cfg->valid_tx_ant);
+                            il4965_find_first_chain(il->cfg->valid_tx_ant);
                         data->disconn_array[first_chain] = 0;
                         active_chains |= BIT(first_chain);
-                        IWL_DEBUG_CALIB(priv,
-                                        "All Tx chains are disconnected W/A - declare %d as connected\n",
-                                        first_chain);
+                        D_CALIB("All Tx chains are disconnected"
+                                "- declare %d as connected\n", first_chain);
                         break;
                 }
         }
 
-        if (active_chains != priv->hw_params.valid_rx_ant &&
-            active_chains != priv->chain_noise_data.active_chains)
-                IWL_DEBUG_CALIB(priv,
-                                "Detected that not all antennas are connected! "
-                                "Connected: %#x, valid: %#x.\n",
-                                active_chains, priv->hw_params.valid_rx_ant);
+        if (active_chains != il->hw_params.valid_rx_ant &&
+            active_chains != il->chain_noise_data.active_chains)
+                D_CALIB("Detected that not all antennas are connected! "
+                        "Connected: %#x, valid: %#x.\n", active_chains,
+                        il->hw_params.valid_rx_ant);
 
         /* Save for use within RXON, TX, SCAN commands, etc. */
         data->active_chains = active_chains;
-        IWL_DEBUG_CALIB(priv, "active_chains (bitwise) = 0x%x\n",
-                        active_chains);
+        D_CALIB("active_chains (bitwise) = 0x%x\n", active_chains);
 }
 
-static void iwl4965_gain_computation(struct iwl_priv *priv,
-                u32 *average_noise,
-                u16 min_average_noise_antenna_i,
-                u32 min_average_noise,
-                u8 default_chain)
+static void
+il4965_gain_computation(struct il_priv *il, u32 * average_noise,
+                        u16 min_average_noise_antenna_i, u32 min_average_noise,
+                        u8 default_chain)
 {
         int i, ret;
-        struct iwl_chain_noise_data *data = &priv->chain_noise_data;
+        struct il_chain_noise_data *data = &il->chain_noise_data;
 
         data->delta_gain_code[min_average_noise_antenna_i] = 0;
 
         for (i = default_chain; i < NUM_RX_CHAINS; i++) {
                 s32 delta_g = 0;
 
-                if (!(data->disconn_array[i]) &&
-                    (data->delta_gain_code[i] ==
-                             CHAIN_NOISE_DELTA_GAIN_INIT_VAL)) {
+                if (!data->disconn_array[i] &&
+                    data->delta_gain_code[i] ==
+                    CHAIN_NOISE_DELTA_GAIN_INIT_VAL) {
                         delta_g = average_noise[i] - min_average_noise;
-                        data->delta_gain_code[i] = (u8)((delta_g * 10) / 15);
+                        data->delta_gain_code[i] = (u8) ((delta_g * 10) / 15);
                         data->delta_gain_code[i] =
-                                min(data->delta_gain_code[i],
+                            min(data->delta_gain_code[i],
                                 (u8) CHAIN_NOISE_MAX_DELTA_GAIN_CODE);
 
                         data->delta_gain_code[i] =
-                                (data->delta_gain_code[i] | (1 << 2));
+                            (data->delta_gain_code[i] | (1 << 2));
                 } else {
                         data->delta_gain_code[i] = 0;
                 }
         }
-        IWL_DEBUG_CALIB(priv, "delta_gain_codes: a %d b %d c %d\n",
-                     data->delta_gain_code[0],
-                     data->delta_gain_code[1],
-                     data->delta_gain_code[2]);
+        D_CALIB("delta_gain_codes: a %d b %d c %d\n", data->delta_gain_code[0],
+                data->delta_gain_code[1], data->delta_gain_code[2]);
 
         /* Differential gain gets sent to uCode only once */
         if (!data->radio_write) {
-                struct iwl_calib_diff_gain_cmd cmd;
+                struct il_calib_diff_gain_cmd cmd;
                 data->radio_write = 1;
 
                 memset(&cmd, 0, sizeof(cmd));
-                cmd.hdr.op_code = IWL_PHY_CALIBRATE_DIFF_GAIN_CMD;
+                cmd.hdr.op_code = IL_PHY_CALIBRATE_DIFF_GAIN_CMD;
                 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];
-                ret = iwl_legacy_send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD,
-                                      sizeof(cmd), &cmd);
+                ret = il_send_cmd_pdu(il, C_PHY_CALIBRATION, sizeof(cmd), &cmd);
                 if (ret)
-                        IWL_DEBUG_CALIB(priv, "fail sending cmd "
-                                     "REPLY_PHY_CALIBRATION_CMD\n");
+                        D_CALIB("fail sending cmd " "C_PHY_CALIBRATION\n");
 
                 /* TODO we might want recalculate
                  * rx_chain in rxon cmd */
 
                 /* Mark so we run this algo only once! */
-                data->state = IWL_CHAIN_NOISE_CALIBRATED;
+                data->state = IL_CHAIN_NOISE_CALIBRATED;
         }
 }
 
-
-
 /*
- * Accumulate 16 beacons of signal and noise statistics for each of
+ * Accumulate 16 beacons of signal and noise stats for each of
  *   3 receivers/antennas/rx-chains, then figure out:
  * 1)  Which antennas are connected.
  * 2)  Differential rx gain settings to balance the 3 receivers.
  */
-void iwl4965_chain_noise_calibration(struct iwl_priv *priv, void *stat_resp)
+void
+il4965_chain_noise_calibration(struct il_priv *il, void *stat_resp)
 {
-        struct iwl_chain_noise_data *data = NULL;
+        struct il_chain_noise_data *data = NULL;
 
         u32 chain_noise_a;
         u32 chain_noise_b;
@@ -809,8 +794,8 @@ void iwl4965_chain_noise_calibration(struct iwl_priv *priv, void *stat_resp)
         u32 chain_sig_a;
         u32 chain_sig_b;
         u32 chain_sig_c;
-        u32 average_sig[NUM_RX_CHAINS] = {INITIALIZATION_VALUE};
-        u32 average_noise[NUM_RX_CHAINS] = {INITIALIZATION_VALUE};
+        u32 average_sig[NUM_RX_CHAINS] = { INITIALIZATION_VALUE };
+        u32 average_noise[NUM_RX_CHAINS] = { INITIALIZATION_VALUE };
         u32 min_average_noise = MIN_AVERAGE_NOISE_MAX_VALUE;
         u16 min_average_noise_antenna_i = INITIALIZATION_VALUE;
         u16 i = 0;
@@ -819,70 +804,69 @@ void iwl4965_chain_noise_calibration(struct iwl_priv *priv, void *stat_resp)
         u8 rxon_band24;
         u8 stat_band24;
         unsigned long flags;
-        struct statistics_rx_non_phy *rx_info;
+        struct stats_rx_non_phy *rx_info;
 
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
+        struct il_rxon_context *ctx = &il->ctx;
 
-        if (priv->disable_chain_noise_cal)
+        if (il->disable_chain_noise_cal)
                 return;
 
-        data = &(priv->chain_noise_data);
+        data = &(il->chain_noise_data);
 
         /*
          * Accumulate just the first "chain_noise_num_beacons" after
          * the first association, then we're done forever.
          */
-        if (data->state != IWL_CHAIN_NOISE_ACCUMULATE) {
-                if (data->state == IWL_CHAIN_NOISE_ALIVE)
-                        IWL_DEBUG_CALIB(priv, "Wait for noise calib reset\n");
+        if (data->state != IL_CHAIN_NOISE_ACCUMULATE) {
+                if (data->state == IL_CHAIN_NOISE_ALIVE)
+                        D_CALIB("Wait for noise calib reset\n");
                 return;
         }
 
-        spin_lock_irqsave(&priv->lock, flags);
+        spin_lock_irqsave(&il->lock, flags);
 
-        rx_info = &(((struct iwl_notif_statistics *)stat_resp)->
-                      rx.general);
+        rx_info = &(((struct il_notif_stats *)stat_resp)->rx.general);
 
         if (rx_info->interference_data_flag != INTERFERENCE_DATA_AVAILABLE) {
-                IWL_DEBUG_CALIB(priv, " << Interference data unavailable\n");
-                spin_unlock_irqrestore(&priv->lock, flags);
+                D_CALIB(" << Interference data unavailable\n");
+                spin_unlock_irqrestore(&il->lock, flags);
                 return;
         }
 
         rxon_band24 = !!(ctx->staging.flags & RXON_FLG_BAND_24G_MSK);
         rxon_chnum = le16_to_cpu(ctx->staging.channel);
 
-        stat_band24 = !!(((struct iwl_notif_statistics *)
-                         stat_resp)->flag &
-                         STATISTICS_REPLY_FLG_BAND_24G_MSK);
-        stat_chnum = le32_to_cpu(((struct iwl_notif_statistics *)
-                                 stat_resp)->flag) >> 16;
+        stat_band24 =
+            !!(((struct il_notif_stats *)stat_resp)->
+               flag & STATS_REPLY_FLG_BAND_24G_MSK);
+        stat_chnum =
+            le32_to_cpu(((struct il_notif_stats *)stat_resp)->flag) >> 16;
 
         /* Make sure we accumulate data for just the associated channel
          *   (even if scanning). */
-        if ((rxon_chnum != stat_chnum) || (rxon_band24 != stat_band24)) {
-                IWL_DEBUG_CALIB(priv, "Stats not from chan=%d, band24=%d\n",
-                                rxon_chnum, rxon_band24);
-                spin_unlock_irqrestore(&priv->lock, flags);
+        if (rxon_chnum != stat_chnum || rxon_band24 != stat_band24) {
+                D_CALIB("Stats not from chan=%d, band24=%d\n", rxon_chnum,
+                        rxon_band24);
+                spin_unlock_irqrestore(&il->lock, flags);
                 return;
         }
 
         /*
-         *  Accumulate beacon statistics values across
+         *  Accumulate beacon stats values across
          * "chain_noise_num_beacons"
          */
-        chain_noise_a = le32_to_cpu(rx_info->beacon_silence_rssi_a) &
-                                IN_BAND_FILTER;
-        chain_noise_b = le32_to_cpu(rx_info->beacon_silence_rssi_b) &
-                                IN_BAND_FILTER;
-        chain_noise_c = le32_to_cpu(rx_info->beacon_silence_rssi_c) &
-                                IN_BAND_FILTER;
+        chain_noise_a =
+            le32_to_cpu(rx_info->beacon_silence_rssi_a) & IN_BAND_FILTER;
+        chain_noise_b =
+            le32_to_cpu(rx_info->beacon_silence_rssi_b) & IN_BAND_FILTER;
+        chain_noise_c =
+            le32_to_cpu(rx_info->beacon_silence_rssi_c) & IN_BAND_FILTER;
 
         chain_sig_a = le32_to_cpu(rx_info->beacon_rssi_a) & IN_BAND_FILTER;
         chain_sig_b = le32_to_cpu(rx_info->beacon_rssi_b) & IN_BAND_FILTER;
         chain_sig_c = le32_to_cpu(rx_info->beacon_rssi_c) & IN_BAND_FILTER;
 
-        spin_unlock_irqrestore(&priv->lock, flags);
+        spin_unlock_irqrestore(&il->lock, flags);
 
         data->beacon_count++;
 
@@ -894,34 +878,33 @@ void iwl4965_chain_noise_calibration(struct iwl_priv *priv, void *stat_resp)
         data->chain_signal_b = (chain_sig_b + data->chain_signal_b);
         data->chain_signal_c = (chain_sig_c + data->chain_signal_c);
 
-        IWL_DEBUG_CALIB(priv, "chan=%d, band24=%d, beacon=%d\n",
-                        rxon_chnum, rxon_band24, data->beacon_count);
-        IWL_DEBUG_CALIB(priv, "chain_sig: a %d b %d c %d\n",
-                        chain_sig_a, chain_sig_b, chain_sig_c);
-        IWL_DEBUG_CALIB(priv, "chain_noise: a %d b %d c %d\n",
-                        chain_noise_a, chain_noise_b, chain_noise_c);
+        D_CALIB("chan=%d, band24=%d, beacon=%d\n", rxon_chnum, rxon_band24,
+                data->beacon_count);
+        D_CALIB("chain_sig: a %d b %d c %d\n", chain_sig_a, chain_sig_b,
+                chain_sig_c);
+        D_CALIB("chain_noise: a %d b %d c %d\n", chain_noise_a, chain_noise_b,
+                chain_noise_c);
 
         /* If this is the "chain_noise_num_beacons", determine:
          * 1)  Disconnected antennas (using signal strengths)
          * 2)  Differential gain (using silence noise) to balance receivers */
-        if (data->beacon_count !=
-                priv->cfg->base_params->chain_noise_num_beacons)
+        if (data->beacon_count != il->cfg->base_params->chain_noise_num_beacons)
                 return;
 
         /* Analyze signal for disconnected antenna */
-        iwl4965_find_disconn_antenna(priv, average_sig, data);
+        il4965_find_disconn_antenna(il, average_sig, data);
 
         /* Analyze noise for rx balance */
-        average_noise[0] = data->chain_noise_a /
-                           priv->cfg->base_params->chain_noise_num_beacons;
-        average_noise[1] = data->chain_noise_b /
-                           priv->cfg->base_params->chain_noise_num_beacons;
-        average_noise[2] = data->chain_noise_c /
-                           priv->cfg->base_params->chain_noise_num_beacons;
+        average_noise[0] =
+            data->chain_noise_a / il->cfg->base_params->chain_noise_num_beacons;
+        average_noise[1] =
+            data->chain_noise_b / il->cfg->base_params->chain_noise_num_beacons;
+        average_noise[2] =
+            data->chain_noise_c / il->cfg->base_params->chain_noise_num_beacons;
 
         for (i = 0; i < NUM_RX_CHAINS; i++) {
-                if (!(data->disconn_array[i]) &&
-                   (average_noise[i] <= min_average_noise)) {
+                if (!data->disconn_array[i] &&
+                    average_noise[i] <= min_average_noise) {
                         /* This means that chain i is active and has
                          * lower noise values so far: */
                         min_average_noise = average_noise[i];
@@ -929,39 +912,37 @@ void iwl4965_chain_noise_calibration(struct iwl_priv *priv, void *stat_resp)
                 }
         }
 
-        IWL_DEBUG_CALIB(priv, "average_noise: a %d b %d c %d\n",
-                        average_noise[0], average_noise[1],
-                        average_noise[2]);
+        D_CALIB("average_noise: a %d b %d c %d\n", average_noise[0],
+                average_noise[1], average_noise[2]);
 
-        IWL_DEBUG_CALIB(priv, "min_average_noise = %d, antenna %d\n",
-                        min_average_noise, min_average_noise_antenna_i);
+        D_CALIB("min_average_noise = %d, antenna %d\n", min_average_noise,
+                min_average_noise_antenna_i);
 
-        iwl4965_gain_computation(priv, average_noise,
-                        min_average_noise_antenna_i, min_average_noise,
-                        iwl4965_find_first_chain(priv->cfg->valid_rx_ant));
+        il4965_gain_computation(il, average_noise, min_average_noise_antenna_i,
+                                min_average_noise,
+                                il4965_find_first_chain(il->cfg->valid_rx_ant));
 
         /* Some power changes may have been made during the calibration.
          * Update and commit the RXON
          */
-        if (priv->cfg->ops->lib->update_chain_flags)
-                priv->cfg->ops->lib->update_chain_flags(priv);
+        if (il->cfg->ops->lib->update_chain_flags)
+                il->cfg->ops->lib->update_chain_flags(il);
 
-        data->state = IWL_CHAIN_NOISE_DONE;
-        iwl_legacy_power_update_mode(priv, false);
+        data->state = IL_CHAIN_NOISE_DONE;
+        il_power_update_mode(il, false);
 }
 
-void iwl4965_reset_run_time_calib(struct iwl_priv *priv)
+void
+il4965_reset_run_time_calib(struct il_priv *il)
 {
         int i;
-        memset(&(priv->sensitivity_data), 0,
-               sizeof(struct iwl_sensitivity_data));
-        memset(&(priv->chain_noise_data), 0,
-               sizeof(struct iwl_chain_noise_data));
+        memset(&(il->sensitivity_data), 0, sizeof(struct il_sensitivity_data));
+        memset(&(il->chain_noise_data), 0, sizeof(struct il_chain_noise_data));
         for (i = 0; i < NUM_RX_CHAINS; i++)
-                priv->chain_noise_data.delta_gain_code[i] =
-                                CHAIN_NOISE_DELTA_GAIN_INIT_VAL;
+                il->chain_noise_data.delta_gain_code[i] =
+                    CHAIN_NOISE_DELTA_GAIN_INIT_VAL;
 
-        /* Ask for statistics now, the uCode will send notification
+        /* Ask for stats now, the uCode will send notification
          * periodically after association */
-        iwl_legacy_send_statistics_request(priv, CMD_ASYNC, true);
+        il_send_stats_request(il, CMD_ASYNC, true);
 }
diff --git a/drivers/net/wireless/iwlegacy/4965-debug.c b/drivers/net/wireless/iwlegacy/4965-debug.c
new file mode 100644
index 000000000000..98ec39f56ba3
--- /dev/null
+++ b/drivers/net/wireless/iwlegacy/4965-debug.c
@@ -0,0 +1,746 @@
+/******************************************************************************
+*
+* GPL LICENSE SUMMARY
+*
+* Copyright(c) 2008 - 2011 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:
+*  Intel Linux Wireless <ilw@linux.intel.com>
+* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+*****************************************************************************/
+#include "common.h"
+#include "4965.h"
+
+static const char *fmt_value = "  %-30s %10u\n";
+static const char *fmt_table = "  %-30s %10u  %10u  %10u  %10u\n";
+static const char *fmt_header =
+    "%-32s    current  cumulative       delta         max\n";
+
+static int
+il4965_stats_flag(struct il_priv *il, char *buf, int bufsz)
+{
+        int p = 0;
+        u32 flag;
+
+        flag = le32_to_cpu(il->_4965.stats.flag);
+
+        p += scnprintf(buf + p, bufsz - p, "Statistics Flag(0x%X):\n", flag);
+        if (flag & UCODE_STATS_CLEAR_MSK)
+                p += scnprintf(buf + p, bufsz - p,
+                               "\tStatistics have been cleared\n");
+        p += scnprintf(buf + p, bufsz - p, "\tOperational Frequency: %s\n",
+                       (flag & UCODE_STATS_FREQUENCY_MSK) ? "2.4 GHz" :
+                       "5.2 GHz");
+        p += scnprintf(buf + p, bufsz - p, "\tTGj Narrow Band: %s\n",
+                       (flag & UCODE_STATS_NARROW_BAND_MSK) ? "enabled" :
+                       "disabled");
+
+        return p;
+}
+
+ssize_t
+il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
+                           size_t count, loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        int pos = 0;
+        char *buf;
+        int bufsz =
+            sizeof(struct stats_rx_phy) * 40 +
+            sizeof(struct stats_rx_non_phy) * 40 +
+            sizeof(struct stats_rx_ht_phy) * 40 + 400;
+        ssize_t ret;
+        struct stats_rx_phy *ofdm, *accum_ofdm, *delta_ofdm, *max_ofdm;
+        struct stats_rx_phy *cck, *accum_cck, *delta_cck, *max_cck;
+        struct stats_rx_non_phy *general, *accum_general;
+        struct stats_rx_non_phy *delta_general, *max_general;
+        struct stats_rx_ht_phy *ht, *accum_ht, *delta_ht, *max_ht;
+
+        if (!il_is_alive(il))
+                return -EAGAIN;
+
+        buf = kzalloc(bufsz, GFP_KERNEL);
+        if (!buf) {
+                IL_ERR("Can not allocate Buffer\n");
+                return -ENOMEM;
+        }
+
+        /*
+         * the statistic information display here is based on
+         * the last stats notification from uCode
+         * might not reflect the current uCode activity
+         */
+        ofdm = &il->_4965.stats.rx.ofdm;
+        cck = &il->_4965.stats.rx.cck;
+        general = &il->_4965.stats.rx.general;
+        ht = &il->_4965.stats.rx.ofdm_ht;
+        accum_ofdm = &il->_4965.accum_stats.rx.ofdm;
+        accum_cck = &il->_4965.accum_stats.rx.cck;
+        accum_general = &il->_4965.accum_stats.rx.general;
+        accum_ht = &il->_4965.accum_stats.rx.ofdm_ht;
+        delta_ofdm = &il->_4965.delta_stats.rx.ofdm;
+        delta_cck = &il->_4965.delta_stats.rx.cck;
+        delta_general = &il->_4965.delta_stats.rx.general;
+        delta_ht = &il->_4965.delta_stats.rx.ofdm_ht;
+        max_ofdm = &il->_4965.max_delta.rx.ofdm;
+        max_cck = &il->_4965.max_delta.rx.cck;
+        max_general = &il->_4965.max_delta.rx.general;
+        max_ht = &il->_4965.max_delta.rx.ofdm_ht;
+
+        pos += il4965_stats_flag(il, buf, bufsz);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_header,
+                      "Statistics_Rx - OFDM:");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "ina_cnt:",
+                      le32_to_cpu(ofdm->ina_cnt), accum_ofdm->ina_cnt,
+                      delta_ofdm->ina_cnt, max_ofdm->ina_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "fina_cnt:",
+                      le32_to_cpu(ofdm->fina_cnt), accum_ofdm->fina_cnt,
+                      delta_ofdm->fina_cnt, max_ofdm->fina_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "plcp_err:",
+                      le32_to_cpu(ofdm->plcp_err), accum_ofdm->plcp_err,
+                      delta_ofdm->plcp_err, max_ofdm->plcp_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "crc32_err:",
+                      le32_to_cpu(ofdm->crc32_err), accum_ofdm->crc32_err,
+                      delta_ofdm->crc32_err, max_ofdm->crc32_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "overrun_err:",
+                      le32_to_cpu(ofdm->overrun_err), accum_ofdm->overrun_err,
+                      delta_ofdm->overrun_err, max_ofdm->overrun_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "early_overrun_err:",
+                      le32_to_cpu(ofdm->early_overrun_err),
+                      accum_ofdm->early_overrun_err,
+                      delta_ofdm->early_overrun_err,
+                      max_ofdm->early_overrun_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "crc32_good:",
+                      le32_to_cpu(ofdm->crc32_good), accum_ofdm->crc32_good,
+                      delta_ofdm->crc32_good, max_ofdm->crc32_good);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "false_alarm_cnt:",
+                      le32_to_cpu(ofdm->false_alarm_cnt),
+                      accum_ofdm->false_alarm_cnt, delta_ofdm->false_alarm_cnt,
+                      max_ofdm->false_alarm_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "fina_sync_err_cnt:",
+                      le32_to_cpu(ofdm->fina_sync_err_cnt),
+                      accum_ofdm->fina_sync_err_cnt,
+                      delta_ofdm->fina_sync_err_cnt,
+                      max_ofdm->fina_sync_err_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "sfd_timeout:",
+                      le32_to_cpu(ofdm->sfd_timeout), accum_ofdm->sfd_timeout,
+                      delta_ofdm->sfd_timeout, max_ofdm->sfd_timeout);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "fina_timeout:",
+                      le32_to_cpu(ofdm->fina_timeout), accum_ofdm->fina_timeout,
+                      delta_ofdm->fina_timeout, max_ofdm->fina_timeout);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "unresponded_rts:",
+                      le32_to_cpu(ofdm->unresponded_rts),
+                      accum_ofdm->unresponded_rts, delta_ofdm->unresponded_rts,
+                      max_ofdm->unresponded_rts);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "rxe_frame_lmt_ovrun:",
+                      le32_to_cpu(ofdm->rxe_frame_limit_overrun),
+                      accum_ofdm->rxe_frame_limit_overrun,
+                      delta_ofdm->rxe_frame_limit_overrun,
+                      max_ofdm->rxe_frame_limit_overrun);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "sent_ack_cnt:",
+                      le32_to_cpu(ofdm->sent_ack_cnt), accum_ofdm->sent_ack_cnt,
+                      delta_ofdm->sent_ack_cnt, max_ofdm->sent_ack_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "sent_cts_cnt:",
+                      le32_to_cpu(ofdm->sent_cts_cnt), accum_ofdm->sent_cts_cnt,
+                      delta_ofdm->sent_cts_cnt, max_ofdm->sent_cts_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "sent_ba_rsp_cnt:",
+                      le32_to_cpu(ofdm->sent_ba_rsp_cnt),
+                      accum_ofdm->sent_ba_rsp_cnt, delta_ofdm->sent_ba_rsp_cnt,
+                      max_ofdm->sent_ba_rsp_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "dsp_self_kill:",
+                      le32_to_cpu(ofdm->dsp_self_kill),
+                      accum_ofdm->dsp_self_kill, delta_ofdm->dsp_self_kill,
+                      max_ofdm->dsp_self_kill);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "mh_format_err:",
+                      le32_to_cpu(ofdm->mh_format_err),
+                      accum_ofdm->mh_format_err, delta_ofdm->mh_format_err,
+                      max_ofdm->mh_format_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "re_acq_main_rssi_sum:",
+                      le32_to_cpu(ofdm->re_acq_main_rssi_sum),
+                      accum_ofdm->re_acq_main_rssi_sum,
+                      delta_ofdm->re_acq_main_rssi_sum,
+                      max_ofdm->re_acq_main_rssi_sum);
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_header,
+                      "Statistics_Rx - CCK:");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "ina_cnt:",
+                      le32_to_cpu(cck->ina_cnt), accum_cck->ina_cnt,
+                      delta_cck->ina_cnt, max_cck->ina_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "fina_cnt:",
+                      le32_to_cpu(cck->fina_cnt), accum_cck->fina_cnt,
+                      delta_cck->fina_cnt, max_cck->fina_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "plcp_err:",
+                      le32_to_cpu(cck->plcp_err), accum_cck->plcp_err,
+                      delta_cck->plcp_err, max_cck->plcp_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "crc32_err:",
+                      le32_to_cpu(cck->crc32_err), accum_cck->crc32_err,
+                      delta_cck->crc32_err, max_cck->crc32_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "overrun_err:",
+                      le32_to_cpu(cck->overrun_err), accum_cck->overrun_err,
+                      delta_cck->overrun_err, max_cck->overrun_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "early_overrun_err:",
+                      le32_to_cpu(cck->early_overrun_err),
+                      accum_cck->early_overrun_err,
+                      delta_cck->early_overrun_err, max_cck->early_overrun_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "crc32_good:",
+                      le32_to_cpu(cck->crc32_good), accum_cck->crc32_good,
+                      delta_cck->crc32_good, max_cck->crc32_good);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "false_alarm_cnt:",
+                      le32_to_cpu(cck->false_alarm_cnt),
+                      accum_cck->false_alarm_cnt, delta_cck->false_alarm_cnt,
+                      max_cck->false_alarm_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "fina_sync_err_cnt:",
+                      le32_to_cpu(cck->fina_sync_err_cnt),
+                      accum_cck->fina_sync_err_cnt,
+                      delta_cck->fina_sync_err_cnt, max_cck->fina_sync_err_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "sfd_timeout:",
+                      le32_to_cpu(cck->sfd_timeout), accum_cck->sfd_timeout,
+                      delta_cck->sfd_timeout, max_cck->sfd_timeout);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "fina_timeout:",
+                      le32_to_cpu(cck->fina_timeout), accum_cck->fina_timeout,
+                      delta_cck->fina_timeout, max_cck->fina_timeout);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "unresponded_rts:",
+                      le32_to_cpu(cck->unresponded_rts),
+                      accum_cck->unresponded_rts, delta_cck->unresponded_rts,
+                      max_cck->unresponded_rts);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "rxe_frame_lmt_ovrun:",
+                      le32_to_cpu(cck->rxe_frame_limit_overrun),
+                      accum_cck->rxe_frame_limit_overrun,
+                      delta_cck->rxe_frame_limit_overrun,
+                      max_cck->rxe_frame_limit_overrun);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "sent_ack_cnt:",
+                      le32_to_cpu(cck->sent_ack_cnt), accum_cck->sent_ack_cnt,
+                      delta_cck->sent_ack_cnt, max_cck->sent_ack_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "sent_cts_cnt:",
+                      le32_to_cpu(cck->sent_cts_cnt), accum_cck->sent_cts_cnt,
+                      delta_cck->sent_cts_cnt, max_cck->sent_cts_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "sent_ba_rsp_cnt:",
+                      le32_to_cpu(cck->sent_ba_rsp_cnt),
+                      accum_cck->sent_ba_rsp_cnt, delta_cck->sent_ba_rsp_cnt,
+                      max_cck->sent_ba_rsp_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "dsp_self_kill:",
+                      le32_to_cpu(cck->dsp_self_kill), accum_cck->dsp_self_kill,
+                      delta_cck->dsp_self_kill, max_cck->dsp_self_kill);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "mh_format_err:",
+                      le32_to_cpu(cck->mh_format_err), accum_cck->mh_format_err,
+                      delta_cck->mh_format_err, max_cck->mh_format_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "re_acq_main_rssi_sum:",
+                      le32_to_cpu(cck->re_acq_main_rssi_sum),
+                      accum_cck->re_acq_main_rssi_sum,
+                      delta_cck->re_acq_main_rssi_sum,
+                      max_cck->re_acq_main_rssi_sum);
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_header,
+                      "Statistics_Rx - GENERAL:");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "bogus_cts:",
+                      le32_to_cpu(general->bogus_cts), accum_general->bogus_cts,
+                      delta_general->bogus_cts, max_general->bogus_cts);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "bogus_ack:",
+                      le32_to_cpu(general->bogus_ack), accum_general->bogus_ack,
+                      delta_general->bogus_ack, max_general->bogus_ack);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "non_bssid_frames:",
+                      le32_to_cpu(general->non_bssid_frames),
+                      accum_general->non_bssid_frames,
+                      delta_general->non_bssid_frames,
+                      max_general->non_bssid_frames);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "filtered_frames:",
+                      le32_to_cpu(general->filtered_frames),
+                      accum_general->filtered_frames,
+                      delta_general->filtered_frames,
+                      max_general->filtered_frames);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "non_channel_beacons:",
+                      le32_to_cpu(general->non_channel_beacons),
+                      accum_general->non_channel_beacons,
+                      delta_general->non_channel_beacons,
+                      max_general->non_channel_beacons);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "channel_beacons:",
+                      le32_to_cpu(general->channel_beacons),
+                      accum_general->channel_beacons,
+                      delta_general->channel_beacons,
+                      max_general->channel_beacons);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "num_missed_bcon:",
+                      le32_to_cpu(general->num_missed_bcon),
+                      accum_general->num_missed_bcon,
+                      delta_general->num_missed_bcon,
+                      max_general->num_missed_bcon);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "adc_rx_saturation_time:",
+                      le32_to_cpu(general->adc_rx_saturation_time),
+                      accum_general->adc_rx_saturation_time,
+                      delta_general->adc_rx_saturation_time,
+                      max_general->adc_rx_saturation_time);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "ina_detect_search_tm:",
+                      le32_to_cpu(general->ina_detection_search_time),
+                      accum_general->ina_detection_search_time,
+                      delta_general->ina_detection_search_time,
+                      max_general->ina_detection_search_time);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "beacon_silence_rssi_a:",
+                      le32_to_cpu(general->beacon_silence_rssi_a),
+                      accum_general->beacon_silence_rssi_a,
+                      delta_general->beacon_silence_rssi_a,
+                      max_general->beacon_silence_rssi_a);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "beacon_silence_rssi_b:",
+                      le32_to_cpu(general->beacon_silence_rssi_b),
+                      accum_general->beacon_silence_rssi_b,
+                      delta_general->beacon_silence_rssi_b,
+                      max_general->beacon_silence_rssi_b);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "beacon_silence_rssi_c:",
+                      le32_to_cpu(general->beacon_silence_rssi_c),
+                      accum_general->beacon_silence_rssi_c,
+                      delta_general->beacon_silence_rssi_c,
+                      max_general->beacon_silence_rssi_c);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "interference_data_flag:",
+                      le32_to_cpu(general->interference_data_flag),
+                      accum_general->interference_data_flag,
+                      delta_general->interference_data_flag,
+                      max_general->interference_data_flag);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "channel_load:",
+                      le32_to_cpu(general->channel_load),
+                      accum_general->channel_load, delta_general->channel_load,
+                      max_general->channel_load);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "dsp_false_alarms:",
+                      le32_to_cpu(general->dsp_false_alarms),
+                      accum_general->dsp_false_alarms,
+                      delta_general->dsp_false_alarms,
+                      max_general->dsp_false_alarms);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "beacon_rssi_a:",
+                      le32_to_cpu(general->beacon_rssi_a),
+                      accum_general->beacon_rssi_a,
+                      delta_general->beacon_rssi_a, max_general->beacon_rssi_a);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "beacon_rssi_b:",
+                      le32_to_cpu(general->beacon_rssi_b),
+                      accum_general->beacon_rssi_b,
+                      delta_general->beacon_rssi_b, max_general->beacon_rssi_b);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "beacon_rssi_c:",
+                      le32_to_cpu(general->beacon_rssi_c),
+                      accum_general->beacon_rssi_c,
+                      delta_general->beacon_rssi_c, max_general->beacon_rssi_c);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "beacon_energy_a:",
+                      le32_to_cpu(general->beacon_energy_a),
+                      accum_general->beacon_energy_a,
+                      delta_general->beacon_energy_a,
+                      max_general->beacon_energy_a);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "beacon_energy_b:",
+                      le32_to_cpu(general->beacon_energy_b),
+                      accum_general->beacon_energy_b,
+                      delta_general->beacon_energy_b,
+                      max_general->beacon_energy_b);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "beacon_energy_c:",
+                      le32_to_cpu(general->beacon_energy_c),
+                      accum_general->beacon_energy_c,
+                      delta_general->beacon_energy_c,
+                      max_general->beacon_energy_c);
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_header,
+                      "Statistics_Rx - OFDM_HT:");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "plcp_err:",
+                      le32_to_cpu(ht->plcp_err), accum_ht->plcp_err,
+                      delta_ht->plcp_err, max_ht->plcp_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "overrun_err:",
+                      le32_to_cpu(ht->overrun_err), accum_ht->overrun_err,
+                      delta_ht->overrun_err, max_ht->overrun_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "early_overrun_err:",
+                      le32_to_cpu(ht->early_overrun_err),
+                      accum_ht->early_overrun_err, delta_ht->early_overrun_err,
+                      max_ht->early_overrun_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "crc32_good:",
+                      le32_to_cpu(ht->crc32_good), accum_ht->crc32_good,
+                      delta_ht->crc32_good, max_ht->crc32_good);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "crc32_err:",
+                      le32_to_cpu(ht->crc32_err), accum_ht->crc32_err,
+                      delta_ht->crc32_err, max_ht->crc32_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "mh_format_err:",
+                      le32_to_cpu(ht->mh_format_err), accum_ht->mh_format_err,
+                      delta_ht->mh_format_err, max_ht->mh_format_err);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "agg_crc32_good:",
+                      le32_to_cpu(ht->agg_crc32_good), accum_ht->agg_crc32_good,
+                      delta_ht->agg_crc32_good, max_ht->agg_crc32_good);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "agg_mpdu_cnt:",
+                      le32_to_cpu(ht->agg_mpdu_cnt), accum_ht->agg_mpdu_cnt,
+                      delta_ht->agg_mpdu_cnt, max_ht->agg_mpdu_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "agg_cnt:",
+                      le32_to_cpu(ht->agg_cnt), accum_ht->agg_cnt,
+                      delta_ht->agg_cnt, max_ht->agg_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "unsupport_mcs:",
+                      le32_to_cpu(ht->unsupport_mcs), accum_ht->unsupport_mcs,
+                      delta_ht->unsupport_mcs, max_ht->unsupport_mcs);
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
+
+ssize_t
+il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,
+                           size_t count, loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        int pos = 0;
+        char *buf;
+        int bufsz = (sizeof(struct stats_tx) * 48) + 250;
+        ssize_t ret;
+        struct stats_tx *tx, *accum_tx, *delta_tx, *max_tx;
+
+        if (!il_is_alive(il))
+                return -EAGAIN;
+
+        buf = kzalloc(bufsz, GFP_KERNEL);
+        if (!buf) {
+                IL_ERR("Can not allocate Buffer\n");
+                return -ENOMEM;
+        }
+
+        /* the statistic information display here is based on
+         * the last stats notification from uCode
+         * might not reflect the current uCode activity
+         */
+        tx = &il->_4965.stats.tx;
+        accum_tx = &il->_4965.accum_stats.tx;
+        delta_tx = &il->_4965.delta_stats.tx;
+        max_tx = &il->_4965.max_delta.tx;
+
+        pos += il4965_stats_flag(il, buf, bufsz);
+        pos += scnprintf(buf + pos, bufsz - pos, fmt_header, "Statistics_Tx:");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "preamble:",
+                      le32_to_cpu(tx->preamble_cnt), accum_tx->preamble_cnt,
+                      delta_tx->preamble_cnt, max_tx->preamble_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "rx_detected_cnt:",
+                      le32_to_cpu(tx->rx_detected_cnt),
+                      accum_tx->rx_detected_cnt, delta_tx->rx_detected_cnt,
+                      max_tx->rx_detected_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "bt_prio_defer_cnt:",
+                      le32_to_cpu(tx->bt_prio_defer_cnt),
+                      accum_tx->bt_prio_defer_cnt, delta_tx->bt_prio_defer_cnt,
+                      max_tx->bt_prio_defer_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "bt_prio_kill_cnt:",
+                      le32_to_cpu(tx->bt_prio_kill_cnt),
+                      accum_tx->bt_prio_kill_cnt, delta_tx->bt_prio_kill_cnt,
+                      max_tx->bt_prio_kill_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "few_bytes_cnt:",
+                      le32_to_cpu(tx->few_bytes_cnt), accum_tx->few_bytes_cnt,
+                      delta_tx->few_bytes_cnt, max_tx->few_bytes_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "cts_timeout:",
+                      le32_to_cpu(tx->cts_timeout), accum_tx->cts_timeout,
+                      delta_tx->cts_timeout, max_tx->cts_timeout);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "ack_timeout:",
+                      le32_to_cpu(tx->ack_timeout), accum_tx->ack_timeout,
+                      delta_tx->ack_timeout, max_tx->ack_timeout);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "expected_ack_cnt:",
+                      le32_to_cpu(tx->expected_ack_cnt),
+                      accum_tx->expected_ack_cnt, delta_tx->expected_ack_cnt,
+                      max_tx->expected_ack_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "actual_ack_cnt:",
+                      le32_to_cpu(tx->actual_ack_cnt), accum_tx->actual_ack_cnt,
+                      delta_tx->actual_ack_cnt, max_tx->actual_ack_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "dump_msdu_cnt:",
+                      le32_to_cpu(tx->dump_msdu_cnt), accum_tx->dump_msdu_cnt,
+                      delta_tx->dump_msdu_cnt, max_tx->dump_msdu_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "abort_nxt_frame_mismatch:",
+                      le32_to_cpu(tx->burst_abort_next_frame_mismatch_cnt),
+                      accum_tx->burst_abort_next_frame_mismatch_cnt,
+                      delta_tx->burst_abort_next_frame_mismatch_cnt,
+                      max_tx->burst_abort_next_frame_mismatch_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "abort_missing_nxt_frame:",
+                      le32_to_cpu(tx->burst_abort_missing_next_frame_cnt),
+                      accum_tx->burst_abort_missing_next_frame_cnt,
+                      delta_tx->burst_abort_missing_next_frame_cnt,
+                      max_tx->burst_abort_missing_next_frame_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "cts_timeout_collision:",
+                      le32_to_cpu(tx->cts_timeout_collision),
+                      accum_tx->cts_timeout_collision,
+                      delta_tx->cts_timeout_collision,
+                      max_tx->cts_timeout_collision);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "ack_ba_timeout_collision:",
+                      le32_to_cpu(tx->ack_or_ba_timeout_collision),
+                      accum_tx->ack_or_ba_timeout_collision,
+                      delta_tx->ack_or_ba_timeout_collision,
+                      max_tx->ack_or_ba_timeout_collision);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "agg ba_timeout:",
+                      le32_to_cpu(tx->agg.ba_timeout), accum_tx->agg.ba_timeout,
+                      delta_tx->agg.ba_timeout, max_tx->agg.ba_timeout);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "agg ba_resched_frames:",
+                      le32_to_cpu(tx->agg.ba_reschedule_frames),
+                      accum_tx->agg.ba_reschedule_frames,
+                      delta_tx->agg.ba_reschedule_frames,
+                      max_tx->agg.ba_reschedule_frames);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "agg scd_query_agg_frame:",
+                      le32_to_cpu(tx->agg.scd_query_agg_frame_cnt),
+                      accum_tx->agg.scd_query_agg_frame_cnt,
+                      delta_tx->agg.scd_query_agg_frame_cnt,
+                      max_tx->agg.scd_query_agg_frame_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "agg scd_query_no_agg:",
+                      le32_to_cpu(tx->agg.scd_query_no_agg),
+                      accum_tx->agg.scd_query_no_agg,
+                      delta_tx->agg.scd_query_no_agg,
+                      max_tx->agg.scd_query_no_agg);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "agg scd_query_agg:",
+                      le32_to_cpu(tx->agg.scd_query_agg),
+                      accum_tx->agg.scd_query_agg, delta_tx->agg.scd_query_agg,
+                      max_tx->agg.scd_query_agg);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "agg scd_query_mismatch:",
+                      le32_to_cpu(tx->agg.scd_query_mismatch),
+                      accum_tx->agg.scd_query_mismatch,
+                      delta_tx->agg.scd_query_mismatch,
+                      max_tx->agg.scd_query_mismatch);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "agg frame_not_ready:",
+                      le32_to_cpu(tx->agg.frame_not_ready),
+                      accum_tx->agg.frame_not_ready,
+                      delta_tx->agg.frame_not_ready,
+                      max_tx->agg.frame_not_ready);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "agg underrun:",
+                      le32_to_cpu(tx->agg.underrun), accum_tx->agg.underrun,
+                      delta_tx->agg.underrun, max_tx->agg.underrun);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "agg bt_prio_kill:",
+                      le32_to_cpu(tx->agg.bt_prio_kill),
+                      accum_tx->agg.bt_prio_kill, delta_tx->agg.bt_prio_kill,
+                      max_tx->agg.bt_prio_kill);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "agg rx_ba_rsp_cnt:",
+                      le32_to_cpu(tx->agg.rx_ba_rsp_cnt),
+                      accum_tx->agg.rx_ba_rsp_cnt, delta_tx->agg.rx_ba_rsp_cnt,
+                      max_tx->agg.rx_ba_rsp_cnt);
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
+
+ssize_t
+il4965_ucode_general_stats_read(struct file *file, char __user *user_buf,
+                                size_t count, loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        int pos = 0;
+        char *buf;
+        int bufsz = sizeof(struct stats_general) * 10 + 300;
+        ssize_t ret;
+        struct stats_general_common *general, *accum_general;
+        struct stats_general_common *delta_general, *max_general;
+        struct stats_dbg *dbg, *accum_dbg, *delta_dbg, *max_dbg;
+        struct stats_div *div, *accum_div, *delta_div, *max_div;
+
+        if (!il_is_alive(il))
+                return -EAGAIN;
+
+        buf = kzalloc(bufsz, GFP_KERNEL);
+        if (!buf) {
+                IL_ERR("Can not allocate Buffer\n");
+                return -ENOMEM;
+        }
+
+        /* the statistic information display here is based on
+         * the last stats notification from uCode
+         * might not reflect the current uCode activity
+         */
+        general = &il->_4965.stats.general.common;
+        dbg = &il->_4965.stats.general.common.dbg;
+        div = &il->_4965.stats.general.common.div;
+        accum_general = &il->_4965.accum_stats.general.common;
+        accum_dbg = &il->_4965.accum_stats.general.common.dbg;
+        accum_div = &il->_4965.accum_stats.general.common.div;
+        delta_general = &il->_4965.delta_stats.general.common;
+        max_general = &il->_4965.max_delta.general.common;
+        delta_dbg = &il->_4965.delta_stats.general.common.dbg;
+        max_dbg = &il->_4965.max_delta.general.common.dbg;
+        delta_div = &il->_4965.delta_stats.general.common.div;
+        max_div = &il->_4965.max_delta.general.common.div;
+
+        pos += il4965_stats_flag(il, buf, bufsz);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_header,
+                      "Statistics_General:");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_value, "temperature:",
+                      le32_to_cpu(general->temperature));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_value, "ttl_timestamp:",
+                      le32_to_cpu(general->ttl_timestamp));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "burst_check:",
+                      le32_to_cpu(dbg->burst_check), accum_dbg->burst_check,
+                      delta_dbg->burst_check, max_dbg->burst_check);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "burst_count:",
+                      le32_to_cpu(dbg->burst_count), accum_dbg->burst_count,
+                      delta_dbg->burst_count, max_dbg->burst_count);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table,
+                      "wait_for_silence_timeout_count:",
+                      le32_to_cpu(dbg->wait_for_silence_timeout_cnt),
+                      accum_dbg->wait_for_silence_timeout_cnt,
+                      delta_dbg->wait_for_silence_timeout_cnt,
+                      max_dbg->wait_for_silence_timeout_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "sleep_time:",
+                      le32_to_cpu(general->sleep_time),
+                      accum_general->sleep_time, delta_general->sleep_time,
+                      max_general->sleep_time);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "slots_out:",
+                      le32_to_cpu(general->slots_out), accum_general->slots_out,
+                      delta_general->slots_out, max_general->slots_out);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "slots_idle:",
+                      le32_to_cpu(general->slots_idle),
+                      accum_general->slots_idle, delta_general->slots_idle,
+                      max_general->slots_idle);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "tx_on_a:",
+                      le32_to_cpu(div->tx_on_a), accum_div->tx_on_a,
+                      delta_div->tx_on_a, max_div->tx_on_a);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "tx_on_b:",
+                      le32_to_cpu(div->tx_on_b), accum_div->tx_on_b,
+                      delta_div->tx_on_b, max_div->tx_on_b);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "exec_time:",
+                      le32_to_cpu(div->exec_time), accum_div->exec_time,
+                      delta_div->exec_time, max_div->exec_time);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "probe_time:",
+                      le32_to_cpu(div->probe_time), accum_div->probe_time,
+                      delta_div->probe_time, max_div->probe_time);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "rx_enable_counter:",
+                      le32_to_cpu(general->rx_enable_counter),
+                      accum_general->rx_enable_counter,
+                      delta_general->rx_enable_counter,
+                      max_general->rx_enable_counter);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, fmt_table, "num_of_sos_states:",
+                      le32_to_cpu(general->num_of_sos_states),
+                      accum_general->num_of_sos_states,
+                      delta_general->num_of_sos_states,
+                      max_general->num_of_sos_states);
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
new file mode 100644
index 000000000000..4aaef4135564
--- /dev/null
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -0,0 +1,6536 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2003 - 2011 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:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/pci-aspm.h>
+#include <linux/slab.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/firmware.h>
+#include <linux/etherdevice.h>
+#include <linux/if_arp.h>
+
+#include <net/mac80211.h>
+
+#include <asm/div64.h>
+
+#define DRV_NAME        "iwl4965"
+
+#include "common.h"
+#include "4965.h"
+
+/******************************************************************************
+ *
+ * module boiler plate
+ *
+ ******************************************************************************/
+
+/*
+ * module name, copyright, version, etc.
+ */
+#define DRV_DESCRIPTION "Intel(R) Wireless WiFi 4965 driver for Linux"
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+#define VD "d"
+#else
+#define VD
+#endif
+
+#define DRV_VERSION     IWLWIFI_VERSION VD
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("iwl4965");
+
+void
+il4965_check_abort_status(struct il_priv *il, u8 frame_count, u32 status)
+{
+        if (frame_count == 1 && status == TX_STATUS_FAIL_RFKILL_FLUSH) {
+                IL_ERR("Tx flush command to flush out all frames\n");
+                if (!test_bit(S_EXIT_PENDING, &il->status))
+                        queue_work(il->workqueue, &il->tx_flush);
+        }
+}
+
+/*
+ * EEPROM
+ */
+struct il_mod_params il4965_mod_params = {
+        .amsdu_size_8K = 1,
+        .restart_fw = 1,
+        /* the rest are 0 by default */
+};
+
+void
+il4965_rx_queue_reset(struct il_priv *il, struct il_rx_queue *rxq)
+{
+        unsigned long flags;
+        int i;
+        spin_lock_irqsave(&rxq->lock, flags);
+        INIT_LIST_HEAD(&rxq->rx_free);
+        INIT_LIST_HEAD(&rxq->rx_used);
+        /* Fill the rx_used queue with _all_ of the Rx buffers */
+        for (i = 0; i < RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++) {
+                /* In the reset function, these buffers may have been allocated
+                 * to an SKB, so we need to unmap and free potential storage */
+                if (rxq->pool[i].page != NULL) {
+                        pci_unmap_page(il->pci_dev, rxq->pool[i].page_dma,
+                                       PAGE_SIZE << il->hw_params.rx_page_order,
+                                       PCI_DMA_FROMDEVICE);
+                        __il_free_pages(il, rxq->pool[i].page);
+                        rxq->pool[i].page = NULL;
+                }
+                list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
+        }
+
+        for (i = 0; i < RX_QUEUE_SIZE; i++)
+                rxq->queue[i] = NULL;
+
+        /* Set us so that we have processed and used all buffers, but have
+         * not restocked the Rx queue with fresh buffers */
+        rxq->read = rxq->write = 0;
+        rxq->write_actual = 0;
+        rxq->free_count = 0;
+        spin_unlock_irqrestore(&rxq->lock, flags);
+}
+
+int
+il4965_rx_init(struct il_priv *il, struct il_rx_queue *rxq)
+{
+        u32 rb_size;
+        const u32 rfdnlog = RX_QUEUE_SIZE_LOG;  /* 256 RBDs */
+        u32 rb_timeout = 0;
+
+        if (il->cfg->mod_params->amsdu_size_8K)
+                rb_size = FH49_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_8K;
+        else
+                rb_size = FH49_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K;
+
+        /* Stop Rx DMA */
+        il_wr(il, FH49_MEM_RCSR_CHNL0_CONFIG_REG, 0);
+
+        /* Reset driver's Rx queue write idx */
+        il_wr(il, FH49_RSCSR_CHNL0_RBDCB_WPTR_REG, 0);
+
+        /* Tell device where to find RBD circular buffer in DRAM */
+        il_wr(il, FH49_RSCSR_CHNL0_RBDCB_BASE_REG, (u32) (rxq->bd_dma >> 8));
+
+        /* Tell device where in DRAM to update its Rx status */
+        il_wr(il, FH49_RSCSR_CHNL0_STTS_WPTR_REG, rxq->rb_stts_dma >> 4);
+
+        /* Enable Rx DMA
+         * Direct rx interrupts to hosts
+         * Rx buffer size 4 or 8k
+         * RB timeout 0x10
+         * 256 RBDs
+         */
+        il_wr(il, FH49_MEM_RCSR_CHNL0_CONFIG_REG,
+              FH49_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL |
+              FH49_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL |
+              FH49_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME_MSK |
+              rb_size |
+              (rb_timeout << FH49_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS) |
+              (rfdnlog << FH49_RCSR_RX_CONFIG_RBDCB_SIZE_POS));
+
+        /* Set interrupt coalescing timer to default (2048 usecs) */
+        il_write8(il, CSR_INT_COALESCING, IL_HOST_INT_TIMEOUT_DEF);
+
+        return 0;
+}
+
+static void
+il4965_set_pwr_vmain(struct il_priv *il)
+{
+/*
+ * (for documentation purposes)
+ * to set power to V_AUX, do:
+
+                if (pci_pme_capable(il->pci_dev, PCI_D3cold))
+                        il_set_bits_mask_prph(il, APMG_PS_CTRL_REG,
+                                               APMG_PS_CTRL_VAL_PWR_SRC_VAUX,
+                                               ~APMG_PS_CTRL_MSK_PWR_SRC);
+ */
+
+        il_set_bits_mask_prph(il, APMG_PS_CTRL_REG,
+                              APMG_PS_CTRL_VAL_PWR_SRC_VMAIN,
+                              ~APMG_PS_CTRL_MSK_PWR_SRC);
+}
+
+int
+il4965_hw_nic_init(struct il_priv *il)
+{
+        unsigned long flags;
+        struct il_rx_queue *rxq = &il->rxq;
+        int ret;
+
+        /* nic_init */
+        spin_lock_irqsave(&il->lock, flags);
+        il->cfg->ops->lib->apm_ops.init(il);
+
+        /* Set interrupt coalescing calibration timer to default (512 usecs) */
+        il_write8(il, CSR_INT_COALESCING, IL_HOST_INT_CALIB_TIMEOUT_DEF);
+
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        il4965_set_pwr_vmain(il);
+
+        il->cfg->ops->lib->apm_ops.config(il);
+
+        /* Allocate the RX queue, or reset if it is already allocated */
+        if (!rxq->bd) {
+                ret = il_rx_queue_alloc(il);
+                if (ret) {
+                        IL_ERR("Unable to initialize Rx queue\n");
+                        return -ENOMEM;
+                }
+        } else
+                il4965_rx_queue_reset(il, rxq);
+
+        il4965_rx_replenish(il);
+
+        il4965_rx_init(il, rxq);
+
+        spin_lock_irqsave(&il->lock, flags);
+
+        rxq->need_update = 1;
+        il_rx_queue_update_write_ptr(il, rxq);
+
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        /* Allocate or reset and init all Tx and Command queues */
+        if (!il->txq) {
+                ret = il4965_txq_ctx_alloc(il);
+                if (ret)
+                        return ret;
+        } else
+                il4965_txq_ctx_reset(il);
+
+        set_bit(S_INIT, &il->status);
+
+        return 0;
+}
+
+/**
+ * il4965_dma_addr2rbd_ptr - convert a DMA address to a uCode read buffer ptr
+ */
+static inline __le32
+il4965_dma_addr2rbd_ptr(struct il_priv *il, dma_addr_t dma_addr)
+{
+        return cpu_to_le32((u32) (dma_addr >> 8));
+}
+
+/**
+ * il4965_rx_queue_restock - refill RX queue from pre-allocated pool
+ *
+ * If there are slots in the RX queue that need to be restocked,
+ * and we have free pre-allocated buffers, fill the ranks as much
+ * as we can, pulling from rx_free.
+ *
+ * This moves the 'write' idx forward to catch up with 'processed', and
+ * also updates the memory address in the firmware to reference the new
+ * target buffer.
+ */
+void
+il4965_rx_queue_restock(struct il_priv *il)
+{
+        struct il_rx_queue *rxq = &il->rxq;
+        struct list_head *element;
+        struct il_rx_buf *rxb;
+        unsigned long flags;
+
+        spin_lock_irqsave(&rxq->lock, flags);
+        while (il_rx_queue_space(rxq) > 0 && rxq->free_count) {
+                /* The overwritten rxb must be a used one */
+                rxb = rxq->queue[rxq->write];
+                BUG_ON(rxb && rxb->page);
+
+                /* Get next free Rx buffer, remove from free list */
+                element = rxq->rx_free.next;
+                rxb = list_entry(element, struct il_rx_buf, list);
+                list_del(element);
+
+                /* Point to Rx buffer via next RBD in circular buffer */
+                rxq->bd[rxq->write] =
+                    il4965_dma_addr2rbd_ptr(il, rxb->page_dma);
+                rxq->queue[rxq->write] = rxb;
+                rxq->write = (rxq->write + 1) & RX_QUEUE_MASK;
+                rxq->free_count--;
+        }
+        spin_unlock_irqrestore(&rxq->lock, flags);
+        /* If the pre-allocated buffer pool is dropping low, schedule to
+         * refill it */
+        if (rxq->free_count <= RX_LOW_WATERMARK)
+                queue_work(il->workqueue, &il->rx_replenish);
+
+        /* If we've added more space for the firmware to place data, tell it.
+         * Increment device's write pointer in multiples of 8. */
+        if (rxq->write_actual != (rxq->write & ~0x7)) {
+                spin_lock_irqsave(&rxq->lock, flags);
+                rxq->need_update = 1;
+                spin_unlock_irqrestore(&rxq->lock, flags);
+                il_rx_queue_update_write_ptr(il, rxq);
+        }
+}
+
+/**
+ * il4965_rx_replenish - Move all used packet from rx_used to rx_free
+ *
+ * When moving to rx_free an SKB is allocated for the slot.
+ *
+ * Also restock the Rx queue via il_rx_queue_restock.
+ * This is called as a scheduled work item (except for during initialization)
+ */
+static void
+il4965_rx_allocate(struct il_priv *il, gfp_t priority)
+{
+        struct il_rx_queue *rxq = &il->rxq;
+        struct list_head *element;
+        struct il_rx_buf *rxb;
+        struct page *page;
+        unsigned long flags;
+        gfp_t gfp_mask = priority;
+
+        while (1) {
+                spin_lock_irqsave(&rxq->lock, flags);
+                if (list_empty(&rxq->rx_used)) {
+                        spin_unlock_irqrestore(&rxq->lock, flags);
+                        return;
+                }
+                spin_unlock_irqrestore(&rxq->lock, flags);
+
+                if (rxq->free_count > RX_LOW_WATERMARK)
+                        gfp_mask |= __GFP_NOWARN;
+
+                if (il->hw_params.rx_page_order > 0)
+                        gfp_mask |= __GFP_COMP;
+
+                /* Alloc a new receive buffer */
+                page = alloc_pages(gfp_mask, il->hw_params.rx_page_order);
+                if (!page) {
+                        if (net_ratelimit())
+                                D_INFO("alloc_pages failed, " "order: %d\n",
+                                       il->hw_params.rx_page_order);
+
+                        if (rxq->free_count <= RX_LOW_WATERMARK &&
+                            net_ratelimit())
+                                IL_ERR("Failed to alloc_pages with %s. "
+                                       "Only %u free buffers remaining.\n",
+                                       priority ==
+                                       GFP_ATOMIC ? "GFP_ATOMIC" : "GFP_KERNEL",
+                                       rxq->free_count);
+                        /* We don't reschedule replenish work here -- we will
+                         * call the restock method and if it still needs
+                         * more buffers it will schedule replenish */
+                        return;
+                }
+
+                spin_lock_irqsave(&rxq->lock, flags);
+
+                if (list_empty(&rxq->rx_used)) {
+                        spin_unlock_irqrestore(&rxq->lock, flags);
+                        __free_pages(page, il->hw_params.rx_page_order);
+                        return;
+                }
+                element = rxq->rx_used.next;
+                rxb = list_entry(element, struct il_rx_buf, list);
+                list_del(element);
+
+                spin_unlock_irqrestore(&rxq->lock, flags);
+
+                BUG_ON(rxb->page);
+                rxb->page = page;
+                /* Get physical address of the RB */
+                rxb->page_dma =
+                    pci_map_page(il->pci_dev, page, 0,
+                                 PAGE_SIZE << il->hw_params.rx_page_order,
+                                 PCI_DMA_FROMDEVICE);
+                /* dma address must be no more than 36 bits */
+                BUG_ON(rxb->page_dma & ~DMA_BIT_MASK(36));
+                /* and also 256 byte aligned! */
+                BUG_ON(rxb->page_dma & DMA_BIT_MASK(8));
+
+                spin_lock_irqsave(&rxq->lock, flags);
+
+                list_add_tail(&rxb->list, &rxq->rx_free);
+                rxq->free_count++;
+                il->alloc_rxb_page++;
+
+                spin_unlock_irqrestore(&rxq->lock, flags);
+        }
+}
+
+void
+il4965_rx_replenish(struct il_priv *il)
+{
+        unsigned long flags;
+
+        il4965_rx_allocate(il, GFP_KERNEL);
+
+        spin_lock_irqsave(&il->lock, flags);
+        il4965_rx_queue_restock(il);
+        spin_unlock_irqrestore(&il->lock, flags);
+}
+
+void
+il4965_rx_replenish_now(struct il_priv *il)
+{
+        il4965_rx_allocate(il, GFP_ATOMIC);
+
+        il4965_rx_queue_restock(il);
+}
+
+/* Assumes that the skb field of the buffers in 'pool' is kept accurate.
+ * If an SKB has been detached, the POOL needs to have its SKB set to NULL
+ * This free routine walks the list of POOL entries and if SKB is set to
+ * non NULL it is unmapped and freed
+ */
+void
+il4965_rx_queue_free(struct il_priv *il, struct il_rx_queue *rxq)
+{
+        int i;
+        for (i = 0; i < RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {
+                if (rxq->pool[i].page != NULL) {
+                        pci_unmap_page(il->pci_dev, rxq->pool[i].page_dma,
+                                       PAGE_SIZE << il->hw_params.rx_page_order,
+                                       PCI_DMA_FROMDEVICE);
+                        __il_free_pages(il, rxq->pool[i].page);
+                        rxq->pool[i].page = NULL;
+                }
+        }
+
+        dma_free_coherent(&il->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,
+                          rxq->bd_dma);
+        dma_free_coherent(&il->pci_dev->dev, sizeof(struct il_rb_status),
+                          rxq->rb_stts, rxq->rb_stts_dma);
+        rxq->bd = NULL;
+        rxq->rb_stts = NULL;
+}
+
+int
+il4965_rxq_stop(struct il_priv *il)
+{
+
+        /* stop Rx DMA */
+        il_wr(il, FH49_MEM_RCSR_CHNL0_CONFIG_REG, 0);
+        il_poll_bit(il, FH49_MEM_RSSR_RX_STATUS_REG,
+                    FH49_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000);
+
+        return 0;
+}
+
+int
+il4965_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band)
+{
+        int idx = 0;
+        int band_offset = 0;
+
+        /* HT rate format: mac80211 wants an MCS number, which is just LSB */
+        if (rate_n_flags & RATE_MCS_HT_MSK) {
+                idx = (rate_n_flags & 0xff);
+                return idx;
+                /* Legacy rate format, search for match in table */
+        } else {
+                if (band == IEEE80211_BAND_5GHZ)
+                        band_offset = IL_FIRST_OFDM_RATE;
+                for (idx = band_offset; idx < RATE_COUNT_LEGACY; idx++)
+                        if (il_rates[idx].plcp == (rate_n_flags & 0xFF))
+                                return idx - band_offset;
+        }
+
+        return -1;
+}
+
+static int
+il4965_calc_rssi(struct il_priv *il, struct il_rx_phy_res *rx_resp)
+{
+        /* data from PHY/DSP regarding signal strength, etc.,
+         *   contents are always there, not configurable by host.  */
+        struct il4965_rx_non_cfg_phy *ncphy =
+            (struct il4965_rx_non_cfg_phy *)rx_resp->non_cfg_phy_buf;
+        u32 agc =
+            (le16_to_cpu(ncphy->agc_info) & IL49_AGC_DB_MASK) >>
+            IL49_AGC_DB_POS;
+
+        u32 valid_antennae =
+            (le16_to_cpu(rx_resp->phy_flags) & IL49_RX_PHY_FLAGS_ANTENNAE_MASK)
+            >> IL49_RX_PHY_FLAGS_ANTENNAE_OFFSET;
+        u8 max_rssi = 0;
+        u32 i;
+
+        /* Find max rssi among 3 possible receivers.
+         * These values are measured by the digital signal processor (DSP).
+         * They should stay fairly constant even as the signal strength varies,
+         *   if the radio's automatic gain control (AGC) is working right.
+         * AGC value (see below) will provide the "interesting" info. */
+        for (i = 0; i < 3; i++)
+                if (valid_antennae & (1 << i))
+                        max_rssi = max(ncphy->rssi_info[i << 1], max_rssi);
+
+        D_STATS("Rssi In A %d B %d C %d Max %d AGC dB %d\n",
+                ncphy->rssi_info[0], ncphy->rssi_info[2], ncphy->rssi_info[4],
+                max_rssi, agc);
+
+        /* dBm = max_rssi dB - agc dB - constant.
+         * Higher AGC (higher radio gain) means lower signal. */
+        return max_rssi - agc - IL4965_RSSI_OFFSET;
+}
+
+static u32
+il4965_translate_rx_status(struct il_priv *il, 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;
+        }
+
+        D_RX("decrypt_in:0x%x  decrypt_out = 0x%x\n", decrypt_in, decrypt_out);
+
+        return decrypt_out;
+}
+
+static void
+il4965_pass_packet_to_mac80211(struct il_priv *il, struct ieee80211_hdr *hdr,
+                               u16 len, u32 ampdu_status, struct il_rx_buf *rxb,
+                               struct ieee80211_rx_status *stats)
+{
+        struct sk_buff *skb;
+        __le16 fc = hdr->frame_control;
+
+        /* We only process data packets if the interface is open */
+        if (unlikely(!il->is_open)) {
+                D_DROP("Dropping packet while interface is not open.\n");
+                return;
+        }
+
+        /* In case of HW accelerated crypto and bad decryption, drop */
+        if (!il->cfg->mod_params->sw_crypto &&
+            il_set_decrypted_flag(il, hdr, ampdu_status, stats))
+                return;
+
+        skb = dev_alloc_skb(128);
+        if (!skb) {
+                IL_ERR("dev_alloc_skb failed\n");
+                return;
+        }
+
+        skb_add_rx_frag(skb, 0, rxb->page, (void *)hdr - rxb_addr(rxb), len);
+
+        il_update_stats(il, false, fc, len);
+        memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats));
+
+        ieee80211_rx(il->hw, skb);
+        il->alloc_rxb_page--;
+        rxb->page = NULL;
+}
+
+/* Called for N_RX (legacy ABG frames), or
+ * N_RX_MPDU (HT high-throughput N frames). */
+void
+il4965_hdl_rx(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct ieee80211_hdr *header;
+        struct ieee80211_rx_status rx_status;
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct il_rx_phy_res *phy_res;
+        __le32 rx_pkt_status;
+        struct il_rx_mpdu_res_start *amsdu;
+        u32 len;
+        u32 ampdu_status;
+        u32 rate_n_flags;
+
+        /**
+         * N_RX and N_RX_MPDU are handled differently.
+         *      N_RX: physical layer info is in this buffer
+         *      N_RX_MPDU: physical layer info was sent in separate
+         *              command and cached in il->last_phy_res
+         *
+         * Here we set up local variables depending on which command is
+         * received.
+         */
+        if (pkt->hdr.cmd == N_RX) {
+                phy_res = (struct il_rx_phy_res *)pkt->u.raw;
+                header =
+                    (struct ieee80211_hdr *)(pkt->u.raw + sizeof(*phy_res) +
+                                             phy_res->cfg_phy_cnt);
+
+                len = le16_to_cpu(phy_res->byte_count);
+                rx_pkt_status =
+                    *(__le32 *) (pkt->u.raw + sizeof(*phy_res) +
+                                 phy_res->cfg_phy_cnt + len);
+                ampdu_status = le32_to_cpu(rx_pkt_status);
+        } else {
+                if (!il->_4965.last_phy_res_valid) {
+                        IL_ERR("MPDU frame without cached PHY data\n");
+                        return;
+                }
+                phy_res = &il->_4965.last_phy_res;
+                amsdu = (struct il_rx_mpdu_res_start *)pkt->u.raw;
+                header = (struct ieee80211_hdr *)(pkt->u.raw + sizeof(*amsdu));
+                len = le16_to_cpu(amsdu->byte_count);
+                rx_pkt_status = *(__le32 *) (pkt->u.raw + sizeof(*amsdu) + len);
+                ampdu_status =
+                    il4965_translate_rx_status(il, le32_to_cpu(rx_pkt_status));
+        }
+
+        if ((unlikely(phy_res->cfg_phy_cnt > 20))) {
+                D_DROP("dsp size out of range [0,20]: %d/n",
+                       phy_res->cfg_phy_cnt);
+                return;
+        }
+
+        if (!(rx_pkt_status & RX_RES_STATUS_NO_CRC32_ERROR) ||
+            !(rx_pkt_status & RX_RES_STATUS_NO_RXE_OVERFLOW)) {
+                D_RX("Bad CRC or FIFO: 0x%08X.\n", le32_to_cpu(rx_pkt_status));
+                return;
+        }
+
+        /* This will be used in several places later */
+        rate_n_flags = le32_to_cpu(phy_res->rate_n_flags);
+
+        /* rx_status carries information about the packet to mac80211 */
+        rx_status.mactime = le64_to_cpu(phy_res->timestamp);
+        rx_status.band =
+            (phy_res->
+             phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK) ? IEEE80211_BAND_2GHZ :
+            IEEE80211_BAND_5GHZ;
+        rx_status.freq =
+            ieee80211_channel_to_frequency(le16_to_cpu(phy_res->channel),
+                                           rx_status.band);
+        rx_status.rate_idx =
+            il4965_hwrate_to_mac80211_idx(rate_n_flags, rx_status.band);
+        rx_status.flag = 0;
+
+        /* TSF isn't reliable. In order to allow smooth user experience,
+         * this W/A doesn't propagate it to the mac80211 */
+        /*rx_status.flag |= RX_FLAG_MACTIME_MPDU; */
+
+        il->ucode_beacon_time = le32_to_cpu(phy_res->beacon_time_stamp);
+
+        /* Find max signal strength (dBm) among 3 antenna/receiver chains */
+        rx_status.signal = il4965_calc_rssi(il, phy_res);
+
+        il_dbg_log_rx_data_frame(il, len, header);
+        D_STATS("Rssi %d, TSF %llu\n", rx_status.signal,
+                (unsigned long long)rx_status.mactime);
+
+        /*
+         * "antenna number"
+         *
+         * It seems that the antenna field in the phy flags value
+         * is actually a bit field. This is undefined by radiotap,
+         * it wants an actual antenna number but I always get "7"
+         * for most legacy frames I receive indicating that the
+         * same frame was received on all three RX chains.
+         *
+         * I think this field should be removed in favor of a
+         * new 802.11n radiotap field "RX chains" that is defined
+         * as a bitmask.
+         */
+        rx_status.antenna =
+            (le16_to_cpu(phy_res->phy_flags) & RX_RES_PHY_FLAGS_ANTENNA_MSK) >>
+            RX_RES_PHY_FLAGS_ANTENNA_POS;
+
+        /* set the preamble flag if appropriate */
+        if (phy_res->phy_flags & RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)
+                rx_status.flag |= RX_FLAG_SHORTPRE;
+
+        /* Set up the HT phy flags */
+        if (rate_n_flags & RATE_MCS_HT_MSK)
+                rx_status.flag |= RX_FLAG_HT;
+        if (rate_n_flags & RATE_MCS_HT40_MSK)
+                rx_status.flag |= RX_FLAG_40MHZ;
+        if (rate_n_flags & RATE_MCS_SGI_MSK)
+                rx_status.flag |= RX_FLAG_SHORT_GI;
+
+        il4965_pass_packet_to_mac80211(il, header, len, ampdu_status, rxb,
+                                       &rx_status);
+}
+
+/* Cache phy data (Rx signal strength, etc) for HT frame (N_RX_PHY).
+ * This will be used later in il_hdl_rx() for N_RX_MPDU. */
+void
+il4965_hdl_rx_phy(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        il->_4965.last_phy_res_valid = true;
+        memcpy(&il->_4965.last_phy_res, pkt->u.raw,
+               sizeof(struct il_rx_phy_res));
+}
+
+static int
+il4965_get_channels_for_scan(struct il_priv *il, struct ieee80211_vif *vif,
+                             enum ieee80211_band band, u8 is_active,
+                             u8 n_probes, struct il_scan_channel *scan_ch)
+{
+        struct ieee80211_channel *chan;
+        const struct ieee80211_supported_band *sband;
+        const struct il_channel_info *ch_info;
+        u16 passive_dwell = 0;
+        u16 active_dwell = 0;
+        int added, i;
+        u16 channel;
+
+        sband = il_get_hw_mode(il, band);
+        if (!sband)
+                return 0;
+
+        active_dwell = il_get_active_dwell_time(il, band, n_probes);
+        passive_dwell = il_get_passive_dwell_time(il, band, vif);
+
+        if (passive_dwell <= active_dwell)
+                passive_dwell = active_dwell + 1;
+
+        for (i = 0, added = 0; i < il->scan_request->n_channels; i++) {
+                chan = il->scan_request->channels[i];
+
+                if (chan->band != band)
+                        continue;
+
+                channel = chan->hw_value;
+                scan_ch->channel = cpu_to_le16(channel);
+
+                ch_info = il_get_channel_info(il, band, channel);
+                if (!il_is_channel_valid(ch_info)) {
+                        D_SCAN("Channel %d is INVALID for this band.\n",
+                               channel);
+                        continue;
+                }
+
+                if (!is_active || il_is_channel_passive(ch_info) ||
+                    (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))
+                        scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
+                else
+                        scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
+
+                if (n_probes)
+                        scan_ch->type |= IL_SCAN_PROBE_MASK(n_probes);
+
+                scan_ch->active_dwell = cpu_to_le16(active_dwell);
+                scan_ch->passive_dwell = cpu_to_le16(passive_dwell);
+
+                /* Set txpower levels to defaults */
+                scan_ch->dsp_atten = 110;
+
+                /* NOTE: if we were doing 6Mb OFDM for scans we'd use
+                 * power level:
+                 * scan_ch->tx_gain = ((1 << 5) | (2 << 3)) | 3;
+                 */
+                if (band == IEEE80211_BAND_5GHZ)
+                        scan_ch->tx_gain = ((1 << 5) | (3 << 3)) | 3;
+                else
+                        scan_ch->tx_gain = ((1 << 5) | (5 << 3));
+
+                D_SCAN("Scanning ch=%d prob=0x%X [%s %d]\n", channel,
+                       le32_to_cpu(scan_ch->type),
+                       (scan_ch->
+                        type & SCAN_CHANNEL_TYPE_ACTIVE) ? "ACTIVE" : "PASSIVE",
+                       (scan_ch->
+                        type & SCAN_CHANNEL_TYPE_ACTIVE) ? active_dwell :
+                       passive_dwell);
+
+                scan_ch++;
+                added++;
+        }
+
+        D_SCAN("total channels to scan %d\n", added);
+        return added;
+}
+
+static inline u32
+il4965_ant_idx_to_flags(u8 ant_idx)
+{
+        return BIT(ant_idx) << RATE_MCS_ANT_POS;
+}
+
+int
+il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif)
+{
+        struct il_host_cmd cmd = {
+                .id = C_SCAN,
+                .len = sizeof(struct il_scan_cmd),
+                .flags = CMD_SIZE_HUGE,
+        };
+        struct il_scan_cmd *scan;
+        struct il_rxon_context *ctx = &il->ctx;
+        u32 rate_flags = 0;
+        u16 cmd_len;
+        u16 rx_chain = 0;
+        enum ieee80211_band band;
+        u8 n_probes = 0;
+        u8 rx_ant = il->hw_params.valid_rx_ant;
+        u8 rate;
+        bool is_active = false;
+        int chan_mod;
+        u8 active_chains;
+        u8 scan_tx_antennas = il->hw_params.valid_tx_ant;
+        int ret;
+
+        lockdep_assert_held(&il->mutex);
+
+        ctx = il_rxon_ctx_from_vif(vif);
+
+        if (!il->scan_cmd) {
+                il->scan_cmd =
+                    kmalloc(sizeof(struct il_scan_cmd) + IL_MAX_SCAN_SIZE,
+                            GFP_KERNEL);
+                if (!il->scan_cmd) {
+                        D_SCAN("fail to allocate memory for scan\n");
+                        return -ENOMEM;
+                }
+        }
+        scan = il->scan_cmd;
+        memset(scan, 0, sizeof(struct il_scan_cmd) + IL_MAX_SCAN_SIZE);
+
+        scan->quiet_plcp_th = IL_PLCP_QUIET_THRESH;
+        scan->quiet_time = IL_ACTIVE_QUIET_TIME;
+
+        if (il_is_any_associated(il)) {
+                u16 interval;
+                u32 extra;
+                u32 suspend_time = 100;
+                u32 scan_suspend_time = 100;
+
+                D_INFO("Scanning while associated...\n");
+                interval = vif->bss_conf.beacon_int;
+
+                scan->suspend_time = 0;
+                scan->max_out_time = cpu_to_le32(200 * 1024);
+                if (!interval)
+                        interval = suspend_time;
+
+                extra = (suspend_time / interval) << 22;
+                scan_suspend_time =
+                    (extra | ((suspend_time % interval) * 1024));
+                scan->suspend_time = cpu_to_le32(scan_suspend_time);
+                D_SCAN("suspend_time 0x%X beacon interval %d\n",
+                       scan_suspend_time, interval);
+        }
+
+        if (il->scan_request->n_ssids) {
+                int i, p = 0;
+                D_SCAN("Kicking off active scan\n");
+                for (i = 0; i < il->scan_request->n_ssids; i++) {
+                        /* always does wildcard anyway */
+                        if (!il->scan_request->ssids[i].ssid_len)
+                                continue;
+                        scan->direct_scan[p].id = WLAN_EID_SSID;
+                        scan->direct_scan[p].len =
+                            il->scan_request->ssids[i].ssid_len;
+                        memcpy(scan->direct_scan[p].ssid,
+                               il->scan_request->ssids[i].ssid,
+                               il->scan_request->ssids[i].ssid_len);
+                        n_probes++;
+                        p++;
+                }
+                is_active = true;
+        } else
+                D_SCAN("Start passive scan.\n");
+
+        scan->tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK;
+        scan->tx_cmd.sta_id = ctx->bcast_sta_id;
+        scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
+
+        switch (il->scan_band) {
+        case IEEE80211_BAND_2GHZ:
+                scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK;
+                chan_mod =
+                    le32_to_cpu(il->ctx.active.
+                                flags & RXON_FLG_CHANNEL_MODE_MSK) >>
+                    RXON_FLG_CHANNEL_MODE_POS;
+                if (chan_mod == CHANNEL_MODE_PURE_40) {
+                        rate = RATE_6M_PLCP;
+                } else {
+                        rate = RATE_1M_PLCP;
+                        rate_flags = RATE_MCS_CCK_MSK;
+                }
+                break;
+        case IEEE80211_BAND_5GHZ:
+                rate = RATE_6M_PLCP;
+                break;
+        default:
+                IL_WARN("Invalid scan band\n");
+                return -EIO;
+        }
+
+        /*
+         * If active scanning is requested but a certain channel is
+         * marked passive, we can do active scanning if we detect
+         * transmissions.
+         *
+         * There is an issue with some firmware versions that triggers
+         * a sysassert on a "good CRC threshold" of zero (== disabled),
+         * on a radar channel even though this means that we should NOT
+         * send probes.
+         *
+         * The "good CRC threshold" is the number of frames that we
+         * need to receive during our dwell time on a channel before
+         * sending out probes -- setting this to a huge value will
+         * mean we never reach it, but at the same time work around
+         * the aforementioned issue. Thus use IL_GOOD_CRC_TH_NEVER
+         * here instead of IL_GOOD_CRC_TH_DISABLED.
+         */
+        scan->good_CRC_th =
+            is_active ? IL_GOOD_CRC_TH_DEFAULT : IL_GOOD_CRC_TH_NEVER;
+
+        band = il->scan_band;
+
+        if (il->cfg->scan_rx_antennas[band])
+                rx_ant = il->cfg->scan_rx_antennas[band];
+
+        il->scan_tx_ant[band] =
+            il4965_toggle_tx_ant(il, il->scan_tx_ant[band], scan_tx_antennas);
+        rate_flags |= il4965_ant_idx_to_flags(il->scan_tx_ant[band]);
+        scan->tx_cmd.rate_n_flags =
+            il4965_hw_set_rate_n_flags(rate, rate_flags);
+
+        /* In power save mode use one chain, otherwise use all chains */
+        if (test_bit(S_POWER_PMI, &il->status)) {
+                /* rx_ant has been set to all valid chains previously */
+                active_chains =
+                    rx_ant & ((u8) (il->chain_noise_data.active_chains));
+                if (!active_chains)
+                        active_chains = rx_ant;
+
+                D_SCAN("chain_noise_data.active_chains: %u\n",
+                       il->chain_noise_data.active_chains);
+
+                rx_ant = il4965_first_antenna(active_chains);
+        }
+
+        /* MIMO is not used here, but value is required */
+        rx_chain |= il->hw_params.valid_rx_ant << RXON_RX_CHAIN_VALID_POS;
+        rx_chain |= rx_ant << RXON_RX_CHAIN_FORCE_MIMO_SEL_POS;
+        rx_chain |= rx_ant << RXON_RX_CHAIN_FORCE_SEL_POS;
+        rx_chain |= 0x1 << RXON_RX_CHAIN_DRIVER_FORCE_POS;
+        scan->rx_chain = cpu_to_le16(rx_chain);
+
+        cmd_len =
+            il_fill_probe_req(il, (struct ieee80211_mgmt *)scan->data,
+                              vif->addr, il->scan_request->ie,
+                              il->scan_request->ie_len,
+                              IL_MAX_SCAN_SIZE - sizeof(*scan));
+        scan->tx_cmd.len = cpu_to_le16(cmd_len);
+
+        scan->filter_flags |=
+            (RXON_FILTER_ACCEPT_GRP_MSK | RXON_FILTER_BCON_AWARE_MSK);
+
+        scan->channel_count =
+            il4965_get_channels_for_scan(il, vif, band, is_active, n_probes,
+                                         (void *)&scan->data[cmd_len]);
+        if (scan->channel_count == 0) {
+                D_SCAN("channel count %d\n", scan->channel_count);
+                return -EIO;
+        }
+
+        cmd.len +=
+            le16_to_cpu(scan->tx_cmd.len) +
+            scan->channel_count * sizeof(struct il_scan_channel);
+        cmd.data = scan;
+        scan->len = cpu_to_le16(cmd.len);
+
+        set_bit(S_SCAN_HW, &il->status);
+
+        ret = il_send_cmd_sync(il, &cmd);
+        if (ret)
+                clear_bit(S_SCAN_HW, &il->status);
+
+        return ret;
+}
+
+int
+il4965_manage_ibss_station(struct il_priv *il, struct ieee80211_vif *vif,
+                           bool add)
+{
+        struct il_vif_priv *vif_priv = (void *)vif->drv_priv;
+
+        if (add)
+                return il4965_add_bssid_station(il, vif_priv->ctx,
+                                                vif->bss_conf.bssid,
+                                                &vif_priv->ibss_bssid_sta_id);
+        return il_remove_station(il, vif_priv->ibss_bssid_sta_id,
+                                 vif->bss_conf.bssid);
+}
+
+void
+il4965_free_tfds_in_queue(struct il_priv *il, int sta_id, int tid, int freed)
+{
+        lockdep_assert_held(&il->sta_lock);
+
+        if (il->stations[sta_id].tid[tid].tfds_in_queue >= freed)
+                il->stations[sta_id].tid[tid].tfds_in_queue -= freed;
+        else {
+                D_TX("free more than tfds_in_queue (%u:%d)\n",
+                     il->stations[sta_id].tid[tid].tfds_in_queue, freed);
+                il->stations[sta_id].tid[tid].tfds_in_queue = 0;
+        }
+}
+
+#define IL_TX_QUEUE_MSK 0xfffff
+
+static bool
+il4965_is_single_rx_stream(struct il_priv *il)
+{
+        return il->current_ht_config.smps == IEEE80211_SMPS_STATIC ||
+            il->current_ht_config.single_chain_sufficient;
+}
+
+#define IL_NUM_RX_CHAINS_MULTIPLE       3
+#define IL_NUM_RX_CHAINS_SINGLE 2
+#define IL_NUM_IDLE_CHAINS_DUAL 2
+#define IL_NUM_IDLE_CHAINS_SINGLE       1
+
+/*
+ * Determine how many receiver/antenna chains to use.
+ *
+ * More provides better reception via diversity.  Fewer saves power
+ * at the expense of throughput, but only when not in powersave to
+ * start with.
+ *
+ * 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
+il4965_get_active_rx_chain_count(struct il_priv *il)
+{
+        /* # of Rx chains to use when expecting MIMO. */
+        if (il4965_is_single_rx_stream(il))
+                return IL_NUM_RX_CHAINS_SINGLE;
+        else
+                return IL_NUM_RX_CHAINS_MULTIPLE;
+}
+
+/*
+ * When we are in power saving mode, unless device support spatial
+ * multiplexing power save, use the active count for rx chain count.
+ */
+static int
+il4965_get_idle_rx_chain_count(struct il_priv *il, int active_cnt)
+{
+        /* # Rx chains when idling, depending on SMPS mode */
+        switch (il->current_ht_config.smps) {
+        case IEEE80211_SMPS_STATIC:
+        case IEEE80211_SMPS_DYNAMIC:
+                return IL_NUM_IDLE_CHAINS_SINGLE;
+        case IEEE80211_SMPS_OFF:
+                return active_cnt;
+        default:
+                WARN(1, "invalid SMPS mode %d", il->current_ht_config.smps);
+                return active_cnt;
+        }
+}
+
+/* up to 4 chains */
+static u8
+il4965_count_chain_bitmap(u32 chain_bitmap)
+{
+        u8 res;
+        res = (chain_bitmap & BIT(0)) >> 0;
+        res += (chain_bitmap & BIT(1)) >> 1;
+        res += (chain_bitmap & BIT(2)) >> 2;
+        res += (chain_bitmap & BIT(3)) >> 3;
+        return res;
+}
+
+/**
+ * il4965_set_rxon_chain - Set up Rx chain usage in "staging" RXON image
+ *
+ * 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
+il4965_set_rxon_chain(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        bool is_single = il4965_is_single_rx_stream(il);
+        bool is_cam = !test_bit(S_POWER_PMI, &il->status);
+        u8 idle_rx_cnt, active_rx_cnt, valid_rx_cnt;
+        u32 active_chains;
+        u16 rx_chain;
+
+        /* Tell uCode which antennas are actually connected.
+         * Before first association, we assume all antennas are connected.
+         * Just after first association, il4965_chain_noise_calibration()
+         *    checks which antennas actually *are* connected. */
+        if (il->chain_noise_data.active_chains)
+                active_chains = il->chain_noise_data.active_chains;
+        else
+                active_chains = il->hw_params.valid_rx_ant;
+
+        rx_chain = active_chains << RXON_RX_CHAIN_VALID_POS;
+
+        /* How many receivers should we use? */
+        active_rx_cnt = il4965_get_active_rx_chain_count(il);
+        idle_rx_cnt = il4965_get_idle_rx_chain_count(il, active_rx_cnt);
+
+        /* correct rx chain count according hw settings
+         * and chain noise calibration
+         */
+        valid_rx_cnt = il4965_count_chain_bitmap(active_chains);
+        if (valid_rx_cnt < active_rx_cnt)
+                active_rx_cnt = valid_rx_cnt;
+
+        if (valid_rx_cnt < idle_rx_cnt)
+                idle_rx_cnt = valid_rx_cnt;
+
+        rx_chain |= active_rx_cnt << RXON_RX_CHAIN_MIMO_CNT_POS;
+        rx_chain |= idle_rx_cnt << RXON_RX_CHAIN_CNT_POS;
+
+        ctx->staging.rx_chain = cpu_to_le16(rx_chain);
+
+        if (!is_single && active_rx_cnt >= IL_NUM_RX_CHAINS_SINGLE && is_cam)
+                ctx->staging.rx_chain |= RXON_RX_CHAIN_MIMO_FORCE_MSK;
+        else
+                ctx->staging.rx_chain &= ~RXON_RX_CHAIN_MIMO_FORCE_MSK;
+
+        D_ASSOC("rx_chain=0x%X active=%d idle=%d\n", ctx->staging.rx_chain,
+                active_rx_cnt, idle_rx_cnt);
+
+        WARN_ON(active_rx_cnt == 0 || idle_rx_cnt == 0 ||
+                active_rx_cnt < idle_rx_cnt);
+}
+
+u8
+il4965_toggle_tx_ant(struct il_priv *il, u8 ant, u8 valid)
+{
+        int i;
+        u8 ind = ant;
+
+        for (i = 0; i < RATE_ANT_NUM - 1; i++) {
+                ind = (ind + 1) < RATE_ANT_NUM ? ind + 1 : 0;
+                if (valid & BIT(ind))
+                        return ind;
+        }
+        return ant;
+}
+
+static const char *
+il4965_get_fh_string(int cmd)
+{
+        switch (cmd) {
+                IL_CMD(FH49_RSCSR_CHNL0_STTS_WPTR_REG);
+                IL_CMD(FH49_RSCSR_CHNL0_RBDCB_BASE_REG);
+                IL_CMD(FH49_RSCSR_CHNL0_WPTR);
+                IL_CMD(FH49_MEM_RCSR_CHNL0_CONFIG_REG);
+                IL_CMD(FH49_MEM_RSSR_SHARED_CTRL_REG);
+                IL_CMD(FH49_MEM_RSSR_RX_STATUS_REG);
+                IL_CMD(FH49_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV);
+                IL_CMD(FH49_TSSR_TX_STATUS_REG);
+                IL_CMD(FH49_TSSR_TX_ERROR_REG);
+        default:
+                return "UNKNOWN";
+        }
+}
+
+int
+il4965_dump_fh(struct il_priv *il, char **buf, bool display)
+{
+        int i;
+#ifdef CONFIG_IWLEGACY_DEBUG
+        int pos = 0;
+        size_t bufsz = 0;
+#endif
+        static const u32 fh_tbl[] = {
+                FH49_RSCSR_CHNL0_STTS_WPTR_REG,
+                FH49_RSCSR_CHNL0_RBDCB_BASE_REG,
+                FH49_RSCSR_CHNL0_WPTR,
+                FH49_MEM_RCSR_CHNL0_CONFIG_REG,
+                FH49_MEM_RSSR_SHARED_CTRL_REG,
+                FH49_MEM_RSSR_RX_STATUS_REG,
+                FH49_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV,
+                FH49_TSSR_TX_STATUS_REG,
+                FH49_TSSR_TX_ERROR_REG
+        };
+#ifdef CONFIG_IWLEGACY_DEBUG
+        if (display) {
+                bufsz = ARRAY_SIZE(fh_tbl) * 48 + 40;
+                *buf = kmalloc(bufsz, GFP_KERNEL);
+                if (!*buf)
+                        return -ENOMEM;
+                pos +=
+                    scnprintf(*buf + pos, bufsz - pos, "FH register values:\n");
+                for (i = 0; i < ARRAY_SIZE(fh_tbl); i++) {
+                        pos +=
+                            scnprintf(*buf + pos, bufsz - pos,
+                                      "  %34s: 0X%08x\n",
+                                      il4965_get_fh_string(fh_tbl[i]),
+                                      il_rd(il, fh_tbl[i]));
+                }
+                return pos;
+        }
+#endif
+        IL_ERR("FH register values:\n");
+        for (i = 0; i < ARRAY_SIZE(fh_tbl); i++) {
+                IL_ERR("  %34s: 0X%08x\n", il4965_get_fh_string(fh_tbl[i]),
+                       il_rd(il, fh_tbl[i]));
+        }
+        return 0;
+}
+
+void
+il4965_hdl_missed_beacon(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct il_missed_beacon_notif *missed_beacon;
+
+        missed_beacon = &pkt->u.missed_beacon;
+        if (le32_to_cpu(missed_beacon->consecutive_missed_beacons) >
+            il->missed_beacon_threshold) {
+                D_CALIB("missed bcn cnsq %d totl %d rcd %d expctd %d\n",
+                        le32_to_cpu(missed_beacon->consecutive_missed_beacons),
+                        le32_to_cpu(missed_beacon->total_missed_becons),
+                        le32_to_cpu(missed_beacon->num_recvd_beacons),
+                        le32_to_cpu(missed_beacon->num_expected_beacons));
+                if (!test_bit(S_SCANNING, &il->status))
+                        il4965_init_sensitivity(il);
+        }
+}
+
+/* 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
+il4965_rx_calc_noise(struct il_priv *il)
+{
+        struct stats_rx_non_phy *rx_info;
+        int num_active_rx = 0;
+        int total_silence = 0;
+        int bcn_silence_a, bcn_silence_b, bcn_silence_c;
+        int last_rx_noise;
+
+        rx_info = &(il->_4965.stats.rx.general);
+        bcn_silence_a =
+            le32_to_cpu(rx_info->beacon_silence_rssi_a) & IN_BAND_FILTER;
+        bcn_silence_b =
+            le32_to_cpu(rx_info->beacon_silence_rssi_b) & IN_BAND_FILTER;
+        bcn_silence_c =
+            le32_to_cpu(rx_info->beacon_silence_rssi_c) & IN_BAND_FILTER;
+
+        if (bcn_silence_a) {
+                total_silence += bcn_silence_a;
+                num_active_rx++;
+        }
+        if (bcn_silence_b) {
+                total_silence += bcn_silence_b;
+                num_active_rx++;
+        }
+        if (bcn_silence_c) {
+                total_silence += bcn_silence_c;
+                num_active_rx++;
+        }
+
+        /* Average among active antennas */
+        if (num_active_rx)
+                last_rx_noise = (total_silence / num_active_rx) - 107;
+        else
+                last_rx_noise = IL_NOISE_MEAS_NOT_AVAILABLE;
+
+        D_CALIB("inband silence a %u, b %u, c %u, dBm %d\n", bcn_silence_a,
+                bcn_silence_b, bcn_silence_c, last_rx_noise);
+}
+
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+/*
+ *  based on the assumption of all stats counter are in DWORD
+ *  FIXME: This function is for debugging, do not deal with
+ *  the case of counters roll-over.
+ */
+static void
+il4965_accumulative_stats(struct il_priv *il, __le32 * stats)
+{
+        int i, size;
+        __le32 *prev_stats;
+        u32 *accum_stats;
+        u32 *delta, *max_delta;
+        struct stats_general_common *general, *accum_general;
+        struct stats_tx *tx, *accum_tx;
+
+        prev_stats = (__le32 *) &il->_4965.stats;
+        accum_stats = (u32 *) &il->_4965.accum_stats;
+        size = sizeof(struct il_notif_stats);
+        general = &il->_4965.stats.general.common;
+        accum_general = &il->_4965.accum_stats.general.common;
+        tx = &il->_4965.stats.tx;
+        accum_tx = &il->_4965.accum_stats.tx;
+        delta = (u32 *) &il->_4965.delta_stats;
+        max_delta = (u32 *) &il->_4965.max_delta;
+
+        for (i = sizeof(__le32); i < size;
+             i +=
+             sizeof(__le32), stats++, prev_stats++, delta++, max_delta++,
+             accum_stats++) {
+                if (le32_to_cpu(*stats) > le32_to_cpu(*prev_stats)) {
+                        *delta =
+                            (le32_to_cpu(*stats) - le32_to_cpu(*prev_stats));
+                        *accum_stats += *delta;
+                        if (*delta > *max_delta)
+                                *max_delta = *delta;
+                }
+        }
+
+        /* reset accumulative stats for "no-counter" type stats */
+        accum_general->temperature = general->temperature;
+        accum_general->ttl_timestamp = general->ttl_timestamp;
+}
+#endif
+
+#define REG_RECALIB_PERIOD (60)
+
+void
+il4965_hdl_stats(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        int change;
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+
+        D_RX("Statistics notification received (%d vs %d).\n",
+             (int)sizeof(struct il_notif_stats),
+             le32_to_cpu(pkt->len_n_flags) & IL_RX_FRAME_SIZE_MSK);
+
+        change =
+            ((il->_4965.stats.general.common.temperature !=
+              pkt->u.stats.general.common.temperature) ||
+             ((il->_4965.stats.flag & STATS_REPLY_FLG_HT40_MODE_MSK) !=
+              (pkt->u.stats.flag & STATS_REPLY_FLG_HT40_MODE_MSK)));
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+        il4965_accumulative_stats(il, (__le32 *) &pkt->u.stats);
+#endif
+
+        /* TODO: reading some of stats is unneeded */
+        memcpy(&il->_4965.stats, &pkt->u.stats, sizeof(il->_4965.stats));
+
+        set_bit(S_STATS, &il->status);
+
+        /* Reschedule the stats timer to occur in
+         * REG_RECALIB_PERIOD seconds to ensure we get a
+         * thermal update even if the uCode doesn't give
+         * us one */
+        mod_timer(&il->stats_periodic,
+                  jiffies + msecs_to_jiffies(REG_RECALIB_PERIOD * 1000));
+
+        if (unlikely(!test_bit(S_SCANNING, &il->status)) &&
+            (pkt->hdr.cmd == N_STATS)) {
+                il4965_rx_calc_noise(il);
+                queue_work(il->workqueue, &il->run_time_calib_work);
+        }
+        if (il->cfg->ops->lib->temp_ops.temperature && change)
+                il->cfg->ops->lib->temp_ops.temperature(il);
+}
+
+void
+il4965_hdl_c_stats(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+
+        if (le32_to_cpu(pkt->u.stats.flag) & UCODE_STATS_CLEAR_MSK) {
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+                memset(&il->_4965.accum_stats, 0,
+                       sizeof(struct il_notif_stats));
+                memset(&il->_4965.delta_stats, 0,
+                       sizeof(struct il_notif_stats));
+                memset(&il->_4965.max_delta, 0, sizeof(struct il_notif_stats));
+#endif
+                D_RX("Statistics have been cleared\n");
+        }
+        il4965_hdl_stats(il, rxb);
+}
+
+
+/*
+ * mac80211 queues, ACs, hardware queues, FIFOs.
+ *
+ * Cf. http://wireless.kernel.org/en/developers/Documentation/mac80211/queues
+ *
+ * Mac80211 uses the following numbers, which we get as from it
+ * by way of skb_get_queue_mapping(skb):
+ *
+ *     VO      0
+ *     VI      1
+ *     BE      2
+ *     BK      3
+ *
+ *
+ * Regular (not A-MPDU) frames are put into hardware queues corresponding
+ * to the FIFOs, see comments in iwl-prph.h. Aggregated frames get their
+ * own queue per aggregation session (RA/TID combination), such queues are
+ * set up to map into FIFOs too, for which we need an AC->FIFO mapping. In
+ * order to map frames to the right queue, we also need an AC->hw queue
+ * mapping. This is implemented here.
+ *
+ * Due to the way hw queues are set up (by the hw specific modules like
+ * 4965.c), the AC->hw queue mapping is the identity
+ * mapping.
+ */
+
+static const u8 tid_to_ac[] = {
+        IEEE80211_AC_BE,
+        IEEE80211_AC_BK,
+        IEEE80211_AC_BK,
+        IEEE80211_AC_BE,
+        IEEE80211_AC_VI,
+        IEEE80211_AC_VI,
+        IEEE80211_AC_VO,
+        IEEE80211_AC_VO
+};
+
+static inline int
+il4965_get_ac_from_tid(u16 tid)
+{
+        if (likely(tid < ARRAY_SIZE(tid_to_ac)))
+                return tid_to_ac[tid];
+
+        /* no support for TIDs 8-15 yet */
+        return -EINVAL;
+}
+
+static inline int
+il4965_get_fifo_from_tid(struct il_rxon_context *ctx, u16 tid)
+{
+        if (likely(tid < ARRAY_SIZE(tid_to_ac)))
+                return ctx->ac_to_fifo[tid_to_ac[tid]];
+
+        /* no support for TIDs 8-15 yet */
+        return -EINVAL;
+}
+
+/*
+ * handle build C_TX command notification.
+ */
+static void
+il4965_tx_cmd_build_basic(struct il_priv *il, struct sk_buff *skb,
+                          struct il_tx_cmd *tx_cmd,
+                          struct ieee80211_tx_info *info,
+                          struct ieee80211_hdr *hdr, u8 std_id)
+{
+        __le16 fc = hdr->frame_control;
+        __le32 tx_flags = tx_cmd->tx_flags;
+
+        tx_cmd->stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
+        if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) {
+                tx_flags |= TX_CMD_FLG_ACK_MSK;
+                if (ieee80211_is_mgmt(fc))
+                        tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
+                if (ieee80211_is_probe_resp(fc) &&
+                    !(le16_to_cpu(hdr->seq_ctrl) & 0xf))
+                        tx_flags |= TX_CMD_FLG_TSF_MSK;
+        } else {
+                tx_flags &= (~TX_CMD_FLG_ACK_MSK);
+                tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
+        }
+
+        if (ieee80211_is_back_req(fc))
+                tx_flags |= TX_CMD_FLG_ACK_MSK | TX_CMD_FLG_IMM_BA_RSP_MASK;
+
+        tx_cmd->sta_id = std_id;
+        if (ieee80211_has_morefrags(fc))
+                tx_flags |= TX_CMD_FLG_MORE_FRAG_MSK;
+
+        if (ieee80211_is_data_qos(fc)) {
+                u8 *qc = ieee80211_get_qos_ctl(hdr);
+                tx_cmd->tid_tspec = qc[0] & 0xf;
+                tx_flags &= ~TX_CMD_FLG_SEQ_CTL_MSK;
+        } else {
+                tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
+        }
+
+        il_tx_cmd_protection(il, info, fc, &tx_flags);
+
+        tx_flags &= ~(TX_CMD_FLG_ANT_SEL_MSK);
+        if (ieee80211_is_mgmt(fc)) {
+                if (ieee80211_is_assoc_req(fc) || ieee80211_is_reassoc_req(fc))
+                        tx_cmd->timeout.pm_frame_timeout = cpu_to_le16(3);
+                else
+                        tx_cmd->timeout.pm_frame_timeout = cpu_to_le16(2);
+        } else {
+                tx_cmd->timeout.pm_frame_timeout = 0;
+        }
+
+        tx_cmd->driver_txop = 0;
+        tx_cmd->tx_flags = tx_flags;
+        tx_cmd->next_frame_len = 0;
+}
+
+#define RTS_DFAULT_RETRY_LIMIT          60
+
+static void
+il4965_tx_cmd_build_rate(struct il_priv *il, struct il_tx_cmd *tx_cmd,
+                         struct ieee80211_tx_info *info, __le16 fc)
+{
+        u32 rate_flags;
+        int rate_idx;
+        u8 rts_retry_limit;
+        u8 data_retry_limit;
+        u8 rate_plcp;
+
+        /* Set retry limit on DATA packets and Probe Responses */
+        if (ieee80211_is_probe_resp(fc))
+                data_retry_limit = 3;
+        else
+                data_retry_limit = IL4965_DEFAULT_TX_RETRY;
+        tx_cmd->data_retry_limit = data_retry_limit;
+
+        /* Set retry limit on RTS packets */
+        rts_retry_limit = RTS_DFAULT_RETRY_LIMIT;
+        if (data_retry_limit < rts_retry_limit)
+                rts_retry_limit = data_retry_limit;
+        tx_cmd->rts_retry_limit = rts_retry_limit;
+
+        /* DATA packets will use the uCode station table for rate/antenna
+         * selection */
+        if (ieee80211_is_data(fc)) {
+                tx_cmd->initial_rate_idx = 0;
+                tx_cmd->tx_flags |= TX_CMD_FLG_STA_RATE_MSK;
+                return;
+        }
+
+        /**
+         * If the current TX rate stored in mac80211 has the MCS bit set, it's
+         * not really a TX rate.  Thus, we use the lowest supported rate for
+         * this band.  Also use the lowest supported rate if the stored rate
+         * idx is invalid.
+         */
+        rate_idx = info->control.rates[0].idx;
+        if ((info->control.rates[0].flags & IEEE80211_TX_RC_MCS) || rate_idx < 0
+            || rate_idx > RATE_COUNT_LEGACY)
+                rate_idx =
+                    rate_lowest_index(&il->bands[info->band],
+                                      info->control.sta);
+        /* For 5 GHZ band, remap mac80211 rate indices into driver indices */
+        if (info->band == IEEE80211_BAND_5GHZ)
+                rate_idx += IL_FIRST_OFDM_RATE;
+        /* Get PLCP rate for tx_cmd->rate_n_flags */
+        rate_plcp = il_rates[rate_idx].plcp;
+        /* Zero out flags for this packet */
+        rate_flags = 0;
+
+        /* Set CCK flag as needed */
+        if (rate_idx >= IL_FIRST_CCK_RATE && rate_idx <= IL_LAST_CCK_RATE)
+                rate_flags |= RATE_MCS_CCK_MSK;
+
+        /* Set up antennas */
+        il->mgmt_tx_ant =
+            il4965_toggle_tx_ant(il, il->mgmt_tx_ant,
+                                 il->hw_params.valid_tx_ant);
+
+        rate_flags |= il4965_ant_idx_to_flags(il->mgmt_tx_ant);
+
+        /* Set the rate in the TX cmd */
+        tx_cmd->rate_n_flags =
+            il4965_hw_set_rate_n_flags(rate_plcp, rate_flags);
+}
+
+static void
+il4965_tx_cmd_build_hwcrypto(struct il_priv *il, struct ieee80211_tx_info *info,
+                             struct il_tx_cmd *tx_cmd, struct sk_buff *skb_frag,
+                             int sta_id)
+{
+        struct ieee80211_key_conf *keyconf = info->control.hw_key;
+
+        switch (keyconf->cipher) {
+        case WLAN_CIPHER_SUITE_CCMP:
+                tx_cmd->sec_ctl = TX_CMD_SEC_CCM;
+                memcpy(tx_cmd->key, keyconf->key, keyconf->keylen);
+                if (info->flags & IEEE80211_TX_CTL_AMPDU)
+                        tx_cmd->tx_flags |= TX_CMD_FLG_AGG_CCMP_MSK;
+                D_TX("tx_cmd with AES hwcrypto\n");
+                break;
+
+        case WLAN_CIPHER_SUITE_TKIP:
+                tx_cmd->sec_ctl = TX_CMD_SEC_TKIP;
+                ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd->key);
+                D_TX("tx_cmd with tkip hwcrypto\n");
+                break;
+
+        case WLAN_CIPHER_SUITE_WEP104:
+                tx_cmd->sec_ctl |= TX_CMD_SEC_KEY128;
+                /* fall through */
+        case WLAN_CIPHER_SUITE_WEP40:
+                tx_cmd->sec_ctl |=
+                    (TX_CMD_SEC_WEP | (keyconf->keyidx & TX_CMD_SEC_MSK) <<
+                     TX_CMD_SEC_SHIFT);
+
+                memcpy(&tx_cmd->key[3], keyconf->key, keyconf->keylen);
+
+                D_TX("Configuring packet for WEP encryption " "with key %d\n",
+                     keyconf->keyidx);
+                break;
+
+        default:
+                IL_ERR("Unknown encode cipher %x\n", keyconf->cipher);
+                break;
+        }
+}
+
+/*
+ * start C_TX command process
+ */
+int
+il4965_tx_skb(struct il_priv *il, struct sk_buff *skb)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+        struct ieee80211_sta *sta = info->control.sta;
+        struct il_station_priv *sta_priv = NULL;
+        struct il_tx_queue *txq;
+        struct il_queue *q;
+        struct il_device_cmd *out_cmd;
+        struct il_cmd_meta *out_meta;
+        struct il_tx_cmd *tx_cmd;
+        struct il_rxon_context *ctx = &il->ctx;
+        int txq_id;
+        dma_addr_t phys_addr;
+        dma_addr_t txcmd_phys;
+        dma_addr_t scratch_phys;
+        u16 len, firstlen, secondlen;
+        u16 seq_number = 0;
+        __le16 fc;
+        u8 hdr_len;
+        u8 sta_id;
+        u8 wait_write_ptr = 0;
+        u8 tid = 0;
+        u8 *qc = NULL;
+        unsigned long flags;
+        bool is_agg = false;
+
+        if (info->control.vif)
+                ctx = il_rxon_ctx_from_vif(info->control.vif);
+
+        spin_lock_irqsave(&il->lock, flags);
+        if (il_is_rfkill(il)) {
+                D_DROP("Dropping - RF KILL\n");
+                goto drop_unlock;
+        }
+
+        fc = hdr->frame_control;
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+        if (ieee80211_is_auth(fc))
+                D_TX("Sending AUTH frame\n");
+        else if (ieee80211_is_assoc_req(fc))
+                D_TX("Sending ASSOC frame\n");
+        else if (ieee80211_is_reassoc_req(fc))
+                D_TX("Sending REASSOC frame\n");
+#endif
+
+        hdr_len = ieee80211_hdrlen(fc);
+
+        /* For management frames use broadcast id to do not break aggregation */
+        if (!ieee80211_is_data(fc))
+                sta_id = ctx->bcast_sta_id;
+        else {
+                /* Find idx into station table for destination station */
+                sta_id = il_sta_id_or_broadcast(il, ctx, info->control.sta);
+
+                if (sta_id == IL_INVALID_STATION) {
+                        D_DROP("Dropping - INVALID STATION: %pM\n", hdr->addr1);
+                        goto drop_unlock;
+                }
+        }
+
+        D_TX("station Id %d\n", sta_id);
+
+        if (sta)
+                sta_priv = (void *)sta->drv_priv;
+
+        if (sta_priv && sta_priv->asleep &&
+            (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)) {
+                /*
+                 * This sends an asynchronous command to the device,
+                 * but we can rely on it being processed before the
+                 * next frame is processed -- and the next frame to
+                 * this station is the one that will consume this
+                 * counter.
+                 * For now set the counter to just 1 since we do not
+                 * support uAPSD yet.
+                 */
+                il4965_sta_modify_sleep_tx_count(il, sta_id, 1);
+        }
+
+        /*
+         * Send this frame after DTIM -- there's a special queue
+         * reserved for this for contexts that support AP mode.
+         */
+        if (info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM) {
+                txq_id = ctx->mcast_queue;
+                /*
+                 * The microcode will clear the more data
+                 * bit in the last frame it transmits.
+                 */
+                hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREDATA);
+        } else
+                txq_id = ctx->ac_to_queue[skb_get_queue_mapping(skb)];
+
+        /* irqs already disabled/saved above when locking il->lock */
+        spin_lock(&il->sta_lock);
+
+        if (ieee80211_is_data_qos(fc)) {
+                qc = ieee80211_get_qos_ctl(hdr);
+                tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK;
+                if (WARN_ON_ONCE(tid >= MAX_TID_COUNT)) {
+                        spin_unlock(&il->sta_lock);
+                        goto drop_unlock;
+                }
+                seq_number = il->stations[sta_id].tid[tid].seq_number;
+                seq_number &= IEEE80211_SCTL_SEQ;
+                hdr->seq_ctrl =
+                    hdr->seq_ctrl & cpu_to_le16(IEEE80211_SCTL_FRAG);
+                hdr->seq_ctrl |= cpu_to_le16(seq_number);
+                seq_number += 0x10;
+                /* aggregation is on for this <sta,tid> */
+                if (info->flags & IEEE80211_TX_CTL_AMPDU &&
+                    il->stations[sta_id].tid[tid].agg.state == IL_AGG_ON) {
+                        txq_id = il->stations[sta_id].tid[tid].agg.txq_id;
+                        is_agg = true;
+                }
+        }
+
+        txq = &il->txq[txq_id];
+        q = &txq->q;
+
+        if (unlikely(il_queue_space(q) < q->high_mark)) {
+                spin_unlock(&il->sta_lock);
+                goto drop_unlock;
+        }
+
+        if (ieee80211_is_data_qos(fc)) {
+                il->stations[sta_id].tid[tid].tfds_in_queue++;
+                if (!ieee80211_has_morefrags(fc))
+                        il->stations[sta_id].tid[tid].seq_number = seq_number;
+        }
+
+        spin_unlock(&il->sta_lock);
+
+        /* Set up driver data for this TFD */
+        memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct il_tx_info));
+        txq->txb[q->write_ptr].skb = skb;
+        txq->txb[q->write_ptr].ctx = ctx;
+
+        /* Set up first empty entry in queue's array of Tx/cmd buffers */
+        out_cmd = txq->cmd[q->write_ptr];
+        out_meta = &txq->meta[q->write_ptr];
+        tx_cmd = &out_cmd->cmd.tx;
+        memset(&out_cmd->hdr, 0, sizeof(out_cmd->hdr));
+        memset(tx_cmd, 0, sizeof(struct il_tx_cmd));
+
+        /*
+         * Set up the Tx-command (not MAC!) header.
+         * Store the chosen Tx queue and TFD idx within the sequence field;
+         * after Tx, uCode's Tx response will return this value so driver can
+         * locate the frame within the tx queue and do post-tx processing.
+         */
+        out_cmd->hdr.cmd = C_TX;
+        out_cmd->hdr.sequence =
+            cpu_to_le16((u16)
+                        (QUEUE_TO_SEQ(txq_id) | IDX_TO_SEQ(q->write_ptr)));
+
+        /* Copy MAC header from skb into command buffer */
+        memcpy(tx_cmd->hdr, hdr, hdr_len);
+
+        /* Total # bytes to be transmitted */
+        len = (u16) skb->len;
+        tx_cmd->len = cpu_to_le16(len);
+
+        if (info->control.hw_key)
+                il4965_tx_cmd_build_hwcrypto(il, info, tx_cmd, skb, sta_id);
+
+        /* TODO need this for burst mode later on */
+        il4965_tx_cmd_build_basic(il, skb, tx_cmd, info, hdr, sta_id);
+        il_dbg_log_tx_data_frame(il, len, hdr);
+
+        il4965_tx_cmd_build_rate(il, tx_cmd, info, fc);
+
+        il_update_stats(il, true, fc, len);
+        /*
+         * Use the first empty entry in this queue's command buffer array
+         * to contain the Tx command and MAC header concatenated together
+         * (payload data will be in another buffer).
+         * Size of this varies, due to varying MAC header length.
+         * If end is not dword aligned, we'll have 2 extra bytes at the end
+         * of the MAC header (device reads on dword boundaries).
+         * We'll tell device about this padding later.
+         */
+        len = sizeof(struct il_tx_cmd) + sizeof(struct il_cmd_header) + hdr_len;
+        firstlen = (len + 3) & ~3;
+
+        /* Tell NIC about any 2-byte padding after MAC header */
+        if (firstlen != len)
+                tx_cmd->tx_flags |= TX_CMD_FLG_MH_PAD_MSK;
+
+        /* Physical address of this Tx command's header (not MAC header!),
+         * within command buffer array. */
+        txcmd_phys =
+            pci_map_single(il->pci_dev, &out_cmd->hdr, firstlen,
+                           PCI_DMA_BIDIRECTIONAL);
+        dma_unmap_addr_set(out_meta, mapping, txcmd_phys);
+        dma_unmap_len_set(out_meta, len, firstlen);
+        /* Add buffer containing Tx command and MAC(!) header to TFD's
+         * first entry */
+        il->cfg->ops->lib->txq_attach_buf_to_tfd(il, txq, txcmd_phys, firstlen,
+                                                 1, 0);
+
+        if (!ieee80211_has_morefrags(hdr->frame_control)) {
+                txq->need_update = 1;
+        } else {
+                wait_write_ptr = 1;
+                txq->need_update = 0;
+        }
+
+        /* Set up TFD's 2nd entry to point directly to remainder of skb,
+         * if any (802.11 null frames have no payload). */
+        secondlen = skb->len - hdr_len;
+        if (secondlen > 0) {
+                phys_addr =
+                    pci_map_single(il->pci_dev, skb->data + hdr_len, secondlen,
+                                   PCI_DMA_TODEVICE);
+                il->cfg->ops->lib->txq_attach_buf_to_tfd(il, txq, phys_addr,
+                                                         secondlen, 0, 0);
+        }
+
+        scratch_phys =
+            txcmd_phys + sizeof(struct il_cmd_header) +
+            offsetof(struct il_tx_cmd, scratch);
+
+        /* take back ownership of DMA buffer to enable update */
+        pci_dma_sync_single_for_cpu(il->pci_dev, txcmd_phys, firstlen,
+                                    PCI_DMA_BIDIRECTIONAL);
+        tx_cmd->dram_lsb_ptr = cpu_to_le32(scratch_phys);
+        tx_cmd->dram_msb_ptr = il_get_dma_hi_addr(scratch_phys);
+
+        D_TX("sequence nr = 0X%x\n", le16_to_cpu(out_cmd->hdr.sequence));
+        D_TX("tx_flags = 0X%x\n", le32_to_cpu(tx_cmd->tx_flags));
+        il_print_hex_dump(il, IL_DL_TX, (u8 *) tx_cmd, sizeof(*tx_cmd));
+        il_print_hex_dump(il, IL_DL_TX, (u8 *) tx_cmd->hdr, hdr_len);
+
+        /* Set up entry for this TFD in Tx byte-count array */
+        if (info->flags & IEEE80211_TX_CTL_AMPDU)
+                il->cfg->ops->lib->txq_update_byte_cnt_tbl(il, txq,
+                                                           le16_to_cpu(tx_cmd->
+                                                                       len));
+
+        pci_dma_sync_single_for_device(il->pci_dev, txcmd_phys, firstlen,
+                                       PCI_DMA_BIDIRECTIONAL);
+
+        /* Tell device the write idx *just past* this latest filled TFD */
+        q->write_ptr = il_queue_inc_wrap(q->write_ptr, q->n_bd);
+        il_txq_update_write_ptr(il, txq);
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        /*
+         * At this point the frame is "transmitted" successfully
+         * and we will get a TX status notification eventually,
+         * regardless of the value of ret. "ret" only indicates
+         * whether or not we should update the write pointer.
+         */
+
+        /*
+         * Avoid atomic ops if it isn't an associated client.
+         * Also, if this is a packet for aggregation, don't
+         * increase the counter because the ucode will stop
+         * aggregation queues when their respective station
+         * goes to sleep.
+         */
+        if (sta_priv && sta_priv->client && !is_agg)
+                atomic_inc(&sta_priv->pending_frames);
+
+        if (il_queue_space(q) < q->high_mark && il->mac80211_registered) {
+                if (wait_write_ptr) {
+                        spin_lock_irqsave(&il->lock, flags);
+                        txq->need_update = 1;
+                        il_txq_update_write_ptr(il, txq);
+                        spin_unlock_irqrestore(&il->lock, flags);
+                } else {
+                        il_stop_queue(il, txq);
+                }
+        }
+
+        return 0;
+
+drop_unlock:
+        spin_unlock_irqrestore(&il->lock, flags);
+        return -1;
+}
+
+static inline int
+il4965_alloc_dma_ptr(struct il_priv *il, struct il_dma_ptr *ptr, size_t size)
+{
+        ptr->addr =
+            dma_alloc_coherent(&il->pci_dev->dev, size, &ptr->dma, GFP_KERNEL);
+        if (!ptr->addr)
+                return -ENOMEM;
+        ptr->size = size;
+        return 0;
+}
+
+static inline void
+il4965_free_dma_ptr(struct il_priv *il, struct il_dma_ptr *ptr)
+{
+        if (unlikely(!ptr->addr))
+                return;
+
+        dma_free_coherent(&il->pci_dev->dev, ptr->size, ptr->addr, ptr->dma);
+        memset(ptr, 0, sizeof(*ptr));
+}
+
+/**
+ * il4965_hw_txq_ctx_free - Free TXQ Context
+ *
+ * Destroy all TX DMA queues and structures
+ */
+void
+il4965_hw_txq_ctx_free(struct il_priv *il)
+{
+        int txq_id;
+
+        /* Tx queues */
+        if (il->txq) {
+                for (txq_id = 0; txq_id < il->hw_params.max_txq_num; txq_id++)
+                        if (txq_id == il->cmd_queue)
+                                il_cmd_queue_free(il);
+                        else
+                                il_tx_queue_free(il, txq_id);
+        }
+        il4965_free_dma_ptr(il, &il->kw);
+
+        il4965_free_dma_ptr(il, &il->scd_bc_tbls);
+
+        /* free tx queue structure */
+        il_txq_mem(il);
+}
+
+/**
+ * il4965_txq_ctx_alloc - allocate TX queue context
+ * Allocate all Tx DMA structures and initialize them
+ *
+ * @param il
+ * @return error code
+ */
+int
+il4965_txq_ctx_alloc(struct il_priv *il)
+{
+        int ret;
+        int txq_id, slots_num;
+        unsigned long flags;
+
+        /* Free all tx/cmd queues and keep-warm buffer */
+        il4965_hw_txq_ctx_free(il);
+
+        ret =
+            il4965_alloc_dma_ptr(il, &il->scd_bc_tbls,
+                                 il->hw_params.scd_bc_tbls_size);
+        if (ret) {
+                IL_ERR("Scheduler BC Table allocation failed\n");
+                goto error_bc_tbls;
+        }
+        /* Alloc keep-warm buffer */
+        ret = il4965_alloc_dma_ptr(il, &il->kw, IL_KW_SIZE);
+        if (ret) {
+                IL_ERR("Keep Warm allocation failed\n");
+                goto error_kw;
+        }
+
+        /* allocate tx queue structure */
+        ret = il_alloc_txq_mem(il);
+        if (ret)
+                goto error;
+
+        spin_lock_irqsave(&il->lock, flags);
+
+        /* Turn off all Tx DMA fifos */
+        il4965_txq_set_sched(il, 0);
+
+        /* Tell NIC where to find the "keep warm" buffer */
+        il_wr(il, FH49_KW_MEM_ADDR_REG, il->kw.dma >> 4);
+
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        /* Alloc and init all Tx queues, including the command queue (#4/#9) */
+        for (txq_id = 0; txq_id < il->hw_params.max_txq_num; txq_id++) {
+                slots_num =
+                    (txq_id ==
+                     il->cmd_queue) ? TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;
+                ret = il_tx_queue_init(il, &il->txq[txq_id], slots_num, txq_id);
+                if (ret) {
+                        IL_ERR("Tx %d queue init failed\n", txq_id);
+                        goto error;
+                }
+        }
+
+        return ret;
+
+error:
+        il4965_hw_txq_ctx_free(il);
+        il4965_free_dma_ptr(il, &il->kw);
+error_kw:
+        il4965_free_dma_ptr(il, &il->scd_bc_tbls);
+error_bc_tbls:
+        return ret;
+}
+
+void
+il4965_txq_ctx_reset(struct il_priv *il)
+{
+        int txq_id, slots_num;
+        unsigned long flags;
+
+        spin_lock_irqsave(&il->lock, flags);
+
+        /* Turn off all Tx DMA fifos */
+        il4965_txq_set_sched(il, 0);
+
+        /* Tell NIC where to find the "keep warm" buffer */
+        il_wr(il, FH49_KW_MEM_ADDR_REG, il->kw.dma >> 4);
+
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        /* Alloc and init all Tx queues, including the command queue (#4) */
+        for (txq_id = 0; txq_id < il->hw_params.max_txq_num; txq_id++) {
+                slots_num =
+                    txq_id == il->cmd_queue ? TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;
+                il_tx_queue_reset(il, &il->txq[txq_id], slots_num, txq_id);
+        }
+}
+
+/**
+ * il4965_txq_ctx_stop - Stop all Tx DMA channels
+ */
+void
+il4965_txq_ctx_stop(struct il_priv *il)
+{
+        int ch, txq_id;
+        unsigned long flags;
+
+        /* Turn off all Tx DMA fifos */
+        spin_lock_irqsave(&il->lock, flags);
+
+        il4965_txq_set_sched(il, 0);
+
+        /* Stop each Tx DMA channel, and wait for it to be idle */
+        for (ch = 0; ch < il->hw_params.dma_chnl_num; ch++) {
+                il_wr(il, FH49_TCSR_CHNL_TX_CONFIG_REG(ch), 0x0);
+                if (il_poll_bit
+                    (il, FH49_TSSR_TX_STATUS_REG,
+                     FH49_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch), 1000))
+                        IL_ERR("Failing on timeout while stopping"
+                               " DMA channel %d [0x%08x]", ch,
+                               il_rd(il, FH49_TSSR_TX_STATUS_REG));
+        }
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        if (!il->txq)
+                return;
+
+        /* Unmap DMA from host system and free skb's */
+        for (txq_id = 0; txq_id < il->hw_params.max_txq_num; txq_id++)
+                if (txq_id == il->cmd_queue)
+                        il_cmd_queue_unmap(il);
+                else
+                        il_tx_queue_unmap(il, txq_id);
+}
+
+/*
+ * 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), reserved (5, 6)
+ */
+static int
+il4965_txq_ctx_activate_free(struct il_priv *il)
+{
+        int txq_id;
+
+        for (txq_id = 0; txq_id < il->hw_params.max_txq_num; txq_id++)
+                if (!test_and_set_bit(txq_id, &il->txq_ctx_active_msk))
+                        return txq_id;
+        return -1;
+}
+
+/**
+ * il4965_tx_queue_stop_scheduler - Stop queue, but keep configuration
+ */
+static void
+il4965_tx_queue_stop_scheduler(struct il_priv *il, 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. */
+        il_wr_prph(il, IL49_SCD_QUEUE_STATUS_BITS(txq_id),
+                   (0 << IL49_SCD_QUEUE_STTS_REG_POS_ACTIVE) |
+                   (1 << IL49_SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN));
+}
+
+/**
+ * il4965_tx_queue_set_q2ratid - Map unique receiver/tid combination to a queue
+ */
+static int
+il4965_tx_queue_set_q2ratid(struct il_priv *il, u16 ra_tid, u16 txq_id)
+{
+        u32 tbl_dw_addr;
+        u32 tbl_dw;
+        u16 scd_q2ratid;
+
+        scd_q2ratid = ra_tid & IL_SCD_QUEUE_RA_TID_MAP_RATID_MSK;
+
+        tbl_dw_addr =
+            il->scd_base_addr + IL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(txq_id);
+
+        tbl_dw = il_read_targ_mem(il, tbl_dw_addr);
+
+        if (txq_id & 0x1)
+                tbl_dw = (scd_q2ratid << 16) | (tbl_dw & 0x0000FFFF);
+        else
+                tbl_dw = scd_q2ratid | (tbl_dw & 0xFFFF0000);
+
+        il_write_targ_mem(il, tbl_dw_addr, tbl_dw);
+
+        return 0;
+}
+
+/**
+ * il4965_tx_queue_agg_enable - Set up & enable aggregation for selected queue
+ *
+ * NOTE:  txq_id must be greater than IL49_FIRST_AMPDU_QUEUE,
+ *        i.e. it must be one of the higher queues used for aggregation
+ */
+static int
+il4965_txq_agg_enable(struct il_priv *il, int txq_id, int tx_fifo, int sta_id,
+                      int tid, u16 ssn_idx)
+{
+        unsigned long flags;
+        u16 ra_tid;
+        int ret;
+
+        if ((IL49_FIRST_AMPDU_QUEUE > txq_id) ||
+            (IL49_FIRST_AMPDU_QUEUE +
+             il->cfg->base_params->num_of_ampdu_queues <= txq_id)) {
+                IL_WARN("queue number out of range: %d, must be %d to %d\n",
+                        txq_id, IL49_FIRST_AMPDU_QUEUE,
+                        IL49_FIRST_AMPDU_QUEUE +
+                        il->cfg->base_params->num_of_ampdu_queues - 1);
+                return -EINVAL;
+        }
+
+        ra_tid = BUILD_RAxTID(sta_id, tid);
+
+        /* Modify device's station table to Tx this TID */
+        ret = il4965_sta_tx_modify_enable_tid(il, sta_id, tid);
+        if (ret)
+                return ret;
+
+        spin_lock_irqsave(&il->lock, flags);
+
+        /* Stop this Tx queue before configuring it */
+        il4965_tx_queue_stop_scheduler(il, txq_id);
+
+        /* Map receiver-address / traffic-ID to this queue */
+        il4965_tx_queue_set_q2ratid(il, ra_tid, txq_id);
+
+        /* Set this queue as a chain-building queue */
+        il_set_bits_prph(il, IL49_SCD_QUEUECHAIN_SEL, (1 << txq_id));
+
+        /* Place first TFD at idx corresponding to start sequence number.
+         * Assumes that ssn_idx is valid (!= 0xFFF) */
+        il->txq[txq_id].q.read_ptr = (ssn_idx & 0xff);
+        il->txq[txq_id].q.write_ptr = (ssn_idx & 0xff);
+        il4965_set_wr_ptrs(il, txq_id, ssn_idx);
+
+        /* Set up Tx win size and frame limit for this queue */
+        il_write_targ_mem(il,
+                          il->scd_base_addr +
+                          IL49_SCD_CONTEXT_QUEUE_OFFSET(txq_id),
+                          (SCD_WIN_SIZE << IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS)
+                          & IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK);
+
+        il_write_targ_mem(il,
+                          il->scd_base_addr +
+                          IL49_SCD_CONTEXT_QUEUE_OFFSET(txq_id) + sizeof(u32),
+                          (SCD_FRAME_LIMIT <<
+                           IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) &
+                          IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK);
+
+        il_set_bits_prph(il, IL49_SCD_INTERRUPT_MASK, (1 << txq_id));
+
+        /* Set up Status area in SRAM, map to Tx DMA/FIFO, activate the queue */
+        il4965_tx_queue_set_status(il, &il->txq[txq_id], tx_fifo, 1);
+
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        return 0;
+}
+
+int
+il4965_tx_agg_start(struct il_priv *il, struct ieee80211_vif *vif,
+                    struct ieee80211_sta *sta, u16 tid, u16 * ssn)
+{
+        int sta_id;
+        int tx_fifo;
+        int txq_id;
+        int ret;
+        unsigned long flags;
+        struct il_tid_data *tid_data;
+
+        tx_fifo = il4965_get_fifo_from_tid(il_rxon_ctx_from_vif(vif), tid);
+        if (unlikely(tx_fifo < 0))
+                return tx_fifo;
+
+        D_HT("%s on ra = %pM tid = %d\n", __func__, sta->addr, tid);
+
+        sta_id = il_sta_id(sta);
+        if (sta_id == IL_INVALID_STATION) {
+                IL_ERR("Start AGG on invalid station\n");
+                return -ENXIO;
+        }
+        if (unlikely(tid >= MAX_TID_COUNT))
+                return -EINVAL;
+
+        if (il->stations[sta_id].tid[tid].agg.state != IL_AGG_OFF) {
+                IL_ERR("Start AGG when state is not IL_AGG_OFF !\n");
+                return -ENXIO;
+        }
+
+        txq_id = il4965_txq_ctx_activate_free(il);
+        if (txq_id == -1) {
+                IL_ERR("No free aggregation queue available\n");
+                return -ENXIO;
+        }
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        tid_data = &il->stations[sta_id].tid[tid];
+        *ssn = SEQ_TO_SN(tid_data->seq_number);
+        tid_data->agg.txq_id = txq_id;
+        il_set_swq_id(&il->txq[txq_id], il4965_get_ac_from_tid(tid), txq_id);
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        ret = il4965_txq_agg_enable(il, txq_id, tx_fifo, sta_id, tid, *ssn);
+        if (ret)
+                return ret;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        tid_data = &il->stations[sta_id].tid[tid];
+        if (tid_data->tfds_in_queue == 0) {
+                D_HT("HW queue is empty\n");
+                tid_data->agg.state = IL_AGG_ON;
+                ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
+        } else {
+                D_HT("HW queue is NOT empty: %d packets in HW queue\n",
+                     tid_data->tfds_in_queue);
+                tid_data->agg.state = IL_EMPTYING_HW_QUEUE_ADDBA;
+        }
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+        return ret;
+}
+
+/**
+ * txq_id must be greater than IL49_FIRST_AMPDU_QUEUE
+ * il->lock must be held by the caller
+ */
+static int
+il4965_txq_agg_disable(struct il_priv *il, u16 txq_id, u16 ssn_idx, u8 tx_fifo)
+{
+        if ((IL49_FIRST_AMPDU_QUEUE > txq_id) ||
+            (IL49_FIRST_AMPDU_QUEUE +
+             il->cfg->base_params->num_of_ampdu_queues <= txq_id)) {
+                IL_WARN("queue number out of range: %d, must be %d to %d\n",
+                        txq_id, IL49_FIRST_AMPDU_QUEUE,
+                        IL49_FIRST_AMPDU_QUEUE +
+                        il->cfg->base_params->num_of_ampdu_queues - 1);
+                return -EINVAL;
+        }
+
+        il4965_tx_queue_stop_scheduler(il, txq_id);
+
+        il_clear_bits_prph(il, IL49_SCD_QUEUECHAIN_SEL, (1 << txq_id));
+
+        il->txq[txq_id].q.read_ptr = (ssn_idx & 0xff);
+        il->txq[txq_id].q.write_ptr = (ssn_idx & 0xff);
+        /* supposes that ssn_idx is valid (!= 0xFFF) */
+        il4965_set_wr_ptrs(il, txq_id, ssn_idx);
+
+        il_clear_bits_prph(il, IL49_SCD_INTERRUPT_MASK, (1 << txq_id));
+        il_txq_ctx_deactivate(il, txq_id);
+        il4965_tx_queue_set_status(il, &il->txq[txq_id], tx_fifo, 0);
+
+        return 0;
+}
+
+int
+il4965_tx_agg_stop(struct il_priv *il, struct ieee80211_vif *vif,
+                   struct ieee80211_sta *sta, u16 tid)
+{
+        int tx_fifo_id, txq_id, sta_id, ssn;
+        struct il_tid_data *tid_data;
+        int write_ptr, read_ptr;
+        unsigned long flags;
+
+        tx_fifo_id = il4965_get_fifo_from_tid(il_rxon_ctx_from_vif(vif), tid);
+        if (unlikely(tx_fifo_id < 0))
+                return tx_fifo_id;
+
+        sta_id = il_sta_id(sta);
+
+        if (sta_id == IL_INVALID_STATION) {
+                IL_ERR("Invalid station for AGG tid %d\n", tid);
+                return -ENXIO;
+        }
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+
+        tid_data = &il->stations[sta_id].tid[tid];
+        ssn = (tid_data->seq_number & IEEE80211_SCTL_SEQ) >> 4;
+        txq_id = tid_data->agg.txq_id;
+
+        switch (il->stations[sta_id].tid[tid].agg.state) {
+        case IL_EMPTYING_HW_QUEUE_ADDBA:
+                /*
+                 * This can happen if the peer stops aggregation
+                 * again before we've had a chance to drain the
+                 * queue we selected previously, i.e. before the
+                 * session was really started completely.
+                 */
+                D_HT("AGG stop before setup done\n");
+                goto turn_off;
+        case IL_AGG_ON:
+                break;
+        default:
+                IL_WARN("Stopping AGG while state not ON or starting\n");
+        }
+
+        write_ptr = il->txq[txq_id].q.write_ptr;
+        read_ptr = il->txq[txq_id].q.read_ptr;
+
+        /* The queue is not empty */
+        if (write_ptr != read_ptr) {
+                D_HT("Stopping a non empty AGG HW QUEUE\n");
+                il->stations[sta_id].tid[tid].agg.state =
+                    IL_EMPTYING_HW_QUEUE_DELBA;
+                spin_unlock_irqrestore(&il->sta_lock, flags);
+                return 0;
+        }
+
+        D_HT("HW queue is empty\n");
+turn_off:
+        il->stations[sta_id].tid[tid].agg.state = IL_AGG_OFF;
+
+        /* do not restore/save irqs */
+        spin_unlock(&il->sta_lock);
+        spin_lock(&il->lock);
+
+        /*
+         * the only reason this call can fail is queue number out of range,
+         * which can happen if uCode is reloaded and all the station
+         * information are lost. if it is outside the range, there is no need
+         * to deactivate the uCode queue, just return "success" to allow
+         *  mac80211 to clean up it own data.
+         */
+        il4965_txq_agg_disable(il, txq_id, ssn, tx_fifo_id);
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
+
+        return 0;
+}
+
+int
+il4965_txq_check_empty(struct il_priv *il, int sta_id, u8 tid, int txq_id)
+{
+        struct il_queue *q = &il->txq[txq_id].q;
+        u8 *addr = il->stations[sta_id].sta.sta.addr;
+        struct il_tid_data *tid_data = &il->stations[sta_id].tid[tid];
+        struct il_rxon_context *ctx;
+
+        ctx = &il->ctx;
+
+        lockdep_assert_held(&il->sta_lock);
+
+        switch (il->stations[sta_id].tid[tid].agg.state) {
+        case IL_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 = il4965_get_fifo_from_tid(ctx, tid);
+                        D_HT("HW queue empty: continue DELBA flow\n");
+                        il4965_txq_agg_disable(il, txq_id, ssn, tx_fifo);
+                        tid_data->agg.state = IL_AGG_OFF;
+                        ieee80211_stop_tx_ba_cb_irqsafe(ctx->vif, addr, tid);
+                }
+                break;
+        case IL_EMPTYING_HW_QUEUE_ADDBA:
+                /* We are reclaiming the last packet of the queue */
+                if (tid_data->tfds_in_queue == 0) {
+                        D_HT("HW queue empty: continue ADDBA flow\n");
+                        tid_data->agg.state = IL_AGG_ON;
+                        ieee80211_start_tx_ba_cb_irqsafe(ctx->vif, addr, tid);
+                }
+                break;
+        }
+
+        return 0;
+}
+
+static void
+il4965_non_agg_tx_status(struct il_priv *il, struct il_rxon_context *ctx,
+                         const u8 *addr1)
+{
+        struct ieee80211_sta *sta;
+        struct il_station_priv *sta_priv;
+
+        rcu_read_lock();
+        sta = ieee80211_find_sta(ctx->vif, addr1);
+        if (sta) {
+                sta_priv = (void *)sta->drv_priv;
+                /* avoid atomic ops if this isn't a client */
+                if (sta_priv->client &&
+                    atomic_dec_return(&sta_priv->pending_frames) == 0)
+                        ieee80211_sta_block_awake(il->hw, sta, false);
+        }
+        rcu_read_unlock();
+}
+
+static void
+il4965_tx_status(struct il_priv *il, struct il_tx_info *tx_info, bool is_agg)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx_info->skb->data;
+
+        if (!is_agg)
+                il4965_non_agg_tx_status(il, tx_info->ctx, hdr->addr1);
+
+        ieee80211_tx_status_irqsafe(il->hw, tx_info->skb);
+}
+
+int
+il4965_tx_queue_reclaim(struct il_priv *il, int txq_id, int idx)
+{
+        struct il_tx_queue *txq = &il->txq[txq_id];
+        struct il_queue *q = &txq->q;
+        struct il_tx_info *tx_info;
+        int nfreed = 0;
+        struct ieee80211_hdr *hdr;
+
+        if (idx >= q->n_bd || il_queue_used(q, idx) == 0) {
+                IL_ERR("Read idx for DMA queue txq id (%d), idx %d, "
+                       "is out of range [0-%d] %d %d.\n", txq_id, idx, q->n_bd,
+                       q->write_ptr, q->read_ptr);
+                return 0;
+        }
+
+        for (idx = il_queue_inc_wrap(idx, q->n_bd); q->read_ptr != idx;
+             q->read_ptr = il_queue_inc_wrap(q->read_ptr, q->n_bd)) {
+
+                tx_info = &txq->txb[txq->q.read_ptr];
+
+                if (WARN_ON_ONCE(tx_info->skb == NULL))
+                        continue;
+
+                hdr = (struct ieee80211_hdr *)tx_info->skb->data;
+                if (ieee80211_is_data_qos(hdr->frame_control))
+                        nfreed++;
+
+                il4965_tx_status(il, tx_info,
+                                 txq_id >= IL4965_FIRST_AMPDU_QUEUE);
+                tx_info->skb = NULL;
+
+                il->cfg->ops->lib->txq_free_tfd(il, txq);
+        }
+        return nfreed;
+}
+
+/**
+ * il4965_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
+il4965_tx_status_reply_compressed_ba(struct il_priv *il, struct il_ht_agg *agg,
+                                     struct il_compressed_ba_resp *ba_resp)
+{
+        int i, sh, ack;
+        u16 seq_ctl = le16_to_cpu(ba_resp->seq_ctl);
+        u16 scd_flow = le16_to_cpu(ba_resp->scd_flow);
+        int successes = 0;
+        struct ieee80211_tx_info *info;
+        u64 bitmap, sent_bitmap;
+
+        if (unlikely(!agg->wait_for_ba)) {
+                if (unlikely(ba_resp->bitmap))
+                        IL_ERR("Received BA when not expected\n");
+                return -EINVAL;
+        }
+
+        /* Mark that the expected block-ack response arrived */
+        agg->wait_for_ba = 0;
+        D_TX_REPLY("BA %d %d\n", agg->start_idx, ba_resp->seq_ctl);
+
+        /* Calculate shift to align block-ack bits with our Tx win bits */
+        sh = agg->start_idx - SEQ_TO_IDX(seq_ctl >> 4);
+        if (sh < 0)             /* tbw something is wrong with indices */
+                sh += 0x100;
+
+        if (agg->frame_count > (64 - sh)) {
+                D_TX_REPLY("more frames than bitmap size");
+                return -1;
+        }
+
+        /* don't use 64-bit values for now */
+        bitmap = le64_to_cpu(ba_resp->bitmap) >> sh;
+
+        /* check for success or failure according to the
+         * transmitted bitmap and block-ack bitmap */
+        sent_bitmap = bitmap & agg->bitmap;
+
+        /* For each frame attempted in aggregation,
+         * update driver's record of tx frame's status. */
+        i = 0;
+        while (sent_bitmap) {
+                ack = sent_bitmap & 1ULL;
+                successes += ack;
+                D_TX_REPLY("%s ON i=%d idx=%d raw=%d\n", ack ? "ACK" : "NACK",
+                           i, (agg->start_idx + i) & 0xff, agg->start_idx + i);
+                sent_bitmap >>= 1;
+                ++i;
+        }
+
+        D_TX_REPLY("Bitmap %llx\n", (unsigned long long)bitmap);
+
+        info = IEEE80211_SKB_CB(il->txq[scd_flow].txb[agg->start_idx].skb);
+        memset(&info->status, 0, sizeof(info->status));
+        info->flags |= IEEE80211_TX_STAT_ACK;
+        info->flags |= IEEE80211_TX_STAT_AMPDU;
+        info->status.ampdu_ack_len = successes;
+        info->status.ampdu_len = agg->frame_count;
+        il4965_hwrate_to_tx_control(il, agg->rate_n_flags, info);
+
+        return 0;
+}
+
+/**
+ * translate ucode response to mac80211 tx status control values
+ */
+void
+il4965_hwrate_to_tx_control(struct il_priv *il, u32 rate_n_flags,
+                            struct ieee80211_tx_info *info)
+{
+        struct ieee80211_tx_rate *r = &info->control.rates[0];
+
+        info->antenna_sel_tx =
+            ((rate_n_flags & RATE_MCS_ANT_ABC_MSK) >> RATE_MCS_ANT_POS);
+        if (rate_n_flags & RATE_MCS_HT_MSK)
+                r->flags |= IEEE80211_TX_RC_MCS;
+        if (rate_n_flags & RATE_MCS_GF_MSK)
+                r->flags |= IEEE80211_TX_RC_GREEN_FIELD;
+        if (rate_n_flags & RATE_MCS_HT40_MSK)
+                r->flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
+        if (rate_n_flags & RATE_MCS_DUP_MSK)
+                r->flags |= IEEE80211_TX_RC_DUP_DATA;
+        if (rate_n_flags & RATE_MCS_SGI_MSK)
+                r->flags |= IEEE80211_TX_RC_SHORT_GI;
+        r->idx = il4965_hwrate_to_mac80211_idx(rate_n_flags, info->band);
+}
+
+/**
+ * il4965_hdl_compressed_ba - Handler for N_COMPRESSED_BA
+ *
+ * Handles block-acknowledge notification from device, which reports success
+ * of frames sent via aggregation.
+ */
+void
+il4965_hdl_compressed_ba(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct il_compressed_ba_resp *ba_resp = &pkt->u.compressed_ba;
+        struct il_tx_queue *txq = NULL;
+        struct il_ht_agg *agg;
+        int idx;
+        int sta_id;
+        int tid;
+        unsigned long flags;
+
+        /* "flow" corresponds to Tx queue */
+        u16 scd_flow = le16_to_cpu(ba_resp->scd_flow);
+
+        /* "ssn" is start of block-ack Tx win, corresponds to idx
+         * (in Tx queue's circular buffer) of first TFD/frame in win */
+        u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn);
+
+        if (scd_flow >= il->hw_params.max_txq_num) {
+                IL_ERR("BUG_ON scd_flow is bigger than number of queues\n");
+                return;
+        }
+
+        txq = &il->txq[scd_flow];
+        sta_id = ba_resp->sta_id;
+        tid = ba_resp->tid;
+        agg = &il->stations[sta_id].tid[tid].agg;
+        if (unlikely(agg->txq_id != scd_flow)) {
+                /*
+                 * FIXME: this is a uCode bug which need to be addressed,
+                 * log the information and return for now!
+                 * since it is possible happen very often and in order
+                 * not to fill the syslog, don't enable the logging by default
+                 */
+                D_TX_REPLY("BA scd_flow %d does not match txq_id %d\n",
+                           scd_flow, agg->txq_id);
+                return;
+        }
+
+        /* Find idx just before block-ack win */
+        idx = il_queue_dec_wrap(ba_resp_scd_ssn & 0xff, txq->q.n_bd);
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+
+        D_TX_REPLY("N_COMPRESSED_BA [%d] Received from %pM, " "sta_id = %d\n",
+                   agg->wait_for_ba, (u8 *) &ba_resp->sta_addr_lo32,
+                   ba_resp->sta_id);
+        D_TX_REPLY("TID = %d, SeqCtl = %d, bitmap = 0x%llx," "scd_flow = "
+                   "%d, scd_ssn = %d\n", ba_resp->tid, ba_resp->seq_ctl,
+                   (unsigned long long)le64_to_cpu(ba_resp->bitmap),
+                   ba_resp->scd_flow, ba_resp->scd_ssn);
+        D_TX_REPLY("DAT start_idx = %d, bitmap = 0x%llx\n", agg->start_idx,
+                   (unsigned long long)agg->bitmap);
+
+        /* Update driver's record of ACK vs. not for each frame in win */
+        il4965_tx_status_reply_compressed_ba(il, agg, ba_resp);
+
+        /* Release all TFDs before the SSN, i.e. all TFDs in front of
+         * block-ack win (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)) {
+                /* calculate mac80211 ampdu sw queue to wake */
+                int freed = il4965_tx_queue_reclaim(il, scd_flow, idx);
+                il4965_free_tfds_in_queue(il, sta_id, tid, freed);
+
+                if (il_queue_space(&txq->q) > txq->q.low_mark &&
+                    il->mac80211_registered &&
+                    agg->state != IL_EMPTYING_HW_QUEUE_DELBA)
+                        il_wake_queue(il, txq);
+
+                il4965_txq_check_empty(il, sta_id, tid, scd_flow);
+        }
+
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+}
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+const char *
+il4965_get_tx_fail_reason(u32 status)
+{
+#define TX_STATUS_FAIL(x) case TX_STATUS_FAIL_ ## x: return #x
+#define TX_STATUS_POSTPONE(x) case TX_STATUS_POSTPONE_ ## x: return #x
+
+        switch (status & TX_STATUS_MSK) {
+        case TX_STATUS_SUCCESS:
+                return "SUCCESS";
+                TX_STATUS_POSTPONE(DELAY);
+                TX_STATUS_POSTPONE(FEW_BYTES);
+                TX_STATUS_POSTPONE(QUIET_PERIOD);
+                TX_STATUS_POSTPONE(CALC_TTAK);
+                TX_STATUS_FAIL(INTERNAL_CROSSED_RETRY);
+                TX_STATUS_FAIL(SHORT_LIMIT);
+                TX_STATUS_FAIL(LONG_LIMIT);
+                TX_STATUS_FAIL(FIFO_UNDERRUN);
+                TX_STATUS_FAIL(DRAIN_FLOW);
+                TX_STATUS_FAIL(RFKILL_FLUSH);
+                TX_STATUS_FAIL(LIFE_EXPIRE);
+                TX_STATUS_FAIL(DEST_PS);
+                TX_STATUS_FAIL(HOST_ABORTED);
+                TX_STATUS_FAIL(BT_RETRY);
+                TX_STATUS_FAIL(STA_INVALID);
+                TX_STATUS_FAIL(FRAG_DROPPED);
+                TX_STATUS_FAIL(TID_DISABLE);
+                TX_STATUS_FAIL(FIFO_FLUSHED);
+                TX_STATUS_FAIL(INSUFFICIENT_CF_POLL);
+                TX_STATUS_FAIL(PASSIVE_NO_RX);
+                TX_STATUS_FAIL(NO_BEACON_ON_RADAR);
+        }
+
+        return "UNKNOWN";
+
+#undef TX_STATUS_FAIL
+#undef TX_STATUS_POSTPONE
+}
+#endif /* CONFIG_IWLEGACY_DEBUG */
+
+static struct il_link_quality_cmd *
+il4965_sta_alloc_lq(struct il_priv *il, u8 sta_id)
+{
+        int i, r;
+        struct il_link_quality_cmd *link_cmd;
+        u32 rate_flags = 0;
+        __le32 rate_n_flags;
+
+        link_cmd = kzalloc(sizeof(struct il_link_quality_cmd), GFP_KERNEL);
+        if (!link_cmd) {
+                IL_ERR("Unable to allocate memory for LQ cmd.\n");
+                return NULL;
+        }
+        /* Set up the rate scaling to start at selected rate, fall back
+         * all the way down to 1M in IEEE order, and then spin on 1M */
+        if (il->band == IEEE80211_BAND_5GHZ)
+                r = RATE_6M_IDX;
+        else
+                r = RATE_1M_IDX;
+
+        if (r >= IL_FIRST_CCK_RATE && r <= IL_LAST_CCK_RATE)
+                rate_flags |= RATE_MCS_CCK_MSK;
+
+        rate_flags |=
+            il4965_first_antenna(il->hw_params.
+                                 valid_tx_ant) << RATE_MCS_ANT_POS;
+        rate_n_flags = il4965_hw_set_rate_n_flags(il_rates[r].plcp, rate_flags);
+        for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)
+                link_cmd->rs_table[i].rate_n_flags = rate_n_flags;
+
+        link_cmd->general_params.single_stream_ant_msk =
+            il4965_first_antenna(il->hw_params.valid_tx_ant);
+
+        link_cmd->general_params.dual_stream_ant_msk =
+            il->hw_params.valid_tx_ant & ~il4965_first_antenna(il->hw_params.
+                                                               valid_tx_ant);
+        if (!link_cmd->general_params.dual_stream_ant_msk) {
+                link_cmd->general_params.dual_stream_ant_msk = ANT_AB;
+        } else if (il4965_num_of_ant(il->hw_params.valid_tx_ant) == 2) {
+                link_cmd->general_params.dual_stream_ant_msk =
+                    il->hw_params.valid_tx_ant;
+        }
+
+        link_cmd->agg_params.agg_dis_start_th = LINK_QUAL_AGG_DISABLE_START_DEF;
+        link_cmd->agg_params.agg_time_limit =
+            cpu_to_le16(LINK_QUAL_AGG_TIME_LIMIT_DEF);
+
+        link_cmd->sta_id = sta_id;
+
+        return link_cmd;
+}
+
+/*
+ * il4965_add_bssid_station - Add the special IBSS BSSID station
+ *
+ * Function sleeps.
+ */
+int
+il4965_add_bssid_station(struct il_priv *il, struct il_rxon_context *ctx,
+                         const u8 *addr, u8 *sta_id_r)
+{
+        int ret;
+        u8 sta_id;
+        struct il_link_quality_cmd *link_cmd;
+        unsigned long flags;
+
+        if (sta_id_r)
+                *sta_id_r = IL_INVALID_STATION;
+
+        ret = il_add_station_common(il, ctx, addr, 0, NULL, &sta_id);
+        if (ret) {
+                IL_ERR("Unable to add station %pM\n", addr);
+                return ret;
+        }
+
+        if (sta_id_r)
+                *sta_id_r = sta_id;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        il->stations[sta_id].used |= IL_STA_LOCAL;
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        /* Set up default rate scaling table in device's station table */
+        link_cmd = il4965_sta_alloc_lq(il, sta_id);
+        if (!link_cmd) {
+                IL_ERR("Unable to initialize rate scaling for station %pM.\n",
+                       addr);
+                return -ENOMEM;
+        }
+
+        ret = il_send_lq_cmd(il, ctx, link_cmd, CMD_SYNC, true);
+        if (ret)
+                IL_ERR("Link quality command failed (%d)\n", ret);
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        il->stations[sta_id].lq = link_cmd;
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        return 0;
+}
+
+static int
+il4965_static_wepkey_cmd(struct il_priv *il, struct il_rxon_context *ctx,
+                         bool send_if_empty)
+{
+        int i, not_empty = 0;
+        u8 buff[sizeof(struct il_wep_cmd) +
+                sizeof(struct il_wep_key) * WEP_KEYS_MAX];
+        struct il_wep_cmd *wep_cmd = (struct il_wep_cmd *)buff;
+        size_t cmd_size = sizeof(struct il_wep_cmd);
+        struct il_host_cmd cmd = {
+                .id = ctx->wep_key_cmd,
+                .data = wep_cmd,
+                .flags = CMD_SYNC,
+        };
+
+        might_sleep();
+
+        memset(wep_cmd, 0,
+               cmd_size + (sizeof(struct il_wep_key) * WEP_KEYS_MAX));
+
+        for (i = 0; i < WEP_KEYS_MAX; i++) {
+                wep_cmd->key[i].key_idx = i;
+                if (ctx->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 = ctx->wep_keys[i].key_size;
+                memcpy(&wep_cmd->key[i].key[3], ctx->wep_keys[i].key,
+                       ctx->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 il_wep_key) * WEP_KEYS_MAX;
+
+        cmd.len = cmd_size;
+
+        if (not_empty || send_if_empty)
+                return il_send_cmd(il, &cmd);
+        else
+                return 0;
+}
+
+int
+il4965_restore_default_wep_keys(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        lockdep_assert_held(&il->mutex);
+
+        return il4965_static_wepkey_cmd(il, ctx, false);
+}
+
+int
+il4965_remove_default_wep_key(struct il_priv *il, struct il_rxon_context *ctx,
+                              struct ieee80211_key_conf *keyconf)
+{
+        int ret;
+
+        lockdep_assert_held(&il->mutex);
+
+        D_WEP("Removing default WEP key: idx=%d\n", keyconf->keyidx);
+
+        memset(&ctx->wep_keys[keyconf->keyidx], 0, sizeof(ctx->wep_keys[0]));
+        if (il_is_rfkill(il)) {
+                D_WEP("Not sending C_WEPKEY command due to RFKILL.\n");
+                /* but keys in device are clear anyway so return success */
+                return 0;
+        }
+        ret = il4965_static_wepkey_cmd(il, ctx, 1);
+        D_WEP("Remove default WEP key: idx=%d ret=%d\n", keyconf->keyidx, ret);
+
+        return ret;
+}
+
+int
+il4965_set_default_wep_key(struct il_priv *il, struct il_rxon_context *ctx,
+                           struct ieee80211_key_conf *keyconf)
+{
+        int ret;
+
+        lockdep_assert_held(&il->mutex);
+
+        if (keyconf->keylen != WEP_KEY_LEN_128 &&
+            keyconf->keylen != WEP_KEY_LEN_64) {
+                D_WEP("Bad WEP key length %d\n", keyconf->keylen);
+                return -EINVAL;
+        }
+
+        keyconf->flags &= ~IEEE80211_KEY_FLAG_GENERATE_IV;
+        keyconf->hw_key_idx = HW_KEY_DEFAULT;
+        il->stations[ctx->ap_sta_id].keyinfo.cipher = keyconf->cipher;
+
+        ctx->wep_keys[keyconf->keyidx].key_size = keyconf->keylen;
+        memcpy(&ctx->wep_keys[keyconf->keyidx].key, &keyconf->key,
+               keyconf->keylen);
+
+        ret = il4965_static_wepkey_cmd(il, ctx, false);
+        D_WEP("Set default WEP key: len=%d idx=%d ret=%d\n", keyconf->keylen,
+              keyconf->keyidx, ret);
+
+        return ret;
+}
+
+static int
+il4965_set_wep_dynamic_key_info(struct il_priv *il, struct il_rxon_context *ctx,
+                                struct ieee80211_key_conf *keyconf, u8 sta_id)
+{
+        unsigned long flags;
+        __le16 key_flags = 0;
+        struct il_addsta_cmd sta_cmd;
+
+        lockdep_assert_held(&il->mutex);
+
+        keyconf->flags &= ~IEEE80211_KEY_FLAG_GENERATE_IV;
+
+        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 == ctx->bcast_sta_id)
+                key_flags |= STA_KEY_MULTICAST_MSK;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+
+        il->stations[sta_id].keyinfo.cipher = keyconf->cipher;
+        il->stations[sta_id].keyinfo.keylen = keyconf->keylen;
+        il->stations[sta_id].keyinfo.keyidx = keyconf->keyidx;
+
+        memcpy(il->stations[sta_id].keyinfo.key, keyconf->key, keyconf->keylen);
+
+        memcpy(&il->stations[sta_id].sta.key.key[3], keyconf->key,
+               keyconf->keylen);
+
+        if ((il->stations[sta_id].sta.key.
+             key_flags & STA_KEY_FLG_ENCRYPT_MSK) == STA_KEY_FLG_NO_ENC)
+                il->stations[sta_id].sta.key.key_offset =
+                    il_get_free_ucode_key_idx(il);
+        /* else, we are overriding an existing key => no need to allocated room
+         * in uCode. */
+
+        WARN(il->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,
+             "no space for a new key");
+
+        il->stations[sta_id].sta.key.key_flags = key_flags;
+        il->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
+        il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
+
+        memcpy(&sta_cmd, &il->stations[sta_id].sta,
+               sizeof(struct il_addsta_cmd));
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        return il_send_add_sta(il, &sta_cmd, CMD_SYNC);
+}
+
+static int
+il4965_set_ccmp_dynamic_key_info(struct il_priv *il,
+                                 struct il_rxon_context *ctx,
+                                 struct ieee80211_key_conf *keyconf, u8 sta_id)
+{
+        unsigned long flags;
+        __le16 key_flags = 0;
+        struct il_addsta_cmd sta_cmd;
+
+        lockdep_assert_held(&il->mutex);
+
+        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 == ctx->bcast_sta_id)
+                key_flags |= STA_KEY_MULTICAST_MSK;
+
+        keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        il->stations[sta_id].keyinfo.cipher = keyconf->cipher;
+        il->stations[sta_id].keyinfo.keylen = keyconf->keylen;
+
+        memcpy(il->stations[sta_id].keyinfo.key, keyconf->key, keyconf->keylen);
+
+        memcpy(il->stations[sta_id].sta.key.key, keyconf->key, keyconf->keylen);
+
+        if ((il->stations[sta_id].sta.key.
+             key_flags & STA_KEY_FLG_ENCRYPT_MSK) == STA_KEY_FLG_NO_ENC)
+                il->stations[sta_id].sta.key.key_offset =
+                    il_get_free_ucode_key_idx(il);
+        /* else, we are overriding an existing key => no need to allocated room
+         * in uCode. */
+
+        WARN(il->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,
+             "no space for a new key");
+
+        il->stations[sta_id].sta.key.key_flags = key_flags;
+        il->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
+        il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
+
+        memcpy(&sta_cmd, &il->stations[sta_id].sta,
+               sizeof(struct il_addsta_cmd));
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        return il_send_add_sta(il, &sta_cmd, CMD_SYNC);
+}
+
+static int
+il4965_set_tkip_dynamic_key_info(struct il_priv *il,
+                                 struct il_rxon_context *ctx,
+                                 struct ieee80211_key_conf *keyconf, u8 sta_id)
+{
+        unsigned long flags;
+        int ret = 0;
+        __le16 key_flags = 0;
+
+        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 == ctx->bcast_sta_id)
+                key_flags |= STA_KEY_MULTICAST_MSK;
+
+        keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
+        keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+
+        il->stations[sta_id].keyinfo.cipher = keyconf->cipher;
+        il->stations[sta_id].keyinfo.keylen = 16;
+
+        if ((il->stations[sta_id].sta.key.
+             key_flags & STA_KEY_FLG_ENCRYPT_MSK) == STA_KEY_FLG_NO_ENC)
+                il->stations[sta_id].sta.key.key_offset =
+                    il_get_free_ucode_key_idx(il);
+        /* else, we are overriding an existing key => no need to allocated room
+         * in uCode. */
+
+        WARN(il->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,
+             "no space for a new key");
+
+        il->stations[sta_id].sta.key.key_flags = key_flags;
+
+        /* This copy is acutally not needed: we get the key with each TX */
+        memcpy(il->stations[sta_id].keyinfo.key, keyconf->key, 16);
+
+        memcpy(il->stations[sta_id].sta.key.key, keyconf->key, 16);
+
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        return ret;
+}
+
+void
+il4965_update_tkip_key(struct il_priv *il, struct il_rxon_context *ctx,
+                       struct ieee80211_key_conf *keyconf,
+                       struct ieee80211_sta *sta, u32 iv32, u16 * phase1key)
+{
+        u8 sta_id;
+        unsigned long flags;
+        int i;
+
+        if (il_scan_cancel(il)) {
+                /* cancel scan failed, just live w/ bad key and rely
+                   briefly on SW decryption */
+                return;
+        }
+
+        sta_id = il_sta_id_or_broadcast(il, ctx, sta);
+        if (sta_id == IL_INVALID_STATION)
+                return;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+
+        il->stations[sta_id].sta.key.tkip_rx_tsc_byte2 = (u8) iv32;
+
+        for (i = 0; i < 5; i++)
+                il->stations[sta_id].sta.key.tkip_rx_ttak[i] =
+                    cpu_to_le16(phase1key[i]);
+
+        il->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
+        il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
+
+        il_send_add_sta(il, &il->stations[sta_id].sta, CMD_ASYNC);
+
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+}
+
+int
+il4965_remove_dynamic_key(struct il_priv *il, struct il_rxon_context *ctx,
+                          struct ieee80211_key_conf *keyconf, u8 sta_id)
+{
+        unsigned long flags;
+        u16 key_flags;
+        u8 keyidx;
+        struct il_addsta_cmd sta_cmd;
+
+        lockdep_assert_held(&il->mutex);
+
+        ctx->key_mapping_keys--;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        key_flags = le16_to_cpu(il->stations[sta_id].sta.key.key_flags);
+        keyidx = (key_flags >> STA_KEY_FLG_KEYID_POS) & 0x3;
+
+        D_WEP("Remove dynamic key: idx=%d sta=%d\n", keyconf->keyidx, sta_id);
+
+        if (keyconf->keyidx != keyidx) {
+                /* We need to remove a key with idx different that the one
+                 * in the uCode. This means that the key we need to remove has
+                 * been replaced by another one with different idx.
+                 * Don't do anything and return ok
+                 */
+                spin_unlock_irqrestore(&il->sta_lock, flags);
+                return 0;
+        }
+
+        if (il->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET) {
+                IL_WARN("Removing wrong key %d 0x%x\n", keyconf->keyidx,
+                        key_flags);
+                spin_unlock_irqrestore(&il->sta_lock, flags);
+                return 0;
+        }
+
+        if (!test_and_clear_bit
+            (il->stations[sta_id].sta.key.key_offset, &il->ucode_key_table))
+                IL_ERR("idx %d not used in uCode key table.\n",
+                       il->stations[sta_id].sta.key.key_offset);
+        memset(&il->stations[sta_id].keyinfo, 0, sizeof(struct il_hw_key));
+        memset(&il->stations[sta_id].sta.key, 0, sizeof(struct il4965_keyinfo));
+        il->stations[sta_id].sta.key.key_flags =
+            STA_KEY_FLG_NO_ENC | STA_KEY_FLG_INVALID;
+        il->stations[sta_id].sta.key.key_offset = WEP_INVALID_OFFSET;
+        il->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
+        il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
+
+        if (il_is_rfkill(il)) {
+                D_WEP
+                    ("Not sending C_ADD_STA command because RFKILL enabled.\n");
+                spin_unlock_irqrestore(&il->sta_lock, flags);
+                return 0;
+        }
+        memcpy(&sta_cmd, &il->stations[sta_id].sta,
+               sizeof(struct il_addsta_cmd));
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        return il_send_add_sta(il, &sta_cmd, CMD_SYNC);
+}
+
+int
+il4965_set_dynamic_key(struct il_priv *il, struct il_rxon_context *ctx,
+                       struct ieee80211_key_conf *keyconf, u8 sta_id)
+{
+        int ret;
+
+        lockdep_assert_held(&il->mutex);
+
+        ctx->key_mapping_keys++;
+        keyconf->hw_key_idx = HW_KEY_DYNAMIC;
+
+        switch (keyconf->cipher) {
+        case WLAN_CIPHER_SUITE_CCMP:
+                ret =
+                    il4965_set_ccmp_dynamic_key_info(il, ctx, keyconf, sta_id);
+                break;
+        case WLAN_CIPHER_SUITE_TKIP:
+                ret =
+                    il4965_set_tkip_dynamic_key_info(il, ctx, keyconf, sta_id);
+                break;
+        case WLAN_CIPHER_SUITE_WEP40:
+        case WLAN_CIPHER_SUITE_WEP104:
+                ret = il4965_set_wep_dynamic_key_info(il, ctx, keyconf, sta_id);
+                break;
+        default:
+                IL_ERR("Unknown alg: %s cipher = %x\n", __func__,
+                       keyconf->cipher);
+                ret = -EINVAL;
+        }
+
+        D_WEP("Set dynamic key: cipher=%x len=%d idx=%d sta=%d ret=%d\n",
+              keyconf->cipher, keyconf->keylen, keyconf->keyidx, sta_id, ret);
+
+        return ret;
+}
+
+/**
+ * il4965_alloc_bcast_station - add broadcast station into driver's station table.
+ *
+ * This adds the broadcast station into the driver's station table
+ * and marks it driver active, so that it will be restored to the
+ * device at the next best time.
+ */
+int
+il4965_alloc_bcast_station(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        struct il_link_quality_cmd *link_cmd;
+        unsigned long flags;
+        u8 sta_id;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        sta_id = il_prep_station(il, ctx, il_bcast_addr, false, NULL);
+        if (sta_id == IL_INVALID_STATION) {
+                IL_ERR("Unable to prepare broadcast station\n");
+                spin_unlock_irqrestore(&il->sta_lock, flags);
+
+                return -EINVAL;
+        }
+
+        il->stations[sta_id].used |= IL_STA_DRIVER_ACTIVE;
+        il->stations[sta_id].used |= IL_STA_BCAST;
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        link_cmd = il4965_sta_alloc_lq(il, sta_id);
+        if (!link_cmd) {
+                IL_ERR
+                    ("Unable to initialize rate scaling for bcast station.\n");
+                return -ENOMEM;
+        }
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        il->stations[sta_id].lq = link_cmd;
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        return 0;
+}
+
+/**
+ * il4965_update_bcast_station - update broadcast station's LQ command
+ *
+ * Only used by iwl4965. Placed here to have all bcast station management
+ * code together.
+ */
+static int
+il4965_update_bcast_station(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        unsigned long flags;
+        struct il_link_quality_cmd *link_cmd;
+        u8 sta_id = ctx->bcast_sta_id;
+
+        link_cmd = il4965_sta_alloc_lq(il, sta_id);
+        if (!link_cmd) {
+                IL_ERR("Unable to initialize rate scaling for bcast sta.\n");
+                return -ENOMEM;
+        }
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        if (il->stations[sta_id].lq)
+                kfree(il->stations[sta_id].lq);
+        else
+                D_INFO("Bcast sta rate scaling has not been initialized.\n");
+        il->stations[sta_id].lq = link_cmd;
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        return 0;
+}
+
+int
+il4965_update_bcast_stations(struct il_priv *il)
+{
+        return il4965_update_bcast_station(il, &il->ctx);
+}
+
+/**
+ * il4965_sta_tx_modify_enable_tid - Enable Tx for this TID in station table
+ */
+int
+il4965_sta_tx_modify_enable_tid(struct il_priv *il, int sta_id, int tid)
+{
+        unsigned long flags;
+        struct il_addsta_cmd sta_cmd;
+
+        lockdep_assert_held(&il->mutex);
+
+        /* Remove "disable" flag, to enable Tx for this TID */
+        spin_lock_irqsave(&il->sta_lock, flags);
+        il->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_TID_DISABLE_TX;
+        il->stations[sta_id].sta.tid_disable_tx &= cpu_to_le16(~(1 << tid));
+        il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
+        memcpy(&sta_cmd, &il->stations[sta_id].sta,
+               sizeof(struct il_addsta_cmd));
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        return il_send_add_sta(il, &sta_cmd, CMD_SYNC);
+}
+
+int
+il4965_sta_rx_agg_start(struct il_priv *il, struct ieee80211_sta *sta, int tid,
+                        u16 ssn)
+{
+        unsigned long flags;
+        int sta_id;
+        struct il_addsta_cmd sta_cmd;
+
+        lockdep_assert_held(&il->mutex);
+
+        sta_id = il_sta_id(sta);
+        if (sta_id == IL_INVALID_STATION)
+                return -ENXIO;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        il->stations[sta_id].sta.station_flags_msk = 0;
+        il->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_ADDBA_TID_MSK;
+        il->stations[sta_id].sta.add_immediate_ba_tid = (u8) tid;
+        il->stations[sta_id].sta.add_immediate_ba_ssn = cpu_to_le16(ssn);
+        il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
+        memcpy(&sta_cmd, &il->stations[sta_id].sta,
+               sizeof(struct il_addsta_cmd));
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        return il_send_add_sta(il, &sta_cmd, CMD_SYNC);
+}
+
+int
+il4965_sta_rx_agg_stop(struct il_priv *il, struct ieee80211_sta *sta, int tid)
+{
+        unsigned long flags;
+        int sta_id;
+        struct il_addsta_cmd sta_cmd;
+
+        lockdep_assert_held(&il->mutex);
+
+        sta_id = il_sta_id(sta);
+        if (sta_id == IL_INVALID_STATION) {
+                IL_ERR("Invalid station for AGG tid %d\n", tid);
+                return -ENXIO;
+        }
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        il->stations[sta_id].sta.station_flags_msk = 0;
+        il->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_DELBA_TID_MSK;
+        il->stations[sta_id].sta.remove_immediate_ba_tid = (u8) tid;
+        il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
+        memcpy(&sta_cmd, &il->stations[sta_id].sta,
+               sizeof(struct il_addsta_cmd));
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        return il_send_add_sta(il, &sta_cmd, CMD_SYNC);
+}
+
+void
+il4965_sta_modify_sleep_tx_count(struct il_priv *il, int sta_id, int cnt)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        il->stations[sta_id].sta.station_flags |= STA_FLG_PWR_SAVE_MSK;
+        il->stations[sta_id].sta.station_flags_msk = STA_FLG_PWR_SAVE_MSK;
+        il->stations[sta_id].sta.sta.modify_mask =
+            STA_MODIFY_SLEEP_TX_COUNT_MSK;
+        il->stations[sta_id].sta.sleep_tx_count = cpu_to_le16(cnt);
+        il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
+        il_send_add_sta(il, &il->stations[sta_id].sta, CMD_ASYNC);
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+}
+
+void
+il4965_update_chain_flags(struct il_priv *il)
+{
+        if (il->cfg->ops->hcmd->set_rxon_chain) {
+                il->cfg->ops->hcmd->set_rxon_chain(il, &il->ctx);
+                if (il->ctx.active.rx_chain != il->ctx.staging.rx_chain)
+                        il_commit_rxon(il, &il->ctx);
+        }
+}
+
+static void
+il4965_clear_free_frames(struct il_priv *il)
+{
+        struct list_head *element;
+
+        D_INFO("%d frames on pre-allocated heap on clear.\n", il->frames_count);
+
+        while (!list_empty(&il->free_frames)) {
+                element = il->free_frames.next;
+                list_del(element);
+                kfree(list_entry(element, struct il_frame, list));
+                il->frames_count--;
+        }
+
+        if (il->frames_count) {
+                IL_WARN("%d frames still in use.  Did we lose one?\n",
+                        il->frames_count);
+                il->frames_count = 0;
+        }
+}
+
+static struct il_frame *
+il4965_get_free_frame(struct il_priv *il)
+{
+        struct il_frame *frame;
+        struct list_head *element;
+        if (list_empty(&il->free_frames)) {
+                frame = kzalloc(sizeof(*frame), GFP_KERNEL);
+                if (!frame) {
+                        IL_ERR("Could not allocate frame!\n");
+                        return NULL;
+                }
+
+                il->frames_count++;
+                return frame;
+        }
+
+        element = il->free_frames.next;
+        list_del(element);
+        return list_entry(element, struct il_frame, list);
+}
+
+static void
+il4965_free_frame(struct il_priv *il, struct il_frame *frame)
+{
+        memset(frame, 0, sizeof(*frame));
+        list_add(&frame->list, &il->free_frames);
+}
+
+static u32
+il4965_fill_beacon_frame(struct il_priv *il, struct ieee80211_hdr *hdr,
+                         int left)
+{
+        lockdep_assert_held(&il->mutex);
+
+        if (!il->beacon_skb)
+                return 0;
+
+        if (il->beacon_skb->len > left)
+                return 0;
+
+        memcpy(hdr, il->beacon_skb->data, il->beacon_skb->len);
+
+        return il->beacon_skb->len;
+}
+
+/* Parse the beacon frame to find the TIM element and set tim_idx & tim_size */
+static void
+il4965_set_beacon_tim(struct il_priv *il,
+                      struct il_tx_beacon_cmd *tx_beacon_cmd, u8 * beacon,
+                      u32 frame_size)
+{
+        u16 tim_idx;
+        struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)beacon;
+
+        /*
+         * The idx is relative to frame start but we start looking at the
+         * variable-length part of the beacon.
+         */
+        tim_idx = mgmt->u.beacon.variable - beacon;
+
+        /* Parse variable-length elements of beacon to find WLAN_EID_TIM */
+        while ((tim_idx < (frame_size - 2)) &&
+               (beacon[tim_idx] != WLAN_EID_TIM))
+                tim_idx += beacon[tim_idx + 1] + 2;
+
+        /* If TIM field was found, set variables */
+        if ((tim_idx < (frame_size - 1)) && (beacon[tim_idx] == WLAN_EID_TIM)) {
+                tx_beacon_cmd->tim_idx = cpu_to_le16(tim_idx);
+                tx_beacon_cmd->tim_size = beacon[tim_idx + 1];
+        } else
+                IL_WARN("Unable to find TIM Element in beacon\n");
+}
+
+static unsigned int
+il4965_hw_get_beacon_cmd(struct il_priv *il, struct il_frame *frame)
+{
+        struct il_tx_beacon_cmd *tx_beacon_cmd;
+        u32 frame_size;
+        u32 rate_flags;
+        u32 rate;
+        /*
+         * We have to set up the TX command, the TX Beacon command, and the
+         * beacon contents.
+         */
+
+        lockdep_assert_held(&il->mutex);
+
+        if (!il->beacon_ctx) {
+                IL_ERR("trying to build beacon w/o beacon context!\n");
+                return 0;
+        }
+
+        /* Initialize memory */
+        tx_beacon_cmd = &frame->u.beacon;
+        memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd));
+
+        /* Set up TX beacon contents */
+        frame_size =
+            il4965_fill_beacon_frame(il, tx_beacon_cmd->frame,
+                                     sizeof(frame->u) - sizeof(*tx_beacon_cmd));
+        if (WARN_ON_ONCE(frame_size > MAX_MPDU_SIZE))
+                return 0;
+        if (!frame_size)
+                return 0;
+
+        /* Set up TX command fields */
+        tx_beacon_cmd->tx.len = cpu_to_le16((u16) frame_size);
+        tx_beacon_cmd->tx.sta_id = il->beacon_ctx->bcast_sta_id;
+        tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
+        tx_beacon_cmd->tx.tx_flags =
+            TX_CMD_FLG_SEQ_CTL_MSK | TX_CMD_FLG_TSF_MSK |
+            TX_CMD_FLG_STA_RATE_MSK;
+
+        /* Set up TX beacon command fields */
+        il4965_set_beacon_tim(il, tx_beacon_cmd, (u8 *) tx_beacon_cmd->frame,
+                              frame_size);
+
+        /* Set up packet rate and flags */
+        rate = il_get_lowest_plcp(il, il->beacon_ctx);
+        il->mgmt_tx_ant =
+            il4965_toggle_tx_ant(il, il->mgmt_tx_ant,
+                                 il->hw_params.valid_tx_ant);
+        rate_flags = il4965_ant_idx_to_flags(il->mgmt_tx_ant);
+        if ((rate >= IL_FIRST_CCK_RATE) && (rate <= IL_LAST_CCK_RATE))
+                rate_flags |= RATE_MCS_CCK_MSK;
+        tx_beacon_cmd->tx.rate_n_flags =
+            il4965_hw_set_rate_n_flags(rate, rate_flags);
+
+        return sizeof(*tx_beacon_cmd) + frame_size;
+}
+
+int
+il4965_send_beacon_cmd(struct il_priv *il)
+{
+        struct il_frame *frame;
+        unsigned int frame_size;
+        int rc;
+
+        frame = il4965_get_free_frame(il);
+        if (!frame) {
+                IL_ERR("Could not obtain free frame buffer for beacon "
+                       "command.\n");
+                return -ENOMEM;
+        }
+
+        frame_size = il4965_hw_get_beacon_cmd(il, frame);
+        if (!frame_size) {
+                IL_ERR("Error configuring the beacon command\n");
+                il4965_free_frame(il, frame);
+                return -EINVAL;
+        }
+
+        rc = il_send_cmd_pdu(il, C_TX_BEACON, frame_size, &frame->u.cmd[0]);
+
+        il4965_free_frame(il, frame);
+
+        return rc;
+}
+
+static inline dma_addr_t
+il4965_tfd_tb_get_addr(struct il_tfd *tfd, u8 idx)
+{
+        struct il_tfd_tb *tb = &tfd->tbs[idx];
+
+        dma_addr_t addr = get_unaligned_le32(&tb->lo);
+        if (sizeof(dma_addr_t) > sizeof(u32))
+                addr |=
+                    ((dma_addr_t) (le16_to_cpu(tb->hi_n_len) & 0xF) << 16) <<
+                    16;
+
+        return addr;
+}
+
+static inline u16
+il4965_tfd_tb_get_len(struct il_tfd *tfd, u8 idx)
+{
+        struct il_tfd_tb *tb = &tfd->tbs[idx];
+
+        return le16_to_cpu(tb->hi_n_len) >> 4;
+}
+
+static inline void
+il4965_tfd_set_tb(struct il_tfd *tfd, u8 idx, dma_addr_t addr, u16 len)
+{
+        struct il_tfd_tb *tb = &tfd->tbs[idx];
+        u16 hi_n_len = len << 4;
+
+        put_unaligned_le32(addr, &tb->lo);
+        if (sizeof(dma_addr_t) > sizeof(u32))
+                hi_n_len |= ((addr >> 16) >> 16) & 0xF;
+
+        tb->hi_n_len = cpu_to_le16(hi_n_len);
+
+        tfd->num_tbs = idx + 1;
+}
+
+static inline u8
+il4965_tfd_get_num_tbs(struct il_tfd *tfd)
+{
+        return tfd->num_tbs & 0x1f;
+}
+
+/**
+ * il4965_hw_txq_free_tfd - Free all chunks referenced by TFD [txq->q.read_ptr]
+ * @il - driver ilate data
+ * @txq - tx queue
+ *
+ * Does NOT advance any TFD circular buffer read/write idxes
+ * Does NOT free the TFD itself (which is within circular buffer)
+ */
+void
+il4965_hw_txq_free_tfd(struct il_priv *il, struct il_tx_queue *txq)
+{
+        struct il_tfd *tfd_tmp = (struct il_tfd *)txq->tfds;
+        struct il_tfd *tfd;
+        struct pci_dev *dev = il->pci_dev;
+        int idx = txq->q.read_ptr;
+        int i;
+        int num_tbs;
+
+        tfd = &tfd_tmp[idx];
+
+        /* Sanity check on number of chunks */
+        num_tbs = il4965_tfd_get_num_tbs(tfd);
+
+        if (num_tbs >= IL_NUM_OF_TBS) {
+                IL_ERR("Too many chunks: %i\n", num_tbs);
+                /* @todo issue fatal error, it is quite serious situation */
+                return;
+        }
+
+        /* Unmap tx_cmd */
+        if (num_tbs)
+                pci_unmap_single(dev, dma_unmap_addr(&txq->meta[idx], mapping),
+                                 dma_unmap_len(&txq->meta[idx], len),
+                                 PCI_DMA_BIDIRECTIONAL);
+
+        /* Unmap chunks, if any. */
+        for (i = 1; i < num_tbs; i++)
+                pci_unmap_single(dev, il4965_tfd_tb_get_addr(tfd, i),
+                                 il4965_tfd_tb_get_len(tfd, i),
+                                 PCI_DMA_TODEVICE);
+
+        /* free SKB */
+        if (txq->txb) {
+                struct sk_buff *skb;
+
+                skb = txq->txb[txq->q.read_ptr].skb;
+
+                /* can be called from irqs-disabled context */
+                if (skb) {
+                        dev_kfree_skb_any(skb);
+                        txq->txb[txq->q.read_ptr].skb = NULL;
+                }
+        }
+}
+
+int
+il4965_hw_txq_attach_buf_to_tfd(struct il_priv *il, struct il_tx_queue *txq,
+                                dma_addr_t addr, u16 len, u8 reset, u8 pad)
+{
+        struct il_queue *q;
+        struct il_tfd *tfd, *tfd_tmp;
+        u32 num_tbs;
+
+        q = &txq->q;
+        tfd_tmp = (struct il_tfd *)txq->tfds;
+        tfd = &tfd_tmp[q->write_ptr];
+
+        if (reset)
+                memset(tfd, 0, sizeof(*tfd));
+
+        num_tbs = il4965_tfd_get_num_tbs(tfd);
+
+        /* Each TFD can point to a maximum 20 Tx buffers */
+        if (num_tbs >= IL_NUM_OF_TBS) {
+                IL_ERR("Error can not send more than %d chunks\n",
+                       IL_NUM_OF_TBS);
+                return -EINVAL;
+        }
+
+        BUG_ON(addr & ~DMA_BIT_MASK(36));
+        if (unlikely(addr & ~IL_TX_DMA_MASK))
+                IL_ERR("Unaligned address = %llx\n", (unsigned long long)addr);
+
+        il4965_tfd_set_tb(tfd, num_tbs, addr, len);
+
+        return 0;
+}
+
+/*
+ * Tell nic where to find circular buffer of Tx Frame Descriptors for
+ * given Tx queue, and enable the DMA channel used for that queue.
+ *
+ * 4965 supports up to 16 Tx queues in DRAM, mapped to up to 8 Tx DMA
+ * channels supported in hardware.
+ */
+int
+il4965_hw_tx_queue_init(struct il_priv *il, struct il_tx_queue *txq)
+{
+        int txq_id = txq->q.id;
+
+        /* Circular buffer (TFD queue in DRAM) physical base address */
+        il_wr(il, FH49_MEM_CBBC_QUEUE(txq_id), txq->q.dma_addr >> 8);
+
+        return 0;
+}
+
+/******************************************************************************
+ *
+ * Generic RX handler implementations
+ *
+ ******************************************************************************/
+static void
+il4965_hdl_alive(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct il_alive_resp *palive;
+        struct delayed_work *pwork;
+
+        palive = &pkt->u.alive_frame;
+
+        D_INFO("Alive ucode status 0x%08X revision " "0x%01X 0x%01X\n",
+               palive->is_valid, palive->ver_type, palive->ver_subtype);
+
+        if (palive->ver_subtype == INITIALIZE_SUBTYPE) {
+                D_INFO("Initialization Alive received.\n");
+                memcpy(&il->card_alive_init, &pkt->u.alive_frame,
+                       sizeof(struct il_init_alive_resp));
+                pwork = &il->init_alive_start;
+        } else {
+                D_INFO("Runtime Alive received.\n");
+                memcpy(&il->card_alive, &pkt->u.alive_frame,
+                       sizeof(struct il_alive_resp));
+                pwork = &il->alive_start;
+        }
+
+        /* We delay the ALIVE response by 5ms to
+         * give the HW RF Kill time to activate... */
+        if (palive->is_valid == UCODE_VALID_OK)
+                queue_delayed_work(il->workqueue, pwork, msecs_to_jiffies(5));
+        else
+                IL_WARN("uCode did not respond OK.\n");
+}
+
+/**
+ * il4965_bg_stats_periodic - Timer callback to queue stats
+ *
+ * This callback is provided in order to send a stats request.
+ *
+ * This timer function is continually reset to execute within
+ * REG_RECALIB_PERIOD seconds since the last N_STATS
+ * was received.  We need to ensure we receive the stats in order
+ * to update the temperature used for calibrating the TXPOWER.
+ */
+static void
+il4965_bg_stats_periodic(unsigned long data)
+{
+        struct il_priv *il = (struct il_priv *)data;
+
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                return;
+
+        /* dont send host command if rf-kill is on */
+        if (!il_is_ready_rf(il))
+                return;
+
+        il_send_stats_request(il, CMD_ASYNC, false);
+}
+
+static void
+il4965_hdl_beacon(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct il4965_beacon_notif *beacon =
+            (struct il4965_beacon_notif *)pkt->u.raw;
+#ifdef CONFIG_IWLEGACY_DEBUG
+        u8 rate = il4965_hw_get_rate(beacon->beacon_notify_hdr.rate_n_flags);
+
+        D_RX("beacon status %x retries %d iss %d " "tsf %d %d rate %d\n",
+             le32_to_cpu(beacon->beacon_notify_hdr.u.status) & TX_STATUS_MSK,
+             beacon->beacon_notify_hdr.failure_frame,
+             le32_to_cpu(beacon->ibss_mgr_status),
+             le32_to_cpu(beacon->high_tsf), le32_to_cpu(beacon->low_tsf), rate);
+#endif
+
+        il->ibss_manager = le32_to_cpu(beacon->ibss_mgr_status);
+}
+
+static void
+il4965_perform_ct_kill_task(struct il_priv *il)
+{
+        unsigned long flags;
+
+        D_POWER("Stop all queues\n");
+
+        if (il->mac80211_registered)
+                ieee80211_stop_queues(il->hw);
+
+        _il_wr(il, CSR_UCODE_DRV_GP1_SET,
+               CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);
+        _il_rd(il, CSR_UCODE_DRV_GP1);
+
+        spin_lock_irqsave(&il->reg_lock, flags);
+        if (!_il_grab_nic_access(il))
+                _il_release_nic_access(il);
+        spin_unlock_irqrestore(&il->reg_lock, flags);
+}
+
+/* Handle notification from uCode that card's power state is changing
+ * due to software, hardware, or critical temperature RFKILL */
+static void
+il4965_hdl_card_state(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags);
+        unsigned long status = il->status;
+
+        D_RF_KILL("Card state received: HW:%s SW:%s CT:%s\n",
+                  (flags & HW_CARD_DISABLED) ? "Kill" : "On",
+                  (flags & SW_CARD_DISABLED) ? "Kill" : "On",
+                  (flags & CT_CARD_DISABLED) ? "Reached" : "Not reached");
+
+        if (flags & (SW_CARD_DISABLED | HW_CARD_DISABLED | CT_CARD_DISABLED)) {
+
+                _il_wr(il, CSR_UCODE_DRV_GP1_SET,
+                       CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
+
+                il_wr(il, HBUS_TARG_MBX_C, HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED);
+
+                if (!(flags & RXON_CARD_DISABLED)) {
+                        _il_wr(il, CSR_UCODE_DRV_GP1_CLR,
+                               CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
+                        il_wr(il, HBUS_TARG_MBX_C,
+                              HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED);
+                }
+        }
+
+        if (flags & CT_CARD_DISABLED)
+                il4965_perform_ct_kill_task(il);
+
+        if (flags & HW_CARD_DISABLED)
+                set_bit(S_RF_KILL_HW, &il->status);
+        else
+                clear_bit(S_RF_KILL_HW, &il->status);
+
+        if (!(flags & RXON_CARD_DISABLED))
+                il_scan_cancel(il);
+
+        if ((test_bit(S_RF_KILL_HW, &status) !=
+             test_bit(S_RF_KILL_HW, &il->status)))
+                wiphy_rfkill_set_hw_state(il->hw->wiphy,
+                                          test_bit(S_RF_KILL_HW, &il->status));
+        else
+                wake_up(&il->wait_command_queue);
+}
+
+/**
+ * il4965_setup_handlers - Initialize Rx handler callbacks
+ *
+ * Setup the RX handlers for each of the reply types sent from the uCode
+ * to the host.
+ *
+ * This function chains into the hardware specific files for them to setup
+ * any hardware specific handlers as well.
+ */
+static void
+il4965_setup_handlers(struct il_priv *il)
+{
+        il->handlers[N_ALIVE] = il4965_hdl_alive;
+        il->handlers[N_ERROR] = il_hdl_error;
+        il->handlers[N_CHANNEL_SWITCH] = il_hdl_csa;
+        il->handlers[N_SPECTRUM_MEASUREMENT] = il_hdl_spectrum_measurement;
+        il->handlers[N_PM_SLEEP] = il_hdl_pm_sleep;
+        il->handlers[N_PM_DEBUG_STATS] = il_hdl_pm_debug_stats;
+        il->handlers[N_BEACON] = il4965_hdl_beacon;
+
+        /*
+         * The same handler is used for both the REPLY to a discrete
+         * stats request from the host as well as for the periodic
+         * stats notifications (after received beacons) from the uCode.
+         */
+        il->handlers[C_STATS] = il4965_hdl_c_stats;
+        il->handlers[N_STATS] = il4965_hdl_stats;
+
+        il_setup_rx_scan_handlers(il);
+
+        /* status change handler */
+        il->handlers[N_CARD_STATE] = il4965_hdl_card_state;
+
+        il->handlers[N_MISSED_BEACONS] = il4965_hdl_missed_beacon;
+        /* Rx handlers */
+        il->handlers[N_RX_PHY] = il4965_hdl_rx_phy;
+        il->handlers[N_RX_MPDU] = il4965_hdl_rx;
+        /* block ack */
+        il->handlers[N_COMPRESSED_BA] = il4965_hdl_compressed_ba;
+        /* Set up hardware specific Rx handlers */
+        il->cfg->ops->lib->handler_setup(il);
+}
+
+/**
+ * il4965_rx_handle - Main entry function for receiving responses from uCode
+ *
+ * Uses the il->handlers callback function array to invoke
+ * the appropriate handlers, including command responses,
+ * frame-received notifications, and other notifications.
+ */
+void
+il4965_rx_handle(struct il_priv *il)
+{
+        struct il_rx_buf *rxb;
+        struct il_rx_pkt *pkt;
+        struct il_rx_queue *rxq = &il->rxq;
+        u32 r, i;
+        int reclaim;
+        unsigned long flags;
+        u8 fill_rx = 0;
+        u32 count = 8;
+        int total_empty;
+
+        /* uCode's read idx (stored in shared DRAM) indicates the last Rx
+         * buffer that the driver may process (last buffer filled by ucode). */
+        r = le16_to_cpu(rxq->rb_stts->closed_rb_num) & 0x0FFF;
+        i = rxq->read;
+
+        /* Rx interrupt, but nothing sent from uCode */
+        if (i == r)
+                D_RX("r = %d, i = %d\n", r, i);
+
+        /* calculate total frames need to be restock after handling RX */
+        total_empty = r - rxq->write_actual;
+        if (total_empty < 0)
+                total_empty += RX_QUEUE_SIZE;
+
+        if (total_empty > (RX_QUEUE_SIZE / 2))
+                fill_rx = 1;
+
+        while (i != r) {
+                int len;
+
+                rxb = rxq->queue[i];
+
+                /* If an RXB doesn't have a Rx queue slot associated with it,
+                 * then a bug has been introduced in the queue refilling
+                 * routines -- catch it here */
+                BUG_ON(rxb == NULL);
+
+                rxq->queue[i] = NULL;
+
+                pci_unmap_page(il->pci_dev, rxb->page_dma,
+                               PAGE_SIZE << il->hw_params.rx_page_order,
+                               PCI_DMA_FROMDEVICE);
+                pkt = rxb_addr(rxb);
+
+                len = le32_to_cpu(pkt->len_n_flags) & IL_RX_FRAME_SIZE_MSK;
+                len += sizeof(u32);     /* account for status word */
+
+                /* Reclaim a command buffer only if this packet is a response
+                 *   to a (driver-originated) command.
+                 * If the packet (e.g. Rx frame) originated from uCode,
+                 *   there is no command buffer to reclaim.
+                 * Ucode should set SEQ_RX_FRAME bit if ucode-originated,
+                 *   but apparently a few don't get set; catch them here. */
+                reclaim = !(pkt->hdr.sequence & SEQ_RX_FRAME) &&
+                    (pkt->hdr.cmd != N_RX_PHY) && (pkt->hdr.cmd != N_RX) &&
+                    (pkt->hdr.cmd != N_RX_MPDU) &&
+                    (pkt->hdr.cmd != N_COMPRESSED_BA) &&
+                    (pkt->hdr.cmd != N_STATS) && (pkt->hdr.cmd != C_TX);
+
+                /* Based on type of command response or notification,
+                 *   handle those that need handling via function in
+                 *   handlers table.  See il4965_setup_handlers() */
+                if (il->handlers[pkt->hdr.cmd]) {
+                        D_RX("r = %d, i = %d, %s, 0x%02x\n", r, i,
+                             il_get_cmd_string(pkt->hdr.cmd), pkt->hdr.cmd);
+                        il->isr_stats.handlers[pkt->hdr.cmd]++;
+                        il->handlers[pkt->hdr.cmd] (il, rxb);
+                } else {
+                        /* No handling needed */
+                        D_RX("r %d i %d No handler needed for %s, 0x%02x\n", r,
+                             i, il_get_cmd_string(pkt->hdr.cmd), pkt->hdr.cmd);
+                }
+
+                /*
+                 * XXX: After here, we should always check rxb->page
+                 * against NULL before touching it or its virtual
+                 * memory (pkt). Because some handler might have
+                 * already taken or freed the pages.
+                 */
+
+                if (reclaim) {
+                        /* Invoke any callbacks, transfer the buffer to caller,
+                         * and fire off the (possibly) blocking il_send_cmd()
+                         * as we reclaim the driver command queue */
+                        if (rxb->page)
+                                il_tx_cmd_complete(il, rxb);
+                        else
+                                IL_WARN("Claim null rxb?\n");
+                }
+
+                /* Reuse the page if possible. For notification packets and
+                 * SKBs that fail to Rx correctly, add them back into the
+                 * rx_free list for reuse later. */
+                spin_lock_irqsave(&rxq->lock, flags);
+                if (rxb->page != NULL) {
+                        rxb->page_dma =
+                            pci_map_page(il->pci_dev, rxb->page, 0,
+                                         PAGE_SIZE << il->hw_params.
+                                         rx_page_order, PCI_DMA_FROMDEVICE);
+                        list_add_tail(&rxb->list, &rxq->rx_free);
+                        rxq->free_count++;
+                } else
+                        list_add_tail(&rxb->list, &rxq->rx_used);
+
+                spin_unlock_irqrestore(&rxq->lock, flags);
+
+                i = (i + 1) & RX_QUEUE_MASK;
+                /* If there are a lot of unused frames,
+                 * restock the Rx queue so ucode wont assert. */
+                if (fill_rx) {
+                        count++;
+                        if (count >= 8) {
+                                rxq->read = i;
+                                il4965_rx_replenish_now(il);
+                                count = 0;
+                        }
+                }
+        }
+
+        /* Backtrack one entry */
+        rxq->read = i;
+        if (fill_rx)
+                il4965_rx_replenish_now(il);
+        else
+                il4965_rx_queue_restock(il);
+}
+
+/* call this function to flush any scheduled tasklet */
+static inline void
+il4965_synchronize_irq(struct il_priv *il)
+{
+        /* wait to make sure we flush pending tasklet */
+        synchronize_irq(il->pci_dev->irq);
+        tasklet_kill(&il->irq_tasklet);
+}
+
+static void
+il4965_irq_tasklet(struct il_priv *il)
+{
+        u32 inta, handled = 0;
+        u32 inta_fh;
+        unsigned long flags;
+        u32 i;
+#ifdef CONFIG_IWLEGACY_DEBUG
+        u32 inta_mask;
+#endif
+
+        spin_lock_irqsave(&il->lock, flags);
+
+        /* 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 = _il_rd(il, CSR_INT);
+        _il_wr(il, 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 = _il_rd(il, CSR_FH_INT_STATUS);
+        _il_wr(il, CSR_FH_INT_STATUS, inta_fh);
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+        if (il_get_debug_level(il) & IL_DL_ISR) {
+                /* just for debug */
+                inta_mask = _il_rd(il, CSR_INT_MASK);
+                D_ISR("inta 0x%08x, enabled 0x%08x, fh 0x%08x\n", inta,
+                      inta_mask, inta_fh);
+        }
+#endif
+
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        /* Since CSR_INT and CSR_FH_INT_STATUS reads and clears are not
+         * 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 & CSR49_FH_INT_RX_MASK)
+                inta |= CSR_INT_BIT_FH_RX;
+        if (inta_fh & CSR49_FH_INT_TX_MASK)
+                inta |= CSR_INT_BIT_FH_TX;
+
+        /* Now service all interrupt bits discovered above. */
+        if (inta & CSR_INT_BIT_HW_ERR) {
+                IL_ERR("Hardware error detected.  Restarting.\n");
+
+                /* Tell the device to stop sending interrupts */
+                il_disable_interrupts(il);
+
+                il->isr_stats.hw++;
+                il_irq_handle_error(il);
+
+                handled |= CSR_INT_BIT_HW_ERR;
+
+                return;
+        }
+#ifdef CONFIG_IWLEGACY_DEBUG
+        if (il_get_debug_level(il) & (IL_DL_ISR)) {
+                /* NIC fires this, but we don't use it, redundant with WAKEUP */
+                if (inta & CSR_INT_BIT_SCD) {
+                        D_ISR("Scheduler finished to transmit "
+                              "the frame/frames.\n");
+                        il->isr_stats.sch++;
+                }
+
+                /* Alive notification via Rx interrupt will do the real work */
+                if (inta & CSR_INT_BIT_ALIVE) {
+                        D_ISR("Alive interrupt\n");
+                        il->isr_stats.alive++;
+                }
+        }
+#endif
+        /* Safely ignore these bits for debug checks below */
+        inta &= ~(CSR_INT_BIT_SCD | CSR_INT_BIT_ALIVE);
+
+        /* HW RF KILL switch toggled */
+        if (inta & CSR_INT_BIT_RF_KILL) {
+                int hw_rf_kill = 0;
+                if (!
+                    (_il_rd(il, CSR_GP_CNTRL) &
+                     CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW))
+                        hw_rf_kill = 1;
+
+                IL_WARN("RF_KILL bit toggled to %s.\n",
+                        hw_rf_kill ? "disable radio" : "enable radio");
+
+                il->isr_stats.rfkill++;
+
+                /* driver only loads ucode once setting the interface up.
+                 * the driver allows loading the ucode even if the radio
+                 * is killed. Hence update the killswitch state here. The
+                 * rfkill handler will care about restarting if needed.
+                 */
+                if (!test_bit(S_ALIVE, &il->status)) {
+                        if (hw_rf_kill)
+                                set_bit(S_RF_KILL_HW, &il->status);
+                        else
+                                clear_bit(S_RF_KILL_HW, &il->status);
+                        wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rf_kill);
+                }
+
+                handled |= CSR_INT_BIT_RF_KILL;
+        }
+
+        /* Chip got too hot and stopped itself */
+        if (inta & CSR_INT_BIT_CT_KILL) {
+                IL_ERR("Microcode CT kill error detected.\n");
+                il->isr_stats.ctkill++;
+                handled |= CSR_INT_BIT_CT_KILL;
+        }
+
+        /* Error detected by uCode */
+        if (inta & CSR_INT_BIT_SW_ERR) {
+                IL_ERR("Microcode SW error detected. " " Restarting 0x%X.\n",
+                       inta);
+                il->isr_stats.sw++;
+                il_irq_handle_error(il);
+                handled |= CSR_INT_BIT_SW_ERR;
+        }
+
+        /*
+         * uCode wakes up after power-down sleep.
+         * Tell device about any new tx or host commands enqueued,
+         * and about any Rx buffers made available while asleep.
+         */
+        if (inta & CSR_INT_BIT_WAKEUP) {
+                D_ISR("Wakeup interrupt\n");
+                il_rx_queue_update_write_ptr(il, &il->rxq);
+                for (i = 0; i < il->hw_params.max_txq_num; i++)
+                        il_txq_update_write_ptr(il, &il->txq[i]);
+                il->isr_stats.wakeup++;
+                handled |= CSR_INT_BIT_WAKEUP;
+        }
+
+        /* All uCode command responses, including Tx command responses,
+         * Rx "responses" (frame-received notification), and other
+         * notifications from uCode come through here*/
+        if (inta & (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX)) {
+                il4965_rx_handle(il);
+                il->isr_stats.rx++;
+                handled |= (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX);
+        }
+
+        /* This "Tx" DMA channel is used only for loading uCode */
+        if (inta & CSR_INT_BIT_FH_TX) {
+                D_ISR("uCode load interrupt\n");
+                il->isr_stats.tx++;
+                handled |= CSR_INT_BIT_FH_TX;
+                /* Wake up uCode load routine, now that load is complete */
+                il->ucode_write_complete = 1;
+                wake_up(&il->wait_command_queue);
+        }
+
+        if (inta & ~handled) {
+                IL_ERR("Unhandled INTA bits 0x%08x\n", inta & ~handled);
+                il->isr_stats.unhandled++;
+        }
+
+        if (inta & ~(il->inta_mask)) {
+                IL_WARN("Disabled INTA bits 0x%08x were pending\n",
+                        inta & ~il->inta_mask);
+                IL_WARN("   with FH49_INT = 0x%08x\n", inta_fh);
+        }
+
+        /* Re-enable all interrupts */
+        /* only Re-enable if disabled by irq */
+        if (test_bit(S_INT_ENABLED, &il->status))
+                il_enable_interrupts(il);
+        /* Re-enable RF_KILL if it occurred */
+        else if (handled & CSR_INT_BIT_RF_KILL)
+                il_enable_rfkill_int(il);
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+        if (il_get_debug_level(il) & (IL_DL_ISR)) {
+                inta = _il_rd(il, CSR_INT);
+                inta_mask = _il_rd(il, CSR_INT_MASK);
+                inta_fh = _il_rd(il, CSR_FH_INT_STATUS);
+                D_ISR("End inta 0x%08x, enabled 0x%08x, fh 0x%08x, "
+                      "flags 0x%08lx\n", inta, inta_mask, inta_fh, flags);
+        }
+#endif
+}
+
+/*****************************************************************************
+ *
+ * sysfs attributes
+ *
+ *****************************************************************************/
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+
+/*
+ * The following adds a new attribute to the sysfs representation
+ * of this device driver (i.e. a new file in /sys/class/net/wlan0/device/)
+ * used for controlling the debug level.
+ *
+ * See the level definitions in iwl for details.
+ *
+ * The debug_level being managed using sysfs below is a per device debug
+ * level that is used instead of the global debug level if it (the per
+ * device debug level) is set.
+ */
+static ssize_t
+il4965_show_debug_level(struct device *d, struct device_attribute *attr,
+                        char *buf)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+        return sprintf(buf, "0x%08X\n", il_get_debug_level(il));
+}
+
+static ssize_t
+il4965_store_debug_level(struct device *d, struct device_attribute *attr,
+                         const char *buf, size_t count)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+        unsigned long val;
+        int ret;
+
+        ret = strict_strtoul(buf, 0, &val);
+        if (ret)
+                IL_ERR("%s is not in hex or decimal form.\n", buf);
+        else {
+                il->debug_level = val;
+                if (il_alloc_traffic_mem(il))
+                        IL_ERR("Not enough memory to generate traffic log\n");
+        }
+        return strnlen(buf, count);
+}
+
+static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO, il4965_show_debug_level,
+                   il4965_store_debug_level);
+
+#endif /* CONFIG_IWLEGACY_DEBUG */
+
+static ssize_t
+il4965_show_temperature(struct device *d, struct device_attribute *attr,
+                        char *buf)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+
+        if (!il_is_alive(il))
+                return -EAGAIN;
+
+        return sprintf(buf, "%d\n", il->temperature);
+}
+
+static DEVICE_ATTR(temperature, S_IRUGO, il4965_show_temperature, NULL);
+
+static ssize_t
+il4965_show_tx_power(struct device *d, struct device_attribute *attr, char *buf)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+
+        if (!il_is_ready_rf(il))
+                return sprintf(buf, "off\n");
+        else
+                return sprintf(buf, "%d\n", il->tx_power_user_lmt);
+}
+
+static ssize_t
+il4965_store_tx_power(struct device *d, struct device_attribute *attr,
+                      const char *buf, size_t count)
+{
+        struct il_priv *il = dev_get_drvdata(d);
+        unsigned long val;
+        int ret;
+
+        ret = strict_strtoul(buf, 10, &val);
+        if (ret)
+                IL_INFO("%s is not in decimal form.\n", buf);
+        else {
+                ret = il_set_tx_power(il, val, false);
+                if (ret)
+                        IL_ERR("failed setting tx power (0x%d).\n", ret);
+                else
+                        ret = count;
+        }
+        return ret;
+}
+
+static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO, il4965_show_tx_power,
+                   il4965_store_tx_power);
+
+static struct attribute *il_sysfs_entries[] = {
+        &dev_attr_temperature.attr,
+        &dev_attr_tx_power.attr,
+#ifdef CONFIG_IWLEGACY_DEBUG
+        &dev_attr_debug_level.attr,
+#endif
+        NULL
+};
+
+static struct attribute_group il_attribute_group = {
+        .name = NULL,           /* put in device directory */
+        .attrs = il_sysfs_entries,
+};
+
+/******************************************************************************
+ *
+ * uCode download functions
+ *
+ ******************************************************************************/
+
+static void
+il4965_dealloc_ucode_pci(struct il_priv *il)
+{
+        il_free_fw_desc(il->pci_dev, &il->ucode_code);
+        il_free_fw_desc(il->pci_dev, &il->ucode_data);
+        il_free_fw_desc(il->pci_dev, &il->ucode_data_backup);
+        il_free_fw_desc(il->pci_dev, &il->ucode_init);
+        il_free_fw_desc(il->pci_dev, &il->ucode_init_data);
+        il_free_fw_desc(il->pci_dev, &il->ucode_boot);
+}
+
+static void
+il4965_nic_start(struct il_priv *il)
+{
+        /* Remove all resets to allow NIC to operate */
+        _il_wr(il, CSR_RESET, 0);
+}
+
+static void il4965_ucode_callback(const struct firmware *ucode_raw,
+                                  void *context);
+static int il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length);
+
+static int __must_check
+il4965_request_firmware(struct il_priv *il, bool first)
+{
+        const char *name_pre = il->cfg->fw_name_pre;
+        char tag[8];
+
+        if (first) {
+                il->fw_idx = il->cfg->ucode_api_max;
+                sprintf(tag, "%d", il->fw_idx);
+        } else {
+                il->fw_idx--;
+                sprintf(tag, "%d", il->fw_idx);
+        }
+
+        if (il->fw_idx < il->cfg->ucode_api_min) {
+                IL_ERR("no suitable firmware found!\n");
+                return -ENOENT;
+        }
+
+        sprintf(il->firmware_name, "%s%s%s", name_pre, tag, ".ucode");
+
+        D_INFO("attempting to load firmware '%s'\n", il->firmware_name);
+
+        return request_firmware_nowait(THIS_MODULE, 1, il->firmware_name,
+                                       &il->pci_dev->dev, GFP_KERNEL, il,
+                                       il4965_ucode_callback);
+}
+
+struct il4965_firmware_pieces {
+        const void *inst, *data, *init, *init_data, *boot;
+        size_t inst_size, data_size, init_size, init_data_size, boot_size;
+};
+
+static int
+il4965_load_firmware(struct il_priv *il, const struct firmware *ucode_raw,
+                     struct il4965_firmware_pieces *pieces)
+{
+        struct il_ucode_header *ucode = (void *)ucode_raw->data;
+        u32 api_ver, hdr_size;
+        const u8 *src;
+
+        il->ucode_ver = le32_to_cpu(ucode->ver);
+        api_ver = IL_UCODE_API(il->ucode_ver);
+
+        switch (api_ver) {
+        default:
+        case 0:
+        case 1:
+        case 2:
+                hdr_size = 24;
+                if (ucode_raw->size < hdr_size) {
+                        IL_ERR("File size too small!\n");
+                        return -EINVAL;
+                }
+                pieces->inst_size = le32_to_cpu(ucode->v1.inst_size);
+                pieces->data_size = le32_to_cpu(ucode->v1.data_size);
+                pieces->init_size = le32_to_cpu(ucode->v1.init_size);
+                pieces->init_data_size = le32_to_cpu(ucode->v1.init_data_size);
+                pieces->boot_size = le32_to_cpu(ucode->v1.boot_size);
+                src = ucode->v1.data;
+                break;
+        }
+
+        /* Verify size of file vs. image size info in file's header */
+        if (ucode_raw->size !=
+            hdr_size + pieces->inst_size + pieces->data_size +
+            pieces->init_size + pieces->init_data_size + pieces->boot_size) {
+
+                IL_ERR("uCode file size %d does not match expected size\n",
+                       (int)ucode_raw->size);
+                return -EINVAL;
+        }
+
+        pieces->inst = src;
+        src += pieces->inst_size;
+        pieces->data = src;
+        src += pieces->data_size;
+        pieces->init = src;
+        src += pieces->init_size;
+        pieces->init_data = src;
+        src += pieces->init_data_size;
+        pieces->boot = src;
+        src += pieces->boot_size;
+
+        return 0;
+}
+
+/**
+ * il4965_ucode_callback - callback when firmware was loaded
+ *
+ * If loaded successfully, copies the firmware into buffers
+ * for the card to fetch (via DMA).
+ */
+static void
+il4965_ucode_callback(const struct firmware *ucode_raw, void *context)
+{
+        struct il_priv *il = context;
+        struct il_ucode_header *ucode;
+        int err;
+        struct il4965_firmware_pieces pieces;
+        const unsigned int api_max = il->cfg->ucode_api_max;
+        const unsigned int api_min = il->cfg->ucode_api_min;
+        u32 api_ver;
+
+        u32 max_probe_length = 200;
+        u32 standard_phy_calibration_size =
+            IL_DEFAULT_STANDARD_PHY_CALIBRATE_TBL_SIZE;
+
+        memset(&pieces, 0, sizeof(pieces));
+
+        if (!ucode_raw) {
+                if (il->fw_idx <= il->cfg->ucode_api_max)
+                        IL_ERR("request for firmware file '%s' failed.\n",
+                               il->firmware_name);
+                goto try_again;
+        }
+
+        D_INFO("Loaded firmware file '%s' (%zd bytes).\n", il->firmware_name,
+               ucode_raw->size);
+
+        /* Make sure that we got at least the API version number */
+        if (ucode_raw->size < 4) {
+                IL_ERR("File size way too small!\n");
+                goto try_again;
+        }
+
+        /* Data from ucode file:  header followed by uCode images */
+        ucode = (struct il_ucode_header *)ucode_raw->data;
+
+        err = il4965_load_firmware(il, ucode_raw, &pieces);
+
+        if (err)
+                goto try_again;
+
+        api_ver = IL_UCODE_API(il->ucode_ver);
+
+        /*
+         * api_ver should match the api version forming part of the
+         * firmware filename ... but we don't check for that and only rely
+         * on the API version read from firmware header from here on forward
+         */
+        if (api_ver < api_min || api_ver > api_max) {
+                IL_ERR("Driver unable to support your firmware API. "
+                       "Driver supports v%u, firmware is v%u.\n", api_max,
+                       api_ver);
+                goto try_again;
+        }
+
+        if (api_ver != api_max)
+                IL_ERR("Firmware has old API version. Expected v%u, "
+                       "got v%u. New firmware can be obtained "
+                       "from http://www.intellinuxwireless.org.\n", api_max,
+                       api_ver);
+
+        IL_INFO("loaded firmware version %u.%u.%u.%u\n",
+                IL_UCODE_MAJOR(il->ucode_ver), IL_UCODE_MINOR(il->ucode_ver),
+                IL_UCODE_API(il->ucode_ver), IL_UCODE_SERIAL(il->ucode_ver));
+
+        snprintf(il->hw->wiphy->fw_version, sizeof(il->hw->wiphy->fw_version),
+                 "%u.%u.%u.%u", IL_UCODE_MAJOR(il->ucode_ver),
+                 IL_UCODE_MINOR(il->ucode_ver), IL_UCODE_API(il->ucode_ver),
+                 IL_UCODE_SERIAL(il->ucode_ver));
+
+        /*
+         * For any of the failures below (before allocating pci memory)
+         * we will try to load a version with a smaller API -- maybe the
+         * user just got a corrupted version of the latest API.
+         */
+
+        D_INFO("f/w package hdr ucode version raw = 0x%x\n", il->ucode_ver);
+        D_INFO("f/w package hdr runtime inst size = %Zd\n", pieces.inst_size);
+        D_INFO("f/w package hdr runtime data size = %Zd\n", pieces.data_size);
+        D_INFO("f/w package hdr init inst size = %Zd\n", pieces.init_size);
+        D_INFO("f/w package hdr init data size = %Zd\n", pieces.init_data_size);
+        D_INFO("f/w package hdr boot inst size = %Zd\n", pieces.boot_size);
+
+        /* Verify that uCode images will fit in card's SRAM */
+        if (pieces.inst_size > il->hw_params.max_inst_size) {
+                IL_ERR("uCode instr len %Zd too large to fit in\n",
+                       pieces.inst_size);
+                goto try_again;
+        }
+
+        if (pieces.data_size > il->hw_params.max_data_size) {
+                IL_ERR("uCode data len %Zd too large to fit in\n",
+                       pieces.data_size);
+                goto try_again;
+        }
+
+        if (pieces.init_size > il->hw_params.max_inst_size) {
+                IL_ERR("uCode init instr len %Zd too large to fit in\n",
+                       pieces.init_size);
+                goto try_again;
+        }
+
+        if (pieces.init_data_size > il->hw_params.max_data_size) {
+                IL_ERR("uCode init data len %Zd too large to fit in\n",
+                       pieces.init_data_size);
+                goto try_again;
+        }
+
+        if (pieces.boot_size > il->hw_params.max_bsm_size) {
+                IL_ERR("uCode boot instr len %Zd too large to fit in\n",
+                       pieces.boot_size);
+                goto try_again;
+        }
+
+        /* Allocate ucode buffers for card's bus-master loading ... */
+
+        /* Runtime instructions and 2 copies of data:
+         * 1) unmodified from disk
+         * 2) backup cache for save/restore during power-downs */
+        il->ucode_code.len = pieces.inst_size;
+        il_alloc_fw_desc(il->pci_dev, &il->ucode_code);
+
+        il->ucode_data.len = pieces.data_size;
+        il_alloc_fw_desc(il->pci_dev, &il->ucode_data);
+
+        il->ucode_data_backup.len = pieces.data_size;
+        il_alloc_fw_desc(il->pci_dev, &il->ucode_data_backup);
+
+        if (!il->ucode_code.v_addr || !il->ucode_data.v_addr ||
+            !il->ucode_data_backup.v_addr)
+                goto err_pci_alloc;
+
+        /* Initialization instructions and data */
+        if (pieces.init_size && pieces.init_data_size) {
+                il->ucode_init.len = pieces.init_size;
+                il_alloc_fw_desc(il->pci_dev, &il->ucode_init);
+
+                il->ucode_init_data.len = pieces.init_data_size;
+                il_alloc_fw_desc(il->pci_dev, &il->ucode_init_data);
+
+                if (!il->ucode_init.v_addr || !il->ucode_init_data.v_addr)
+                        goto err_pci_alloc;
+        }
+
+        /* Bootstrap (instructions only, no data) */
+        if (pieces.boot_size) {
+                il->ucode_boot.len = pieces.boot_size;
+                il_alloc_fw_desc(il->pci_dev, &il->ucode_boot);
+
+                if (!il->ucode_boot.v_addr)
+                        goto err_pci_alloc;
+        }
+
+        /* Now that we can no longer fail, copy information */
+
+        il->sta_key_max_num = STA_KEY_MAX_NUM;
+
+        /* Copy images into buffers for card's bus-master reads ... */
+
+        /* Runtime instructions (first block of data in file) */
+        D_INFO("Copying (but not loading) uCode instr len %Zd\n",
+               pieces.inst_size);
+        memcpy(il->ucode_code.v_addr, pieces.inst, pieces.inst_size);
+
+        D_INFO("uCode instr buf vaddr = 0x%p, paddr = 0x%08x\n",
+               il->ucode_code.v_addr, (u32) il->ucode_code.p_addr);
+
+        /*
+         * Runtime data
+         * NOTE:  Copy into backup buffer will be done in il_up()
+         */
+        D_INFO("Copying (but not loading) uCode data len %Zd\n",
+               pieces.data_size);
+        memcpy(il->ucode_data.v_addr, pieces.data, pieces.data_size);
+        memcpy(il->ucode_data_backup.v_addr, pieces.data, pieces.data_size);
+
+        /* Initialization instructions */
+        if (pieces.init_size) {
+                D_INFO("Copying (but not loading) init instr len %Zd\n",
+                       pieces.init_size);
+                memcpy(il->ucode_init.v_addr, pieces.init, pieces.init_size);
+        }
+
+        /* Initialization data */
+        if (pieces.init_data_size) {
+                D_INFO("Copying (but not loading) init data len %Zd\n",
+                       pieces.init_data_size);
+                memcpy(il->ucode_init_data.v_addr, pieces.init_data,
+                       pieces.init_data_size);
+        }
+
+        /* Bootstrap instructions */
+        D_INFO("Copying (but not loading) boot instr len %Zd\n",
+               pieces.boot_size);
+        memcpy(il->ucode_boot.v_addr, pieces.boot, pieces.boot_size);
+
+        /*
+         * figure out the offset of chain noise reset and gain commands
+         * base on the size of standard phy calibration commands table size
+         */
+        il->_4965.phy_calib_chain_noise_reset_cmd =
+            standard_phy_calibration_size;
+        il->_4965.phy_calib_chain_noise_gain_cmd =
+            standard_phy_calibration_size + 1;
+
+        /**************************************************
+         * This is still part of probe() in a sense...
+         *
+         * 9. Setup and register with mac80211 and debugfs
+         **************************************************/
+        err = il4965_mac_setup_register(il, max_probe_length);
+        if (err)
+                goto out_unbind;
+
+        err = il_dbgfs_register(il, DRV_NAME);
+        if (err)
+                IL_ERR("failed to create debugfs files. Ignoring error: %d\n",
+                       err);
+
+        err = sysfs_create_group(&il->pci_dev->dev.kobj, &il_attribute_group);
+        if (err) {
+                IL_ERR("failed to create sysfs device attributes\n");
+                goto out_unbind;
+        }
+
+        /* We have our copies now, allow OS release its copies */
+        release_firmware(ucode_raw);
+        complete(&il->_4965.firmware_loading_complete);
+        return;
+
+try_again:
+        /* try next, if any */
+        if (il4965_request_firmware(il, false))
+                goto out_unbind;
+        release_firmware(ucode_raw);
+        return;
+
+err_pci_alloc:
+        IL_ERR("failed to allocate pci memory\n");
+        il4965_dealloc_ucode_pci(il);
+out_unbind:
+        complete(&il->_4965.firmware_loading_complete);
+        device_release_driver(&il->pci_dev->dev);
+        release_firmware(ucode_raw);
+}
+
+static const char *const desc_lookup_text[] = {
+        "OK",
+        "FAIL",
+        "BAD_PARAM",
+        "BAD_CHECKSUM",
+        "NMI_INTERRUPT_WDG",
+        "SYSASSERT",
+        "FATAL_ERROR",
+        "BAD_COMMAND",
+        "HW_ERROR_TUNE_LOCK",
+        "HW_ERROR_TEMPERATURE",
+        "ILLEGAL_CHAN_FREQ",
+        "VCC_NOT_STBL",
+        "FH49_ERROR",
+        "NMI_INTERRUPT_HOST",
+        "NMI_INTERRUPT_ACTION_PT",
+        "NMI_INTERRUPT_UNKNOWN",
+        "UCODE_VERSION_MISMATCH",
+        "HW_ERROR_ABS_LOCK",
+        "HW_ERROR_CAL_LOCK_FAIL",
+        "NMI_INTERRUPT_INST_ACTION_PT",
+        "NMI_INTERRUPT_DATA_ACTION_PT",
+        "NMI_TRM_HW_ER",
+        "NMI_INTERRUPT_TRM",
+        "NMI_INTERRUPT_BREAK_POINT",
+        "DEBUG_0",
+        "DEBUG_1",
+        "DEBUG_2",
+        "DEBUG_3",
+};
+
+static struct {
+        char *name;
+        u8 num;
+} advanced_lookup[] = {
+        {
+        "NMI_INTERRUPT_WDG", 0x34}, {
+        "SYSASSERT", 0x35}, {
+        "UCODE_VERSION_MISMATCH", 0x37}, {
+        "BAD_COMMAND", 0x38}, {
+        "NMI_INTERRUPT_DATA_ACTION_PT", 0x3C}, {
+        "FATAL_ERROR", 0x3D}, {
+        "NMI_TRM_HW_ERR", 0x46}, {
+        "NMI_INTERRUPT_TRM", 0x4C}, {
+        "NMI_INTERRUPT_BREAK_POINT", 0x54}, {
+        "NMI_INTERRUPT_WDG_RXF_FULL", 0x5C}, {
+        "NMI_INTERRUPT_WDG_NO_RBD_RXF_FULL", 0x64}, {
+        "NMI_INTERRUPT_HOST", 0x66}, {
+        "NMI_INTERRUPT_ACTION_PT", 0x7C}, {
+        "NMI_INTERRUPT_UNKNOWN", 0x84}, {
+        "NMI_INTERRUPT_INST_ACTION_PT", 0x86}, {
+"ADVANCED_SYSASSERT", 0},};
+
+static const char *
+il4965_desc_lookup(u32 num)
+{
+        int i;
+        int max = ARRAY_SIZE(desc_lookup_text);
+
+        if (num < max)
+                return desc_lookup_text[num];
+
+        max = ARRAY_SIZE(advanced_lookup) - 1;
+        for (i = 0; i < max; i++) {
+                if (advanced_lookup[i].num == num)
+                        break;
+        }
+        return advanced_lookup[i].name;
+}
+
+#define ERROR_START_OFFSET  (1 * sizeof(u32))
+#define ERROR_ELEM_SIZE     (7 * sizeof(u32))
+
+void
+il4965_dump_nic_error_log(struct il_priv *il)
+{
+        u32 data2, line;
+        u32 desc, time, count, base, data1;
+        u32 blink1, blink2, ilink1, ilink2;
+        u32 pc, hcmd;
+
+        if (il->ucode_type == UCODE_INIT)
+                base = le32_to_cpu(il->card_alive_init.error_event_table_ptr);
+        else
+                base = le32_to_cpu(il->card_alive.error_event_table_ptr);
+
+        if (!il->cfg->ops->lib->is_valid_rtc_data_addr(base)) {
+                IL_ERR("Not valid error log pointer 0x%08X for %s uCode\n",
+                       base, (il->ucode_type == UCODE_INIT) ? "Init" : "RT");
+                return;
+        }
+
+        count = il_read_targ_mem(il, base);
+
+        if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) {
+                IL_ERR("Start IWL Error Log Dump:\n");
+                IL_ERR("Status: 0x%08lX, count: %d\n", il->status, count);
+        }
+
+        desc = il_read_targ_mem(il, base + 1 * sizeof(u32));
+        il->isr_stats.err_code = desc;
+        pc = il_read_targ_mem(il, base + 2 * sizeof(u32));
+        blink1 = il_read_targ_mem(il, base + 3 * sizeof(u32));
+        blink2 = il_read_targ_mem(il, base + 4 * sizeof(u32));
+        ilink1 = il_read_targ_mem(il, base + 5 * sizeof(u32));
+        ilink2 = il_read_targ_mem(il, base + 6 * sizeof(u32));
+        data1 = il_read_targ_mem(il, base + 7 * sizeof(u32));
+        data2 = il_read_targ_mem(il, base + 8 * sizeof(u32));
+        line = il_read_targ_mem(il, base + 9 * sizeof(u32));
+        time = il_read_targ_mem(il, base + 11 * sizeof(u32));
+        hcmd = il_read_targ_mem(il, base + 22 * sizeof(u32));
+
+        IL_ERR("Desc                                  Time       "
+               "data1      data2      line\n");
+        IL_ERR("%-28s (0x%04X) %010u 0x%08X 0x%08X %u\n",
+               il4965_desc_lookup(desc), desc, time, data1, data2, line);
+        IL_ERR("pc      blink1  blink2  ilink1  ilink2  hcmd\n");
+        IL_ERR("0x%05X 0x%05X 0x%05X 0x%05X 0x%05X 0x%05X\n", pc, blink1,
+               blink2, ilink1, ilink2, hcmd);
+}
+
+static void
+il4965_rf_kill_ct_config(struct il_priv *il)
+{
+        struct il_ct_kill_config cmd;
+        unsigned long flags;
+        int ret = 0;
+
+        spin_lock_irqsave(&il->lock, flags);
+        _il_wr(il, CSR_UCODE_DRV_GP1_CLR,
+               CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        cmd.critical_temperature_R =
+            cpu_to_le32(il->hw_params.ct_kill_threshold);
+
+        ret = il_send_cmd_pdu(il, C_CT_KILL_CONFIG, sizeof(cmd), &cmd);
+        if (ret)
+                IL_ERR("C_CT_KILL_CONFIG failed\n");
+        else
+                D_INFO("C_CT_KILL_CONFIG " "succeeded, "
+                       "critical temperature is %d\n",
+                       il->hw_params.ct_kill_threshold);
+}
+
+static const s8 default_queue_to_tx_fifo[] = {
+        IL_TX_FIFO_VO,
+        IL_TX_FIFO_VI,
+        IL_TX_FIFO_BE,
+        IL_TX_FIFO_BK,
+        IL49_CMD_FIFO_NUM,
+        IL_TX_FIFO_UNUSED,
+        IL_TX_FIFO_UNUSED,
+};
+
+#define IL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo))))
+
+static int
+il4965_alive_notify(struct il_priv *il)
+{
+        u32 a;
+        unsigned long flags;
+        int i, chan;
+        u32 reg_val;
+
+        spin_lock_irqsave(&il->lock, flags);
+
+        /* Clear 4965's internal Tx Scheduler data base */
+        il->scd_base_addr = il_rd_prph(il, IL49_SCD_SRAM_BASE_ADDR);
+        a = il->scd_base_addr + IL49_SCD_CONTEXT_DATA_OFFSET;
+        for (; a < il->scd_base_addr + IL49_SCD_TX_STTS_BITMAP_OFFSET; a += 4)
+                il_write_targ_mem(il, a, 0);
+        for (; a < il->scd_base_addr + IL49_SCD_TRANSLATE_TBL_OFFSET; a += 4)
+                il_write_targ_mem(il, a, 0);
+        for (;
+             a <
+             il->scd_base_addr +
+             IL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(il->hw_params.max_txq_num);
+             a += 4)
+                il_write_targ_mem(il, a, 0);
+
+        /* Tel 4965 where to find Tx byte count tables */
+        il_wr_prph(il, IL49_SCD_DRAM_BASE_ADDR, il->scd_bc_tbls.dma >> 10);
+
+        /* Enable DMA channel */
+        for (chan = 0; chan < FH49_TCSR_CHNL_NUM; chan++)
+                il_wr(il, FH49_TCSR_CHNL_TX_CONFIG_REG(chan),
+                      FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE |
+                      FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE);
+
+        /* Update FH chicken bits */
+        reg_val = il_rd(il, FH49_TX_CHICKEN_BITS_REG);
+        il_wr(il, FH49_TX_CHICKEN_BITS_REG,
+              reg_val | FH49_TX_CHICKEN_BITS_SCD_AUTO_RETRY_EN);
+
+        /* Disable chain mode for all queues */
+        il_wr_prph(il, IL49_SCD_QUEUECHAIN_SEL, 0);
+
+        /* Initialize each Tx queue (including the command queue) */
+        for (i = 0; i < il->hw_params.max_txq_num; i++) {
+
+                /* TFD circular buffer read/write idxes */
+                il_wr_prph(il, IL49_SCD_QUEUE_RDPTR(i), 0);
+                il_wr(il, HBUS_TARG_WRPTR, 0 | (i << 8));
+
+                /* Max Tx Window size for Scheduler-ACK mode */
+                il_write_targ_mem(il,
+                                  il->scd_base_addr +
+                                  IL49_SCD_CONTEXT_QUEUE_OFFSET(i),
+                                  (SCD_WIN_SIZE <<
+                                   IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS) &
+                                  IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK);
+
+                /* Frame limit */
+                il_write_targ_mem(il,
+                                  il->scd_base_addr +
+                                  IL49_SCD_CONTEXT_QUEUE_OFFSET(i) +
+                                  sizeof(u32),
+                                  (SCD_FRAME_LIMIT <<
+                                   IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) &
+                                  IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK);
+
+        }
+        il_wr_prph(il, IL49_SCD_INTERRUPT_MASK,
+                   (1 << il->hw_params.max_txq_num) - 1);
+
+        /* Activate all Tx DMA/FIFO channels */
+        il4965_txq_set_sched(il, IL_MASK(0, 6));
+
+        il4965_set_wr_ptrs(il, IL_DEFAULT_CMD_QUEUE_NUM, 0);
+
+        /* make sure all queue are not stopped */
+        memset(&il->queue_stopped[0], 0, sizeof(il->queue_stopped));
+        for (i = 0; i < 4; i++)
+                atomic_set(&il->queue_stop_count[i], 0);
+
+        /* reset to 0 to enable all the queue first */
+        il->txq_ctx_active_msk = 0;
+        /* Map each Tx/cmd queue to its corresponding fifo */
+        BUILD_BUG_ON(ARRAY_SIZE(default_queue_to_tx_fifo) != 7);
+
+        for (i = 0; i < ARRAY_SIZE(default_queue_to_tx_fifo); i++) {
+                int ac = default_queue_to_tx_fifo[i];
+
+                il_txq_ctx_activate(il, i);
+
+                if (ac == IL_TX_FIFO_UNUSED)
+                        continue;
+
+                il4965_tx_queue_set_status(il, &il->txq[i], ac, 0);
+        }
+
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        return 0;
+}
+
+/**
+ * il4965_alive_start - called after N_ALIVE notification received
+ *                   from protocol/runtime uCode (initialization uCode's
+ *                   Alive gets handled by il_init_alive_start()).
+ */
+static void
+il4965_alive_start(struct il_priv *il)
+{
+        int ret = 0;
+        struct il_rxon_context *ctx = &il->ctx;
+
+        D_INFO("Runtime Alive received.\n");
+
+        if (il->card_alive.is_valid != UCODE_VALID_OK) {
+                /* We had an error bringing up the hardware, so take it
+                 * all the way back down so we can try again */
+                D_INFO("Alive failed.\n");
+                goto restart;
+        }
+
+        /* Initialize uCode has loaded Runtime uCode ... verify inst image.
+         * This is a paranoid check, because we would not have gotten the
+         * "runtime" alive if code weren't properly loaded.  */
+        if (il4965_verify_ucode(il)) {
+                /* Runtime instruction load was bad;
+                 * take it all the way back down so we can try again */
+                D_INFO("Bad runtime uCode load.\n");
+                goto restart;
+        }
+
+        ret = il4965_alive_notify(il);
+        if (ret) {
+                IL_WARN("Could not complete ALIVE transition [ntf]: %d\n", ret);
+                goto restart;
+        }
+
+        /* After the ALIVE response, we can send host commands to the uCode */
+        set_bit(S_ALIVE, &il->status);
+
+        /* Enable watchdog to monitor the driver tx queues */
+        il_setup_watchdog(il);
+
+        if (il_is_rfkill(il))
+                return;
+
+        ieee80211_wake_queues(il->hw);
+
+        il->active_rate = RATES_MASK;
+
+        if (il_is_associated_ctx(ctx)) {
+                struct il_rxon_cmd *active_rxon =
+                    (struct il_rxon_cmd *)&ctx->active;
+                /* apply any changes in staging */
+                ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
+                active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+        } else {
+                /* Initialize our rx_config data */
+                il_connection_init_rx_config(il, &il->ctx);
+
+                if (il->cfg->ops->hcmd->set_rxon_chain)
+                        il->cfg->ops->hcmd->set_rxon_chain(il, ctx);
+        }
+
+        /* Configure bluetooth coexistence if enabled */
+        il_send_bt_config(il);
+
+        il4965_reset_run_time_calib(il);
+
+        set_bit(S_READY, &il->status);
+
+        /* Configure the adapter for unassociated operation */
+        il_commit_rxon(il, ctx);
+
+        /* At this point, the NIC is initialized and operational */
+        il4965_rf_kill_ct_config(il);
+
+        D_INFO("ALIVE processing complete.\n");
+        wake_up(&il->wait_command_queue);
+
+        il_power_update_mode(il, true);
+        D_INFO("Updated power mode\n");
+
+        return;
+
+restart:
+        queue_work(il->workqueue, &il->restart);
+}
+
+static void il4965_cancel_deferred_work(struct il_priv *il);
+
+static void
+__il4965_down(struct il_priv *il)
+{
+        unsigned long flags;
+        int exit_pending;
+
+        D_INFO(DRV_NAME " is going down\n");
+
+        il_scan_cancel_timeout(il, 200);
+
+        exit_pending = test_and_set_bit(S_EXIT_PENDING, &il->status);
+
+        /* Stop TX queues watchdog. We need to have S_EXIT_PENDING bit set
+         * to prevent rearm timer */
+        del_timer_sync(&il->watchdog);
+
+        il_clear_ucode_stations(il, NULL);
+        il_dealloc_bcast_stations(il);
+        il_clear_driver_stations(il);
+
+        /* Unblock any waiting calls */
+        wake_up_all(&il->wait_command_queue);
+
+        /* Wipe out the EXIT_PENDING status bit if we are not actually
+         * exiting the module */
+        if (!exit_pending)
+                clear_bit(S_EXIT_PENDING, &il->status);
+
+        /* stop and reset the on-board processor */
+        _il_wr(il, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
+
+        /* tell the device to stop sending interrupts */
+        spin_lock_irqsave(&il->lock, flags);
+        il_disable_interrupts(il);
+        spin_unlock_irqrestore(&il->lock, flags);
+        il4965_synchronize_irq(il);
+
+        if (il->mac80211_registered)
+                ieee80211_stop_queues(il->hw);
+
+        /* If we have not previously called il_init() then
+         * clear all bits but the RF Kill bit and return */
+        if (!il_is_init(il)) {
+                il->status =
+                    test_bit(S_RF_KILL_HW,
+                             &il->
+                             status) << S_RF_KILL_HW |
+                    test_bit(S_GEO_CONFIGURED,
+                             &il->
+                             status) << S_GEO_CONFIGURED |
+                    test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING;
+                goto exit;
+        }
+
+        /* ...otherwise clear out all the status bits but the RF Kill
+         * bit and continue taking the NIC down. */
+        il->status &=
+            test_bit(S_RF_KILL_HW,
+                     &il->status) << S_RF_KILL_HW | test_bit(S_GEO_CONFIGURED,
+                                                             &il->
+                                                             status) <<
+            S_GEO_CONFIGURED | test_bit(S_FW_ERROR,
+                                        &il->
+                                        status) << S_FW_ERROR |
+            test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING;
+
+        il4965_txq_ctx_stop(il);
+        il4965_rxq_stop(il);
+
+        /* Power-down device's busmaster DMA clocks */
+        il_wr_prph(il, APMG_CLK_DIS_REG, APMG_CLK_VAL_DMA_CLK_RQT);
+        udelay(5);
+
+        /* Make sure (redundant) we've released our request to stay awake */
+        il_clear_bit(il, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+
+        /* Stop the device, and put it in low power state */
+        il_apm_stop(il);
+
+exit:
+        memset(&il->card_alive, 0, sizeof(struct il_alive_resp));
+
+        dev_kfree_skb(il->beacon_skb);
+        il->beacon_skb = NULL;
+
+        /* clear out any free frames */
+        il4965_clear_free_frames(il);
+}
+
+static void
+il4965_down(struct il_priv *il)
+{
+        mutex_lock(&il->mutex);
+        __il4965_down(il);
+        mutex_unlock(&il->mutex);
+
+        il4965_cancel_deferred_work(il);
+}
+
+#define HW_READY_TIMEOUT (50)
+
+static int
+il4965_set_hw_ready(struct il_priv *il)
+{
+        int ret = 0;
+
+        il_set_bit(il, CSR_HW_IF_CONFIG_REG,
+                   CSR_HW_IF_CONFIG_REG_BIT_NIC_READY);
+
+        /* See if we got it */
+        ret =
+            _il_poll_bit(il, CSR_HW_IF_CONFIG_REG,
+                         CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
+                         CSR_HW_IF_CONFIG_REG_BIT_NIC_READY, HW_READY_TIMEOUT);
+        if (ret != -ETIMEDOUT)
+                il->hw_ready = true;
+        else
+                il->hw_ready = false;
+
+        D_INFO("hardware %s\n", (il->hw_ready == 1) ? "ready" : "not ready");
+        return ret;
+}
+
+static int
+il4965_prepare_card_hw(struct il_priv *il)
+{
+        int ret = 0;
+
+        D_INFO("il4965_prepare_card_hw enter\n");
+
+        ret = il4965_set_hw_ready(il);
+        if (il->hw_ready)
+                return ret;
+
+        /* If HW is not ready, prepare the conditions to check again */
+        il_set_bit(il, CSR_HW_IF_CONFIG_REG, CSR_HW_IF_CONFIG_REG_PREPARE);
+
+        ret =
+            _il_poll_bit(il, CSR_HW_IF_CONFIG_REG,
+                         ~CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE,
+                         CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE, 150000);
+
+        /* HW should be ready by now, check again. */
+        if (ret != -ETIMEDOUT)
+                il4965_set_hw_ready(il);
+
+        return ret;
+}
+
+#define MAX_HW_RESTARTS 5
+
+static int
+__il4965_up(struct il_priv *il)
+{
+        int i;
+        int ret;
+
+        if (test_bit(S_EXIT_PENDING, &il->status)) {
+                IL_WARN("Exit pending; will not bring the NIC up\n");
+                return -EIO;
+        }
+
+        if (!il->ucode_data_backup.v_addr || !il->ucode_data.v_addr) {
+                IL_ERR("ucode not available for device bringup\n");
+                return -EIO;
+        }
+
+        ret = il4965_alloc_bcast_station(il, &il->ctx);
+        if (ret) {
+                il_dealloc_bcast_stations(il);
+                return ret;
+        }
+
+        il4965_prepare_card_hw(il);
+
+        if (!il->hw_ready) {
+                IL_WARN("Exit HW not ready\n");
+                return -EIO;
+        }
+
+        /* If platform's RF_KILL switch is NOT set to KILL */
+        if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
+                clear_bit(S_RF_KILL_HW, &il->status);
+        else
+                set_bit(S_RF_KILL_HW, &il->status);
+
+        if (il_is_rfkill(il)) {
+                wiphy_rfkill_set_hw_state(il->hw->wiphy, true);
+
+                il_enable_interrupts(il);
+                IL_WARN("Radio disabled by HW RF Kill switch\n");
+                return 0;
+        }
+
+        _il_wr(il, CSR_INT, 0xFFFFFFFF);
+
+        /* must be initialised before il_hw_nic_init */
+        il->cmd_queue = IL_DEFAULT_CMD_QUEUE_NUM;
+
+        ret = il4965_hw_nic_init(il);
+        if (ret) {
+                IL_ERR("Unable to init nic\n");
+                return ret;
+        }
+
+        /* make sure rfkill handshake bits are cleared */
+        _il_wr(il, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
+        _il_wr(il, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
+
+        /* clear (again), then enable host interrupts */
+        _il_wr(il, CSR_INT, 0xFFFFFFFF);
+        il_enable_interrupts(il);
+
+        /* really make sure rfkill handshake bits are cleared */
+        _il_wr(il, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
+        _il_wr(il, 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
+         * data SRAM for a clean start when the runtime program first loads. */
+        memcpy(il->ucode_data_backup.v_addr, il->ucode_data.v_addr,
+               il->ucode_data.len);
+
+        for (i = 0; i < MAX_HW_RESTARTS; i++) {
+
+                /* load bootstrap state machine,
+                 * load bootstrap program into processor's memory,
+                 * prepare to load the "initialize" uCode */
+                ret = il->cfg->ops->lib->load_ucode(il);
+
+                if (ret) {
+                        IL_ERR("Unable to set up bootstrap uCode: %d\n", ret);
+                        continue;
+                }
+
+                /* start card; "initialize" will load runtime ucode */
+                il4965_nic_start(il);
+
+                D_INFO(DRV_NAME " is coming up\n");
+
+                return 0;
+        }
+
+        set_bit(S_EXIT_PENDING, &il->status);
+        __il4965_down(il);
+        clear_bit(S_EXIT_PENDING, &il->status);
+
+        /* tried to restart and config the device for as long as our
+         * patience could withstand */
+        IL_ERR("Unable to initialize device after %d attempts.\n", i);
+        return -EIO;
+}
+
+/*****************************************************************************
+ *
+ * Workqueue callbacks
+ *
+ *****************************************************************************/
+
+static void
+il4965_bg_init_alive_start(struct work_struct *data)
+{
+        struct il_priv *il =
+            container_of(data, struct il_priv, init_alive_start.work);
+
+        mutex_lock(&il->mutex);
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                goto out;
+
+        il->cfg->ops->lib->init_alive_start(il);
+out:
+        mutex_unlock(&il->mutex);
+}
+
+static void
+il4965_bg_alive_start(struct work_struct *data)
+{
+        struct il_priv *il =
+            container_of(data, struct il_priv, alive_start.work);
+
+        mutex_lock(&il->mutex);
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                goto out;
+
+        il4965_alive_start(il);
+out:
+        mutex_unlock(&il->mutex);
+}
+
+static void
+il4965_bg_run_time_calib_work(struct work_struct *work)
+{
+        struct il_priv *il = container_of(work, struct il_priv,
+                                          run_time_calib_work);
+
+        mutex_lock(&il->mutex);
+
+        if (test_bit(S_EXIT_PENDING, &il->status) ||
+            test_bit(S_SCANNING, &il->status)) {
+                mutex_unlock(&il->mutex);
+                return;
+        }
+
+        if (il->start_calib) {
+                il4965_chain_noise_calibration(il, (void *)&il->_4965.stats);
+                il4965_sensitivity_calibration(il, (void *)&il->_4965.stats);
+        }
+
+        mutex_unlock(&il->mutex);
+}
+
+static void
+il4965_bg_restart(struct work_struct *data)
+{
+        struct il_priv *il = container_of(data, struct il_priv, restart);
+
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                return;
+
+        if (test_and_clear_bit(S_FW_ERROR, &il->status)) {
+                mutex_lock(&il->mutex);
+                il->ctx.vif = NULL;
+                il->is_open = 0;
+
+                __il4965_down(il);
+
+                mutex_unlock(&il->mutex);
+                il4965_cancel_deferred_work(il);
+                ieee80211_restart_hw(il->hw);
+        } else {
+                il4965_down(il);
+
+                mutex_lock(&il->mutex);
+                if (test_bit(S_EXIT_PENDING, &il->status)) {
+                        mutex_unlock(&il->mutex);
+                        return;
+                }
+
+                __il4965_up(il);
+                mutex_unlock(&il->mutex);
+        }
+}
+
+static void
+il4965_bg_rx_replenish(struct work_struct *data)
+{
+        struct il_priv *il = container_of(data, struct il_priv, rx_replenish);
+
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                return;
+
+        mutex_lock(&il->mutex);
+        il4965_rx_replenish(il);
+        mutex_unlock(&il->mutex);
+}
+
+/*****************************************************************************
+ *
+ * mac80211 entry point functions
+ *
+ *****************************************************************************/
+
+#define UCODE_READY_TIMEOUT     (4 * HZ)
+
+/*
+ * Not a mac80211 entry point function, but it fits in with all the
+ * other mac80211 functions grouped here.
+ */
+static int
+il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length)
+{
+        int ret;
+        struct ieee80211_hw *hw = il->hw;
+
+        hw->rate_control_algorithm = "iwl-4965-rs";
+
+        /* Tell mac80211 our characteristics */
+        hw->flags =
+            IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_AMPDU_AGGREGATION |
+            IEEE80211_HW_NEED_DTIM_PERIOD | IEEE80211_HW_SPECTRUM_MGMT |
+            IEEE80211_HW_REPORTS_TX_ACK_STATUS;
+
+        if (il->cfg->sku & IL_SKU_N)
+                hw->flags |=
+                    IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |
+                    IEEE80211_HW_SUPPORTS_STATIC_SMPS;
+
+        hw->sta_data_size = sizeof(struct il_station_priv);
+        hw->vif_data_size = sizeof(struct il_vif_priv);
+
+        hw->wiphy->interface_modes |= il->ctx.interface_modes;
+        hw->wiphy->interface_modes |= il->ctx.exclusive_interface_modes;
+
+        hw->wiphy->flags |=
+            WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS;
+
+        /*
+         * For now, disable PS by default because it affects
+         * RX performance significantly.
+         */
+        hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
+
+        hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX;
+        /* we create the 802.11 header and a zero-length SSID element */
+        hw->wiphy->max_scan_ie_len = max_probe_length - 24 - 2;
+
+        /* Default value; 4 EDCA QOS priorities */
+        hw->queues = 4;
+
+        hw->max_listen_interval = IL_CONN_MAX_LISTEN_INTERVAL;
+
+        if (il->bands[IEEE80211_BAND_2GHZ].n_channels)
+                il->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
+                    &il->bands[IEEE80211_BAND_2GHZ];
+        if (il->bands[IEEE80211_BAND_5GHZ].n_channels)
+                il->hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
+                    &il->bands[IEEE80211_BAND_5GHZ];
+
+        il_leds_init(il);
+
+        ret = ieee80211_register_hw(il->hw);
+        if (ret) {
+                IL_ERR("Failed to register hw (error %d)\n", ret);
+                return ret;
+        }
+        il->mac80211_registered = 1;
+
+        return 0;
+}
+
+int
+il4965_mac_start(struct ieee80211_hw *hw)
+{
+        struct il_priv *il = hw->priv;
+        int ret;
+
+        D_MAC80211("enter\n");
+
+        /* we should be verifying the device is ready to be opened */
+        mutex_lock(&il->mutex);
+        ret = __il4965_up(il);
+        mutex_unlock(&il->mutex);
+
+        if (ret)
+                return ret;
+
+        if (il_is_rfkill(il))
+                goto out;
+
+        D_INFO("Start UP work done.\n");
+
+        /* Wait for START_ALIVE from Run Time ucode. Otherwise callbacks from
+         * mac80211 will not be run successfully. */
+        ret = wait_event_timeout(il->wait_command_queue,
+                                 test_bit(S_READY, &il->status),
+                                 UCODE_READY_TIMEOUT);
+        if (!ret) {
+                if (!test_bit(S_READY, &il->status)) {
+                        IL_ERR("START_ALIVE timeout after %dms.\n",
+                                jiffies_to_msecs(UCODE_READY_TIMEOUT));
+                        return -ETIMEDOUT;
+                }
+        }
+
+        il4965_led_enable(il);
+
+out:
+        il->is_open = 1;
+        D_MAC80211("leave\n");
+        return 0;
+}
+
+void
+il4965_mac_stop(struct ieee80211_hw *hw)
+{
+        struct il_priv *il = hw->priv;
+
+        D_MAC80211("enter\n");
+
+        if (!il->is_open)
+                return;
+
+        il->is_open = 0;
+
+        il4965_down(il);
+
+        flush_workqueue(il->workqueue);
+
+        /* User space software may expect getting rfkill changes
+         * even if interface is down */
+        _il_wr(il, CSR_INT, 0xFFFFFFFF);
+        il_enable_rfkill_int(il);
+
+        D_MAC80211("leave\n");
+}
+
+void
+il4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
+{
+        struct il_priv *il = hw->priv;
+
+        D_MACDUMP("enter\n");
+
+        D_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len,
+             ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate);
+
+        if (il4965_tx_skb(il, skb))
+                dev_kfree_skb_any(skb);
+
+        D_MACDUMP("leave\n");
+}
+
+void
+il4965_mac_update_tkip_key(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                           struct ieee80211_key_conf *keyconf,
+                           struct ieee80211_sta *sta, u32 iv32, u16 * phase1key)
+{
+        struct il_priv *il = hw->priv;
+        struct il_vif_priv *vif_priv = (void *)vif->drv_priv;
+
+        D_MAC80211("enter\n");
+
+        il4965_update_tkip_key(il, vif_priv->ctx, keyconf, sta, iv32,
+                               phase1key);
+
+        D_MAC80211("leave\n");
+}
+
+int
+il4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+                   struct ieee80211_vif *vif, struct ieee80211_sta *sta,
+                   struct ieee80211_key_conf *key)
+{
+        struct il_priv *il = hw->priv;
+        struct il_vif_priv *vif_priv = (void *)vif->drv_priv;
+        struct il_rxon_context *ctx = vif_priv->ctx;
+        int ret;
+        u8 sta_id;
+        bool is_default_wep_key = false;
+
+        D_MAC80211("enter\n");
+
+        if (il->cfg->mod_params->sw_crypto) {
+                D_MAC80211("leave - hwcrypto disabled\n");
+                return -EOPNOTSUPP;
+        }
+
+        sta_id = il_sta_id_or_broadcast(il, vif_priv->ctx, sta);
+        if (sta_id == IL_INVALID_STATION)
+                return -EINVAL;
+
+        mutex_lock(&il->mutex);
+        il_scan_cancel_timeout(il, 100);
+
+        /*
+         * 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->cipher == WLAN_CIPHER_SUITE_WEP40 ||
+             key->cipher == WLAN_CIPHER_SUITE_WEP104) && !sta) {
+                if (cmd == SET_KEY)
+                        is_default_wep_key = !ctx->key_mapping_keys;
+                else
+                        is_default_wep_key =
+                            (key->hw_key_idx == HW_KEY_DEFAULT);
+        }
+
+        switch (cmd) {
+        case SET_KEY:
+                if (is_default_wep_key)
+                        ret =
+                            il4965_set_default_wep_key(il, vif_priv->ctx, key);
+                else
+                        ret =
+                            il4965_set_dynamic_key(il, vif_priv->ctx, key,
+                                                   sta_id);
+
+                D_MAC80211("enable hwcrypto key\n");
+                break;
+        case DISABLE_KEY:
+                if (is_default_wep_key)
+                        ret = il4965_remove_default_wep_key(il, ctx, key);
+                else
+                        ret = il4965_remove_dynamic_key(il, ctx, key, sta_id);
+
+                D_MAC80211("disable hwcrypto key\n");
+                break;
+        default:
+                ret = -EINVAL;
+        }
+
+        mutex_unlock(&il->mutex);
+        D_MAC80211("leave\n");
+
+        return ret;
+}
+
+int
+il4965_mac_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                        enum ieee80211_ampdu_mlme_action action,
+                        struct ieee80211_sta *sta, u16 tid, u16 * ssn,
+                        u8 buf_size)
+{
+        struct il_priv *il = hw->priv;
+        int ret = -EINVAL;
+
+        D_HT("A-MPDU action on addr %pM tid %d\n", sta->addr, tid);
+
+        if (!(il->cfg->sku & IL_SKU_N))
+                return -EACCES;
+
+        mutex_lock(&il->mutex);
+
+        switch (action) {
+        case IEEE80211_AMPDU_RX_START:
+                D_HT("start Rx\n");
+                ret = il4965_sta_rx_agg_start(il, sta, tid, *ssn);
+                break;
+        case IEEE80211_AMPDU_RX_STOP:
+                D_HT("stop Rx\n");
+                ret = il4965_sta_rx_agg_stop(il, sta, tid);
+                if (test_bit(S_EXIT_PENDING, &il->status))
+                        ret = 0;
+                break;
+        case IEEE80211_AMPDU_TX_START:
+                D_HT("start Tx\n");
+                ret = il4965_tx_agg_start(il, vif, sta, tid, ssn);
+                break;
+        case IEEE80211_AMPDU_TX_STOP:
+                D_HT("stop Tx\n");
+                ret = il4965_tx_agg_stop(il, vif, sta, tid);
+                if (test_bit(S_EXIT_PENDING, &il->status))
+                        ret = 0;
+                break;
+        case IEEE80211_AMPDU_TX_OPERATIONAL:
+                ret = 0;
+                break;
+        }
+        mutex_unlock(&il->mutex);
+
+        return ret;
+}
+
+int
+il4965_mac_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                   struct ieee80211_sta *sta)
+{
+        struct il_priv *il = hw->priv;
+        struct il_station_priv *sta_priv = (void *)sta->drv_priv;
+        struct il_vif_priv *vif_priv = (void *)vif->drv_priv;
+        bool is_ap = vif->type == NL80211_IFTYPE_STATION;
+        int ret;
+        u8 sta_id;
+
+        D_INFO("received request to add station %pM\n", sta->addr);
+        mutex_lock(&il->mutex);
+        D_INFO("proceeding to add station %pM\n", sta->addr);
+        sta_priv->common.sta_id = IL_INVALID_STATION;
+
+        atomic_set(&sta_priv->pending_frames, 0);
+
+        ret =
+            il_add_station_common(il, vif_priv->ctx, sta->addr, is_ap, sta,
+                                  &sta_id);
+        if (ret) {
+                IL_ERR("Unable to add station %pM (%d)\n", sta->addr, ret);
+                /* Should we return success if return code is EEXIST ? */
+                mutex_unlock(&il->mutex);
+                return ret;
+        }
+
+        sta_priv->common.sta_id = sta_id;
+
+        /* Initialize rate scaling */
+        D_INFO("Initializing rate scaling for station %pM\n", sta->addr);
+        il4965_rs_rate_init(il, sta, sta_id);
+        mutex_unlock(&il->mutex);
+
+        return 0;
+}
+
+void
+il4965_mac_channel_switch(struct ieee80211_hw *hw,
+                          struct ieee80211_channel_switch *ch_switch)
+{
+        struct il_priv *il = hw->priv;
+        const struct il_channel_info *ch_info;
+        struct ieee80211_conf *conf = &hw->conf;
+        struct ieee80211_channel *channel = ch_switch->channel;
+        struct il_ht_config *ht_conf = &il->current_ht_config;
+
+        struct il_rxon_context *ctx = &il->ctx;
+        u16 ch;
+
+        D_MAC80211("enter\n");
+
+        mutex_lock(&il->mutex);
+
+        if (il_is_rfkill(il))
+                goto out;
+
+        if (test_bit(S_EXIT_PENDING, &il->status) ||
+            test_bit(S_SCANNING, &il->status) ||
+            test_bit(S_CHANNEL_SWITCH_PENDING, &il->status))
+                goto out;
+
+        if (!il_is_associated_ctx(ctx))
+                goto out;
+
+        if (!il->cfg->ops->lib->set_channel_switch)
+                goto out;
+
+        ch = channel->hw_value;
+        if (le16_to_cpu(ctx->active.channel) == ch)
+                goto out;
+
+        ch_info = il_get_channel_info(il, channel->band, ch);
+        if (!il_is_channel_valid(ch_info)) {
+                D_MAC80211("invalid channel\n");
+                goto out;
+        }
+
+        spin_lock_irq(&il->lock);
+
+        il->current_ht_config.smps = conf->smps_mode;
+
+        /* Configure HT40 channels */
+        ctx->ht.enabled = conf_is_ht(conf);
+        if (ctx->ht.enabled) {
+                if (conf_is_ht40_minus(conf)) {
+                        ctx->ht.extension_chan_offset =
+                            IEEE80211_HT_PARAM_CHA_SEC_BELOW;
+                        ctx->ht.is_40mhz = true;
+                } else if (conf_is_ht40_plus(conf)) {
+                        ctx->ht.extension_chan_offset =
+                            IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
+                        ctx->ht.is_40mhz = true;
+                } else {
+                        ctx->ht.extension_chan_offset =
+                            IEEE80211_HT_PARAM_CHA_SEC_NONE;
+                        ctx->ht.is_40mhz = false;
+                }
+        } else
+                ctx->ht.is_40mhz = false;
+
+        if ((le16_to_cpu(ctx->staging.channel) != ch))
+                ctx->staging.flags = 0;
+
+        il_set_rxon_channel(il, channel, ctx);
+        il_set_rxon_ht(il, ht_conf);
+        il_set_flags_for_band(il, ctx, channel->band, ctx->vif);
+
+        spin_unlock_irq(&il->lock);
+
+        il_set_rate(il);
+        /*
+         * at this point, staging_rxon has the
+         * configuration for channel switch
+         */
+        set_bit(S_CHANNEL_SWITCH_PENDING, &il->status);
+        il->switch_channel = cpu_to_le16(ch);
+        if (il->cfg->ops->lib->set_channel_switch(il, ch_switch)) {
+                clear_bit(S_CHANNEL_SWITCH_PENDING, &il->status);
+                il->switch_channel = 0;
+                ieee80211_chswitch_done(ctx->vif, false);
+        }
+
+out:
+        mutex_unlock(&il->mutex);
+        D_MAC80211("leave\n");
+}
+
+void
+il4965_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags,
+                        unsigned int *total_flags, u64 multicast)
+{
+        struct il_priv *il = hw->priv;
+        __le32 filter_or = 0, filter_nand = 0;
+
+#define CHK(test, flag) do { \
+        if (*total_flags & (test))              \
+                filter_or |= (flag);            \
+        else                                    \
+                filter_nand |= (flag);          \
+        } while (0)
+
+        D_MAC80211("Enter: changed: 0x%x, total: 0x%x\n", changed_flags,
+                   *total_flags);
+
+        CHK(FIF_OTHER_BSS | FIF_PROMISC_IN_BSS, RXON_FILTER_PROMISC_MSK);
+        /* Setting _just_ RXON_FILTER_CTL2HOST_MSK causes FH errors */
+        CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_PROMISC_MSK);
+        CHK(FIF_BCN_PRBRESP_PROMISC, RXON_FILTER_BCON_AWARE_MSK);
+
+#undef CHK
+
+        mutex_lock(&il->mutex);
+
+        il->ctx.staging.filter_flags &= ~filter_nand;
+        il->ctx.staging.filter_flags |= filter_or;
+
+        /*
+         * Not committing directly because hardware can perform a scan,
+         * but we'll eventually commit the filter flags change anyway.
+         */
+
+        mutex_unlock(&il->mutex);
+
+        /*
+         * Receiving all multicast frames is always enabled by the
+         * default flags setup in il_connection_init_rx_config()
+         * since we currently do not support programming multicast
+         * filters into the device.
+         */
+        *total_flags &=
+            FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |
+            FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
+}
+
+/*****************************************************************************
+ *
+ * driver setup and teardown
+ *
+ *****************************************************************************/
+
+static void
+il4965_bg_txpower_work(struct work_struct *work)
+{
+        struct il_priv *il = container_of(work, struct il_priv,
+                                          txpower_work);
+
+        mutex_lock(&il->mutex);
+
+        /* If a scan happened to start before we got here
+         * then just return; the stats notification will
+         * kick off another scheduled work to compensate for
+         * any temperature delta we missed here. */
+        if (test_bit(S_EXIT_PENDING, &il->status) ||
+            test_bit(S_SCANNING, &il->status))
+                goto out;
+
+        /* Regardless of if we are associated, we must reconfigure the
+         * TX power since frames can be sent on non-radar channels while
+         * not associated */
+        il->cfg->ops->lib->send_tx_power(il);
+
+        /* Update last_temperature to keep is_calib_needed from running
+         * when it isn't needed... */
+        il->last_temperature = il->temperature;
+out:
+        mutex_unlock(&il->mutex);
+}
+
+static void
+il4965_setup_deferred_work(struct il_priv *il)
+{
+        il->workqueue = create_singlethread_workqueue(DRV_NAME);
+
+        init_waitqueue_head(&il->wait_command_queue);
+
+        INIT_WORK(&il->restart, il4965_bg_restart);
+        INIT_WORK(&il->rx_replenish, il4965_bg_rx_replenish);
+        INIT_WORK(&il->run_time_calib_work, il4965_bg_run_time_calib_work);
+        INIT_DELAYED_WORK(&il->init_alive_start, il4965_bg_init_alive_start);
+        INIT_DELAYED_WORK(&il->alive_start, il4965_bg_alive_start);
+
+        il_setup_scan_deferred_work(il);
+
+        INIT_WORK(&il->txpower_work, il4965_bg_txpower_work);
+
+        init_timer(&il->stats_periodic);
+        il->stats_periodic.data = (unsigned long)il;
+        il->stats_periodic.function = il4965_bg_stats_periodic;
+
+        init_timer(&il->watchdog);
+        il->watchdog.data = (unsigned long)il;
+        il->watchdog.function = il_bg_watchdog;
+
+        tasklet_init(&il->irq_tasklet,
+                     (void (*)(unsigned long))il4965_irq_tasklet,
+                     (unsigned long)il);
+}
+
+static void
+il4965_cancel_deferred_work(struct il_priv *il)
+{
+        cancel_work_sync(&il->txpower_work);
+        cancel_delayed_work_sync(&il->init_alive_start);
+        cancel_delayed_work(&il->alive_start);
+        cancel_work_sync(&il->run_time_calib_work);
+
+        il_cancel_scan_deferred_work(il);
+
+        del_timer_sync(&il->stats_periodic);
+}
+
+static void
+il4965_init_hw_rates(struct il_priv *il, struct ieee80211_rate *rates)
+{
+        int i;
+
+        for (i = 0; i < RATE_COUNT_LEGACY; i++) {
+                rates[i].bitrate = il_rates[i].ieee * 5;
+                rates[i].hw_value = i;  /* Rate scaling will work on idxes */
+                rates[i].hw_value_short = i;
+                rates[i].flags = 0;
+                if ((i >= IL_FIRST_CCK_RATE) && (i <= IL_LAST_CCK_RATE)) {
+                        /*
+                         * If CCK != 1M then set short preamble rate flag.
+                         */
+                        rates[i].flags |=
+                            (il_rates[i].plcp ==
+                             RATE_1M_PLCP) ? 0 : IEEE80211_RATE_SHORT_PREAMBLE;
+                }
+        }
+}
+
+/*
+ * Acquire il->lock before calling this function !
+ */
+void
+il4965_set_wr_ptrs(struct il_priv *il, int txq_id, u32 idx)
+{
+        il_wr(il, HBUS_TARG_WRPTR, (idx & 0xff) | (txq_id << 8));
+        il_wr_prph(il, IL49_SCD_QUEUE_RDPTR(txq_id), idx);
+}
+
+void
+il4965_tx_queue_set_status(struct il_priv *il, struct il_tx_queue *txq,
+                           int tx_fifo_id, int scd_retry)
+{
+        int txq_id = txq->q.id;
+
+        /* Find out whether to activate Tx queue */
+        int active = test_bit(txq_id, &il->txq_ctx_active_msk) ? 1 : 0;
+
+        /* Set up and activate */
+        il_wr_prph(il, IL49_SCD_QUEUE_STATUS_BITS(txq_id),
+                   (active << IL49_SCD_QUEUE_STTS_REG_POS_ACTIVE) |
+                   (tx_fifo_id << IL49_SCD_QUEUE_STTS_REG_POS_TXF) |
+                   (scd_retry << IL49_SCD_QUEUE_STTS_REG_POS_WSL) |
+                   (scd_retry << IL49_SCD_QUEUE_STTS_REG_POS_SCD_ACK) |
+                   IL49_SCD_QUEUE_STTS_REG_MSK);
+
+        txq->sched_retry = scd_retry;
+
+        D_INFO("%s %s Queue %d on AC %d\n", active ? "Activate" : "Deactivate",
+               scd_retry ? "BA" : "AC", txq_id, tx_fifo_id);
+}
+
+static int
+il4965_init_drv(struct il_priv *il)
+{
+        int ret;
+
+        spin_lock_init(&il->sta_lock);
+        spin_lock_init(&il->hcmd_lock);
+
+        INIT_LIST_HEAD(&il->free_frames);
+
+        mutex_init(&il->mutex);
+
+        il->ieee_channels = NULL;
+        il->ieee_rates = NULL;
+        il->band = IEEE80211_BAND_2GHZ;
+
+        il->iw_mode = NL80211_IFTYPE_STATION;
+        il->current_ht_config.smps = IEEE80211_SMPS_STATIC;
+        il->missed_beacon_threshold = IL_MISSED_BEACON_THRESHOLD_DEF;
+
+        /* initialize force reset */
+        il->force_reset.reset_duration = IL_DELAY_NEXT_FORCE_FW_RELOAD;
+
+        /* Choose which receivers/antennas to use */
+        if (il->cfg->ops->hcmd->set_rxon_chain)
+                il->cfg->ops->hcmd->set_rxon_chain(il, &il->ctx);
+
+        il_init_scan_params(il);
+
+        ret = il_init_channel_map(il);
+        if (ret) {
+                IL_ERR("initializing regulatory failed: %d\n", ret);
+                goto err;
+        }
+
+        ret = il_init_geos(il);
+        if (ret) {
+                IL_ERR("initializing geos failed: %d\n", ret);
+                goto err_free_channel_map;
+        }
+        il4965_init_hw_rates(il, il->ieee_rates);
+
+        return 0;
+
+err_free_channel_map:
+        il_free_channel_map(il);
+err:
+        return ret;
+}
+
+static void
+il4965_uninit_drv(struct il_priv *il)
+{
+        il4965_calib_free_results(il);
+        il_free_geos(il);
+        il_free_channel_map(il);
+        kfree(il->scan_cmd);
+}
+
+static void
+il4965_hw_detect(struct il_priv *il)
+{
+        il->hw_rev = _il_rd(il, CSR_HW_REV);
+        il->hw_wa_rev = _il_rd(il, CSR_HW_REV_WA_REG);
+        il->rev_id = il->pci_dev->revision;
+        D_INFO("HW Revision ID = 0x%X\n", il->rev_id);
+}
+
+static int
+il4965_set_hw_params(struct il_priv *il)
+{
+        il->hw_params.max_rxq_size = RX_QUEUE_SIZE;
+        il->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;
+        if (il->cfg->mod_params->amsdu_size_8K)
+                il->hw_params.rx_page_order = get_order(IL_RX_BUF_SIZE_8K);
+        else
+                il->hw_params.rx_page_order = get_order(IL_RX_BUF_SIZE_4K);
+
+        il->hw_params.max_beacon_itrvl = IL_MAX_UCODE_BEACON_INTERVAL;
+
+        if (il->cfg->mod_params->disable_11n)
+                il->cfg->sku &= ~IL_SKU_N;
+
+        /* Device-specific setup */
+        return il->cfg->ops->lib->set_hw_params(il);
+}
+
+static const u8 il4965_bss_ac_to_fifo[] = {
+        IL_TX_FIFO_VO,
+        IL_TX_FIFO_VI,
+        IL_TX_FIFO_BE,
+        IL_TX_FIFO_BK,
+};
+
+static const u8 il4965_bss_ac_to_queue[] = {
+        0, 1, 2, 3,
+};
+
+static int
+il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+        int err = 0;
+        struct il_priv *il;
+        struct ieee80211_hw *hw;
+        struct il_cfg *cfg = (struct il_cfg *)(ent->driver_data);
+        unsigned long flags;
+        u16 pci_cmd;
+
+        /************************
+         * 1. Allocating HW data
+         ************************/
+
+        hw = il_alloc_all(cfg);
+        if (!hw) {
+                err = -ENOMEM;
+                goto out;
+        }
+        il = hw->priv;
+        /* At this point both hw and il are allocated. */
+
+        il->ctx.ctxid = 0;
+
+        il->ctx.always_active = true;
+        il->ctx.is_active = true;
+        il->ctx.rxon_cmd = C_RXON;
+        il->ctx.rxon_timing_cmd = C_RXON_TIMING;
+        il->ctx.rxon_assoc_cmd = C_RXON_ASSOC;
+        il->ctx.qos_cmd = C_QOS_PARAM;
+        il->ctx.ap_sta_id = IL_AP_ID;
+        il->ctx.wep_key_cmd = C_WEPKEY;
+        il->ctx.ac_to_fifo = il4965_bss_ac_to_fifo;
+        il->ctx.ac_to_queue = il4965_bss_ac_to_queue;
+        il->ctx.exclusive_interface_modes = BIT(NL80211_IFTYPE_ADHOC);
+        il->ctx.interface_modes = BIT(NL80211_IFTYPE_STATION);
+        il->ctx.ap_devtype = RXON_DEV_TYPE_AP;
+        il->ctx.ibss_devtype = RXON_DEV_TYPE_IBSS;
+        il->ctx.station_devtype = RXON_DEV_TYPE_ESS;
+        il->ctx.unused_devtype = RXON_DEV_TYPE_ESS;
+
+        SET_IEEE80211_DEV(hw, &pdev->dev);
+
+        D_INFO("*** LOAD DRIVER ***\n");
+        il->cfg = cfg;
+        il->pci_dev = pdev;
+        il->inta_mask = CSR_INI_SET_MASK;
+
+        if (il_alloc_traffic_mem(il))
+                IL_ERR("Not enough memory to generate traffic log\n");
+
+        /**************************
+         * 2. Initializing PCI bus
+         **************************/
+        pci_disable_link_state(pdev,
+                               PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
+                               PCIE_LINK_STATE_CLKPM);
+
+        if (pci_enable_device(pdev)) {
+                err = -ENODEV;
+                goto out_ieee80211_free_hw;
+        }
+
+        pci_set_master(pdev);
+
+        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));
+        if (!err)
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(36));
+        if (err) {
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+                if (!err)
+                        err =
+                            pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
+                /* both attempts failed: */
+                if (err) {
+                        IL_WARN("No suitable DMA available.\n");
+                        goto out_pci_disable_device;
+                }
+        }
+
+        err = pci_request_regions(pdev, DRV_NAME);
+        if (err)
+                goto out_pci_disable_device;
+
+        pci_set_drvdata(pdev, il);
+
+        /***********************
+         * 3. Read REV register
+         ***********************/
+        il->hw_base = pci_iomap(pdev, 0, 0);
+        if (!il->hw_base) {
+                err = -ENODEV;
+                goto out_pci_release_regions;
+        }
+
+        D_INFO("pci_resource_len = 0x%08llx\n",
+               (unsigned long long)pci_resource_len(pdev, 0));
+        D_INFO("pci_resource_base = %p\n", il->hw_base);
+
+        /* these spin locks will be used in apm_ops.init and EEPROM access
+         * we should init now
+         */
+        spin_lock_init(&il->reg_lock);
+        spin_lock_init(&il->lock);
+
+        /*
+         * stop and reset the on-board processor just in case it is in a
+         * strange state ... like being left stranded by a primary kernel
+         * and this is now the kdump kernel trying to start up
+         */
+        _il_wr(il, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
+
+        il4965_hw_detect(il);
+        IL_INFO("Detected %s, REV=0x%X\n", il->cfg->name, il->hw_rev);
+
+        /* We disable the RETRY_TIMEOUT register (0x41) to keep
+         * PCI Tx retries from interfering with C3 CPU state */
+        pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);
+
+        il4965_prepare_card_hw(il);
+        if (!il->hw_ready) {
+                IL_WARN("Failed, HW not ready\n");
+                goto out_iounmap;
+        }
+
+        /*****************
+         * 4. Read EEPROM
+         *****************/
+        /* Read the EEPROM */
+        err = il_eeprom_init(il);
+        if (err) {
+                IL_ERR("Unable to init EEPROM\n");
+                goto out_iounmap;
+        }
+        err = il4965_eeprom_check_version(il);
+        if (err)
+                goto out_free_eeprom;
+
+        if (err)
+                goto out_free_eeprom;
+
+        /* extract MAC Address */
+        il4965_eeprom_get_mac(il, il->addresses[0].addr);
+        D_INFO("MAC address: %pM\n", il->addresses[0].addr);
+        il->hw->wiphy->addresses = il->addresses;
+        il->hw->wiphy->n_addresses = 1;
+
+        /************************
+         * 5. Setup HW constants
+         ************************/
+        if (il4965_set_hw_params(il)) {
+                IL_ERR("failed to set hw parameters\n");
+                goto out_free_eeprom;
+        }
+
+        /*******************
+         * 6. Setup il
+         *******************/
+
+        err = il4965_init_drv(il);
+        if (err)
+                goto out_free_eeprom;
+        /* At this point both hw and il are initialized. */
+
+        /********************
+         * 7. Setup services
+         ********************/
+        spin_lock_irqsave(&il->lock, flags);
+        il_disable_interrupts(il);
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        pci_enable_msi(il->pci_dev);
+
+        err = request_irq(il->pci_dev->irq, il_isr, IRQF_SHARED, DRV_NAME, il);
+        if (err) {
+                IL_ERR("Error allocating IRQ %d\n", il->pci_dev->irq);
+                goto out_disable_msi;
+        }
+
+        il4965_setup_deferred_work(il);
+        il4965_setup_handlers(il);
+
+        /*********************************************
+         * 8. Enable interrupts and read RFKILL state
+         *********************************************/
+
+        /* enable rfkill interrupt: hw bug w/a */
+        pci_read_config_word(il->pci_dev, PCI_COMMAND, &pci_cmd);
+        if (pci_cmd & PCI_COMMAND_INTX_DISABLE) {
+                pci_cmd &= ~PCI_COMMAND_INTX_DISABLE;
+                pci_write_config_word(il->pci_dev, PCI_COMMAND, pci_cmd);
+        }
+
+        il_enable_rfkill_int(il);
+
+        /* If platform's RF_KILL switch is NOT set to KILL */
+        if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
+                clear_bit(S_RF_KILL_HW, &il->status);
+        else
+                set_bit(S_RF_KILL_HW, &il->status);
+
+        wiphy_rfkill_set_hw_state(il->hw->wiphy,
+                                  test_bit(S_RF_KILL_HW, &il->status));
+
+        il_power_initialize(il);
+
+        init_completion(&il->_4965.firmware_loading_complete);
+
+        err = il4965_request_firmware(il, true);
+        if (err)
+                goto out_destroy_workqueue;
+
+        return 0;
+
+out_destroy_workqueue:
+        destroy_workqueue(il->workqueue);
+        il->workqueue = NULL;
+        free_irq(il->pci_dev->irq, il);
+out_disable_msi:
+        pci_disable_msi(il->pci_dev);
+        il4965_uninit_drv(il);
+out_free_eeprom:
+        il_eeprom_free(il);
+out_iounmap:
+        pci_iounmap(pdev, il->hw_base);
+out_pci_release_regions:
+        pci_set_drvdata(pdev, NULL);
+        pci_release_regions(pdev);
+out_pci_disable_device:
+        pci_disable_device(pdev);
+out_ieee80211_free_hw:
+        il_free_traffic_mem(il);
+        ieee80211_free_hw(il->hw);
+out:
+        return err;
+}
+
+static void __devexit
+il4965_pci_remove(struct pci_dev *pdev)
+{
+        struct il_priv *il = pci_get_drvdata(pdev);
+        unsigned long flags;
+
+        if (!il)
+                return;
+
+        wait_for_completion(&il->_4965.firmware_loading_complete);
+
+        D_INFO("*** UNLOAD DRIVER ***\n");
+
+        il_dbgfs_unregister(il);
+        sysfs_remove_group(&pdev->dev.kobj, &il_attribute_group);
+
+        /* ieee80211_unregister_hw call wil cause il_mac_stop to
+         * to be called and il4965_down since we are removing the device
+         * we need to set S_EXIT_PENDING bit.
+         */
+        set_bit(S_EXIT_PENDING, &il->status);
+
+        il_leds_exit(il);
+
+        if (il->mac80211_registered) {
+                ieee80211_unregister_hw(il->hw);
+                il->mac80211_registered = 0;
+        } else {
+                il4965_down(il);
+        }
+
+        /*
+         * Make sure device is reset to low power before unloading driver.
+         * This may be redundant with il4965_down(), but there are paths to
+         * run il4965_down() without calling apm_ops.stop(), and there are
+         * paths to avoid running il4965_down() at all before leaving driver.
+         * This (inexpensive) call *makes sure* device is reset.
+         */
+        il_apm_stop(il);
+
+        /* make sure we flush any pending irq or
+         * tasklet for the driver
+         */
+        spin_lock_irqsave(&il->lock, flags);
+        il_disable_interrupts(il);
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        il4965_synchronize_irq(il);
+
+        il4965_dealloc_ucode_pci(il);
+
+        if (il->rxq.bd)
+                il4965_rx_queue_free(il, &il->rxq);
+        il4965_hw_txq_ctx_free(il);
+
+        il_eeprom_free(il);
+
+        /*netif_stop_queue(dev); */
+        flush_workqueue(il->workqueue);
+
+        /* ieee80211_unregister_hw calls il_mac_stop, which flushes
+         * il->workqueue... so we can't take down the workqueue
+         * until now... */
+        destroy_workqueue(il->workqueue);
+        il->workqueue = NULL;
+        il_free_traffic_mem(il);
+
+        free_irq(il->pci_dev->irq, il);
+        pci_disable_msi(il->pci_dev);
+        pci_iounmap(pdev, il->hw_base);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+
+        il4965_uninit_drv(il);
+
+        dev_kfree_skb(il->beacon_skb);
+
+        ieee80211_free_hw(il->hw);
+}
+
+/*
+ * Activate/Deactivate Tx DMA/FIFO channels according tx fifos mask
+ * must be called under il->lock and mac access
+ */
+void
+il4965_txq_set_sched(struct il_priv *il, u32 mask)
+{
+        il_wr_prph(il, IL49_SCD_TXFACT, mask);
+}
+
+/*****************************************************************************
+ *
+ * driver and module entry point
+ *
+ *****************************************************************************/
+
+/* Hardware specific file defines the PCI IDs table for that hardware module */
+static DEFINE_PCI_DEVICE_TABLE(il4965_hw_card_ids) = {
+        {IL_PCI_DEVICE(0x4229, PCI_ANY_ID, il4965_cfg)},
+        {IL_PCI_DEVICE(0x4230, PCI_ANY_ID, il4965_cfg)},
+        {0}
+};
+MODULE_DEVICE_TABLE(pci, il4965_hw_card_ids);
+
+static struct pci_driver il4965_driver = {
+        .name = DRV_NAME,
+        .id_table = il4965_hw_card_ids,
+        .probe = il4965_pci_probe,
+        .remove = __devexit_p(il4965_pci_remove),
+        .driver.pm = IL_LEGACY_PM_OPS,
+};
+
+static int __init
+il4965_init(void)
+{
+
+        int ret;
+        pr_info(DRV_DESCRIPTION ", " DRV_VERSION "\n");
+        pr_info(DRV_COPYRIGHT "\n");
+
+        ret = il4965_rate_control_register();
+        if (ret) {
+                pr_err("Unable to register rate control algorithm: %d\n", ret);
+                return ret;
+        }
+
+        ret = pci_register_driver(&il4965_driver);
+        if (ret) {
+                pr_err("Unable to initialize PCI module\n");
+                goto error_register;
+        }
+
+        return ret;
+
+error_register:
+        il4965_rate_control_unregister();
+        return ret;
+}
+
+static void __exit
+il4965_exit(void)
+{
+        pci_unregister_driver(&il4965_driver);
+        il4965_rate_control_unregister();
+}
+
+module_exit(il4965_exit);
+module_init(il4965_init);
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+module_param_named(debug, il_debug_level, uint, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "debug output mask");
+#endif
+
+module_param_named(swcrypto, il4965_mod_params.sw_crypto, int, S_IRUGO);
+MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])");
+module_param_named(queues_num, il4965_mod_params.num_of_queues, int, S_IRUGO);
+MODULE_PARM_DESC(queues_num, "number of hw queues.");
+module_param_named(11n_disable, il4965_mod_params.disable_11n, int, S_IRUGO);
+MODULE_PARM_DESC(11n_disable, "disable 11n functionality");
+module_param_named(amsdu_size_8K, il4965_mod_params.amsdu_size_8K, int,
+                   S_IRUGO);
+MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size");
+module_param_named(fw_restart, il4965_mod_params.restart_fw, int, S_IRUGO);
+MODULE_PARM_DESC(fw_restart, "restart firmware in case of error");
diff --git a/drivers/net/wireless/iwlegacy/4965-rs.c b/drivers/net/wireless/iwlegacy/4965-rs.c
new file mode 100644
index 000000000000..467d0cb14ecd
--- /dev/null
+++ b/drivers/net/wireless/iwlegacy/4965-rs.c
@@ -0,0 +1,2860 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2005 - 2011 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:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/skbuff.h>
+#include <linux/slab.h>
+#include <net/mac80211.h>
+
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/delay.h>
+
+#include <linux/workqueue.h>
+
+#include "common.h"
+#include "4965.h"
+
+#define IL4965_RS_NAME "iwl-4965-rs"
+
+#define NUM_TRY_BEFORE_ANT_TOGGLE 1
+#define IL_NUMBER_TRY      1
+#define IL_HT_NUMBER_TRY   3
+
+#define RATE_MAX_WINDOW         62      /* # tx in history win */
+#define RATE_MIN_FAILURE_TH             6       /* min failures to calc tpt */
+#define RATE_MIN_SUCCESS_TH             8       /* min successes to calc tpt */
+
+/* max allowed rate miss before sync LQ cmd */
+#define IL_MISSED_RATE_MAX              15
+/* max time to accum history 2 seconds */
+#define RATE_SCALE_FLUSH_INTVL   (3*HZ)
+
+static u8 rs_ht_to_legacy[] = {
+        RATE_6M_IDX, RATE_6M_IDX,
+        RATE_6M_IDX, RATE_6M_IDX,
+        RATE_6M_IDX,
+        RATE_6M_IDX, RATE_9M_IDX,
+        RATE_12M_IDX, RATE_18M_IDX,
+        RATE_24M_IDX, RATE_36M_IDX,
+        RATE_48M_IDX, RATE_54M_IDX
+};
+
+static const u8 ant_toggle_lookup[] = {
+        /*ANT_NONE -> */ ANT_NONE,
+        /*ANT_A    -> */ ANT_B,
+        /*ANT_B    -> */ ANT_C,
+        /*ANT_AB   -> */ ANT_BC,
+        /*ANT_C    -> */ ANT_A,
+        /*ANT_AC   -> */ ANT_AB,
+        /*ANT_BC   -> */ ANT_AC,
+        /*ANT_ABC  -> */ ANT_ABC,
+};
+
+#define IL_DECLARE_RATE_INFO(r, s, ip, in, rp, rn, pp, np)    \
+        [RATE_##r##M_IDX] = { RATE_##r##M_PLCP,      \
+                                    RATE_SISO_##s##M_PLCP, \
+                                    RATE_MIMO2_##s##M_PLCP,\
+                                    RATE_##r##M_IEEE,      \
+                                    RATE_##ip##M_IDX,    \
+                                    RATE_##in##M_IDX,    \
+                                    RATE_##rp##M_IDX,    \
+                                    RATE_##rn##M_IDX,    \
+                                    RATE_##pp##M_IDX,    \
+                                    RATE_##np##M_IDX }
+
+/*
+ * Parameter order:
+ *   rate, ht rate, prev rate, next rate, prev tgg rate, next tgg rate
+ *
+ * If there isn't a valid next or previous rate then INV is used which
+ * maps to RATE_INVALID
+ *
+ */
+const struct il_rate_info il_rates[RATE_COUNT] = {
+        IL_DECLARE_RATE_INFO(1, INV, INV, 2, INV, 2, INV, 2),   /*  1mbps */
+        IL_DECLARE_RATE_INFO(2, INV, 1, 5, 1, 5, 1, 5),         /*  2mbps */
+        IL_DECLARE_RATE_INFO(5, INV, 2, 6, 2, 11, 2, 11),       /*5.5mbps */
+        IL_DECLARE_RATE_INFO(11, INV, 9, 12, 9, 12, 5, 18),     /* 11mbps */
+        IL_DECLARE_RATE_INFO(6, 6, 5, 9, 5, 11, 5, 11),         /*  6mbps */
+        IL_DECLARE_RATE_INFO(9, 6, 6, 11, 6, 11, 5, 11),        /*  9mbps */
+        IL_DECLARE_RATE_INFO(12, 12, 11, 18, 11, 18, 11, 18),   /* 12mbps */
+        IL_DECLARE_RATE_INFO(18, 18, 12, 24, 12, 24, 11, 24),   /* 18mbps */
+        IL_DECLARE_RATE_INFO(24, 24, 18, 36, 18, 36, 18, 36),   /* 24mbps */
+        IL_DECLARE_RATE_INFO(36, 36, 24, 48, 24, 48, 24, 48),   /* 36mbps */
+        IL_DECLARE_RATE_INFO(48, 48, 36, 54, 36, 54, 36, 54),   /* 48mbps */
+        IL_DECLARE_RATE_INFO(54, 54, 48, INV, 48, INV, 48, INV),/* 54mbps */
+        IL_DECLARE_RATE_INFO(60, 60, 48, INV, 48, INV, 48, INV),/* 60mbps */
+};
+
+static int
+il4965_hwrate_to_plcp_idx(u32 rate_n_flags)
+{
+        int idx = 0;
+
+        /* HT rate format */
+        if (rate_n_flags & RATE_MCS_HT_MSK) {
+                idx = (rate_n_flags & 0xff);
+
+                if (idx >= RATE_MIMO2_6M_PLCP)
+                        idx = idx - RATE_MIMO2_6M_PLCP;
+
+                idx += IL_FIRST_OFDM_RATE;
+                /* skip 9M not supported in ht */
+                if (idx >= RATE_9M_IDX)
+                        idx += 1;
+                if (idx >= IL_FIRST_OFDM_RATE && idx <= IL_LAST_OFDM_RATE)
+                        return idx;
+
+                /* legacy rate format, search for match in table */
+        } else {
+                for (idx = 0; idx < ARRAY_SIZE(il_rates); idx++)
+                        if (il_rates[idx].plcp == (rate_n_flags & 0xFF))
+                                return idx;
+        }
+
+        return -1;
+}
+
+static void il4965_rs_rate_scale_perform(struct il_priv *il,
+                                         struct sk_buff *skb,
+                                         struct ieee80211_sta *sta,
+                                         struct il_lq_sta *lq_sta);
+static void il4965_rs_fill_link_cmd(struct il_priv *il,
+                                    struct il_lq_sta *lq_sta, u32 rate_n_flags);
+static void il4965_rs_stay_in_table(struct il_lq_sta *lq_sta,
+                                    bool force_search);
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+static void il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta,
+                                    u32 *rate_n_flags, int idx);
+#else
+static void
+il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta, u32 * rate_n_flags, int idx)
+{
+}
+#endif
+
+/**
+ * The following tables contain the expected throughput metrics for all rates
+ *
+ *      1, 2, 5.5, 11, 6, 9, 12, 18, 24, 36, 48, 54, 60 MBits
+ *
+ * where invalid entries are zeros.
+ *
+ * CCK rates are only valid in legacy table and will only be used in G
+ * (2.4 GHz) band.
+ */
+
+static s32 expected_tpt_legacy[RATE_COUNT] = {
+        7, 13, 35, 58, 40, 57, 72, 98, 121, 154, 177, 186, 0
+};
+
+static s32 expected_tpt_siso20MHz[4][RATE_COUNT] = {
+        {0, 0, 0, 0, 42, 0, 76, 102, 124, 158, 183, 193, 202},  /* Norm */
+        {0, 0, 0, 0, 46, 0, 82, 110, 132, 167, 192, 202, 210},  /* SGI */
+        {0, 0, 0, 0, 48, 0, 93, 135, 176, 251, 319, 351, 381},  /* AGG */
+        {0, 0, 0, 0, 53, 0, 102, 149, 193, 275, 348, 381, 413}, /* AGG+SGI */
+};
+
+static s32 expected_tpt_siso40MHz[4][RATE_COUNT] = {
+        {0, 0, 0, 0, 77, 0, 127, 160, 184, 220, 242, 250, 257}, /* Norm */
+        {0, 0, 0, 0, 83, 0, 135, 169, 193, 229, 250, 257, 264}, /* SGI */
+        {0, 0, 0, 0, 96, 0, 182, 259, 328, 451, 553, 598, 640}, /* AGG */
+        {0, 0, 0, 0, 106, 0, 199, 282, 357, 487, 593, 640, 683},        /* AGG+SGI */
+};
+
+static s32 expected_tpt_mimo2_20MHz[4][RATE_COUNT] = {
+        {0, 0, 0, 0, 74, 0, 123, 155, 179, 213, 235, 243, 250}, /* Norm */
+        {0, 0, 0, 0, 81, 0, 131, 164, 187, 221, 242, 250, 256}, /* SGI */
+        {0, 0, 0, 0, 92, 0, 175, 250, 317, 436, 534, 578, 619}, /* AGG */
+        {0, 0, 0, 0, 102, 0, 192, 273, 344, 470, 573, 619, 660},        /* AGG+SGI */
+};
+
+static s32 expected_tpt_mimo2_40MHz[4][RATE_COUNT] = {
+        {0, 0, 0, 0, 123, 0, 182, 214, 235, 264, 279, 285, 289},        /* Norm */
+        {0, 0, 0, 0, 131, 0, 191, 222, 242, 270, 284, 289, 293},        /* SGI */
+        {0, 0, 0, 0, 180, 0, 327, 446, 545, 708, 828, 878, 922},        /* AGG */
+        {0, 0, 0, 0, 197, 0, 355, 481, 584, 752, 872, 922, 966},        /* AGG+SGI */
+};
+
+/* mbps, mcs */
+static const struct il_rate_mcs_info il_rate_mcs[RATE_COUNT] = {
+        {"1", "BPSK DSSS"},
+        {"2", "QPSK DSSS"},
+        {"5.5", "BPSK CCK"},
+        {"11", "QPSK CCK"},
+        {"6", "BPSK 1/2"},
+        {"9", "BPSK 1/2"},
+        {"12", "QPSK 1/2"},
+        {"18", "QPSK 3/4"},
+        {"24", "16QAM 1/2"},
+        {"36", "16QAM 3/4"},
+        {"48", "64QAM 2/3"},
+        {"54", "64QAM 3/4"},
+        {"60", "64QAM 5/6"},
+};
+
+#define MCS_IDX_PER_STREAM      (8)
+
+static inline u8
+il4965_rs_extract_rate(u32 rate_n_flags)
+{
+        return (u8) (rate_n_flags & 0xFF);
+}
+
+static void
+il4965_rs_rate_scale_clear_win(struct il_rate_scale_data *win)
+{
+        win->data = 0;
+        win->success_counter = 0;
+        win->success_ratio = IL_INVALID_VALUE;
+        win->counter = 0;
+        win->average_tpt = IL_INVALID_VALUE;
+        win->stamp = 0;
+}
+
+static inline u8
+il4965_rs_is_valid_ant(u8 valid_antenna, u8 ant_type)
+{
+        return (ant_type & valid_antenna) == ant_type;
+}
+
+/*
+ *      removes the old data from the stats. All data that is older than
+ *      TID_MAX_TIME_DIFF, will be deleted.
+ */
+static void
+il4965_rs_tl_rm_old_stats(struct il_traffic_load *tl, u32 curr_time)
+{
+        /* 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 u8
+il4965_rs_tl_add_packet(struct il_lq_sta *lq_data, struct ieee80211_hdr *hdr)
+{
+        u32 curr_time = jiffies_to_msecs(jiffies);
+        u32 time_diff;
+        s32 idx;
+        struct il_traffic_load *tl = NULL;
+        u8 tid;
+
+        if (ieee80211_is_data_qos(hdr->frame_control)) {
+                u8 *qc = ieee80211_get_qos_ctl(hdr);
+                tid = qc[0] & 0xf;
+        } else
+                return MAX_TID_COUNT;
+
+        if (unlikely(tid >= TID_MAX_LOAD_COUNT))
+                return MAX_TID_COUNT;
+
+        tl = &lq_data->load[tid];
+
+        curr_time -= curr_time % TID_ROUND_VALUE;
+
+        /* 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 MAX_TID_COUNT;
+        }
+
+        time_diff = TIME_WRAP_AROUND(tl->time_stamp, curr_time);
+        idx = time_diff / TID_QUEUE_CELL_SPACING;
+
+        /* The history is too long: remove data that is older than */
+        /* TID_MAX_TIME_DIFF */
+        if (idx >= TID_QUEUE_MAX_SIZE)
+                il4965_rs_tl_rm_old_stats(tl, curr_time);
+
+        idx = (tl->head + idx) % TID_QUEUE_MAX_SIZE;
+        tl->packet_count[idx] = tl->packet_count[idx] + 1;
+        tl->total = tl->total + 1;
+
+        if ((idx + 1) > tl->queue_count)
+                tl->queue_count = idx + 1;
+
+        return tid;
+}
+
+/*
+        get the traffic load value for tid
+*/
+static u32
+il4965_rs_tl_get_load(struct il_lq_sta *lq_data, u8 tid)
+{
+        u32 curr_time = jiffies_to_msecs(jiffies);
+        u32 time_diff;
+        s32 idx;
+        struct il_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);
+        idx = time_diff / TID_QUEUE_CELL_SPACING;
+
+        /* The history is too long: remove data that is older than */
+        /* TID_MAX_TIME_DIFF */
+        if (idx >= TID_QUEUE_MAX_SIZE)
+                il4965_rs_tl_rm_old_stats(tl, curr_time);
+
+        return tl->total;
+}
+
+static int
+il4965_rs_tl_turn_on_agg_for_tid(struct il_priv *il, struct il_lq_sta *lq_data,
+                                 u8 tid, struct ieee80211_sta *sta)
+{
+        int ret = -EAGAIN;
+        u32 load;
+
+        load = il4965_rs_tl_get_load(lq_data, tid);
+
+        if (load > IL_AGG_LOAD_THRESHOLD) {
+                D_HT("Starting Tx agg: STA: %pM tid: %d\n", sta->addr, tid);
+                ret = ieee80211_start_tx_ba_session(sta, tid, 5000);
+                if (ret == -EAGAIN) {
+                        /*
+                         * driver and mac80211 is out of sync
+                         * this might be cause by reloading firmware
+                         * stop the tx ba session here
+                         */
+                        IL_ERR("Fail start Tx agg on tid: %d\n", tid);
+                        ieee80211_stop_tx_ba_session(sta, tid);
+                }
+        } else
+                D_HT("Aggregation not enabled for tid %d because load = %u\n",
+                     tid, load);
+
+        return ret;
+}
+
+static void
+il4965_rs_tl_turn_on_agg(struct il_priv *il, u8 tid, struct il_lq_sta *lq_data,
+                         struct ieee80211_sta *sta)
+{
+        if (tid < TID_MAX_LOAD_COUNT)
+                il4965_rs_tl_turn_on_agg_for_tid(il, lq_data, tid, sta);
+        else
+                IL_ERR("tid exceeds max load count: %d/%d\n", tid,
+                       TID_MAX_LOAD_COUNT);
+}
+
+static inline int
+il4965_get_il4965_num_of_ant_from_rate(u32 rate_n_flags)
+{
+        return !!(rate_n_flags & RATE_MCS_ANT_A_MSK) +
+            !!(rate_n_flags & RATE_MCS_ANT_B_MSK) +
+            !!(rate_n_flags & RATE_MCS_ANT_C_MSK);
+}
+
+/*
+ * Static function to get the expected throughput from an il_scale_tbl_info
+ * that wraps a NULL pointer check
+ */
+static s32
+il4965_get_expected_tpt(struct il_scale_tbl_info *tbl, int rs_idx)
+{
+        if (tbl->expected_tpt)
+                return tbl->expected_tpt[rs_idx];
+        return 0;
+}
+
+/**
+ * il4965_rs_collect_tx_data - Update the success/failure sliding win
+ *
+ * We keep a sliding win of the last 62 packets transmitted
+ * at this rate.  win->data contains the bitmask of successful
+ * packets.
+ */
+static int
+il4965_rs_collect_tx_data(struct il_scale_tbl_info *tbl, int scale_idx,
+                          int attempts, int successes)
+{
+        struct il_rate_scale_data *win = NULL;
+        static const u64 mask = (((u64) 1) << (RATE_MAX_WINDOW - 1));
+        s32 fail_count, tpt;
+
+        if (scale_idx < 0 || scale_idx >= RATE_COUNT)
+                return -EINVAL;
+
+        /* Select win for current tx bit rate */
+        win = &(tbl->win[scale_idx]);
+
+        /* Get expected throughput */
+        tpt = il4965_get_expected_tpt(tbl, scale_idx);
+
+        /*
+         * Keep track of only the latest 62 tx frame attempts in this rate's
+         * history win; anything older isn't really relevant any more.
+         * If we have filled up the sliding win, drop the oldest attempt;
+         * if the oldest attempt (highest bit in bitmap) shows "success",
+         * subtract "1" from the success counter (this is the main reason
+         * we keep these bitmaps!).
+         */
+        while (attempts > 0) {
+                if (win->counter >= RATE_MAX_WINDOW) {
+
+                        /* remove earliest */
+                        win->counter = RATE_MAX_WINDOW - 1;
+
+                        if (win->data & mask) {
+                                win->data &= ~mask;
+                                win->success_counter--;
+                        }
+                }
+
+                /* Increment frames-attempted counter */
+                win->counter++;
+
+                /* Shift bitmap by one frame to throw away oldest history */
+                win->data <<= 1;
+
+                /* Mark the most recent #successes attempts as successful */
+                if (successes > 0) {
+                        win->success_counter++;
+                        win->data |= 0x1;
+                        successes--;
+                }
+
+                attempts--;
+        }
+
+        /* Calculate current success ratio, avoid divide-by-0! */
+        if (win->counter > 0)
+                win->success_ratio =
+                    128 * (100 * win->success_counter) / win->counter;
+        else
+                win->success_ratio = IL_INVALID_VALUE;
+
+        fail_count = win->counter - win->success_counter;
+
+        /* Calculate average throughput, if we have enough history. */
+        if (fail_count >= RATE_MIN_FAILURE_TH ||
+            win->success_counter >= RATE_MIN_SUCCESS_TH)
+                win->average_tpt = (win->success_ratio * tpt + 64) / 128;
+        else
+                win->average_tpt = IL_INVALID_VALUE;
+
+        /* Tag this win as having been updated */
+        win->stamp = jiffies;
+
+        return 0;
+}
+
+/*
+ * Fill uCode API rate_n_flags field, based on "search" or "active" table.
+ */
+static u32
+il4965_rate_n_flags_from_tbl(struct il_priv *il, struct il_scale_tbl_info *tbl,
+                             int idx, u8 use_green)
+{
+        u32 rate_n_flags = 0;
+
+        if (is_legacy(tbl->lq_type)) {
+                rate_n_flags = il_rates[idx].plcp;
+                if (idx >= IL_FIRST_CCK_RATE && idx <= IL_LAST_CCK_RATE)
+                        rate_n_flags |= RATE_MCS_CCK_MSK;
+
+        } else if (is_Ht(tbl->lq_type)) {
+                if (idx > IL_LAST_OFDM_RATE) {
+                        IL_ERR("Invalid HT rate idx %d\n", idx);
+                        idx = IL_LAST_OFDM_RATE;
+                }
+                rate_n_flags = RATE_MCS_HT_MSK;
+
+                if (is_siso(tbl->lq_type))
+                        rate_n_flags |= il_rates[idx].plcp_siso;
+                else
+                        rate_n_flags |= il_rates[idx].plcp_mimo2;
+        } else {
+                IL_ERR("Invalid tbl->lq_type %d\n", tbl->lq_type);
+        }
+
+        rate_n_flags |=
+            ((tbl->ant_type << RATE_MCS_ANT_POS) & RATE_MCS_ANT_ABC_MSK);
+
+        if (is_Ht(tbl->lq_type)) {
+                if (tbl->is_ht40) {
+                        if (tbl->is_dup)
+                                rate_n_flags |= RATE_MCS_DUP_MSK;
+                        else
+                                rate_n_flags |= RATE_MCS_HT40_MSK;
+                }
+                if (tbl->is_SGI)
+                        rate_n_flags |= RATE_MCS_SGI_MSK;
+
+                if (use_green) {
+                        rate_n_flags |= RATE_MCS_GF_MSK;
+                        if (is_siso(tbl->lq_type) && tbl->is_SGI) {
+                                rate_n_flags &= ~RATE_MCS_SGI_MSK;
+                                IL_ERR("GF was set with SGI:SISO\n");
+                        }
+                }
+        }
+        return rate_n_flags;
+}
+
+/*
+ * Interpret uCode API's rate_n_flags format,
+ * fill "search" or "active" tx mode table.
+ */
+static int
+il4965_rs_get_tbl_info_from_mcs(const u32 rate_n_flags,
+                                enum ieee80211_band band,
+                                struct il_scale_tbl_info *tbl, int *rate_idx)
+{
+        u32 ant_msk = (rate_n_flags & RATE_MCS_ANT_ABC_MSK);
+        u8 il4965_num_of_ant =
+            il4965_get_il4965_num_of_ant_from_rate(rate_n_flags);
+        u8 mcs;
+
+        memset(tbl, 0, sizeof(struct il_scale_tbl_info));
+        *rate_idx = il4965_hwrate_to_plcp_idx(rate_n_flags);
+
+        if (*rate_idx == RATE_INVALID) {
+                *rate_idx = -1;
+                return -EINVAL;
+        }
+        tbl->is_SGI = 0;        /* default legacy setup */
+        tbl->is_ht40 = 0;
+        tbl->is_dup = 0;
+        tbl->ant_type = (ant_msk >> RATE_MCS_ANT_POS);
+        tbl->lq_type = LQ_NONE;
+        tbl->max_search = IL_MAX_SEARCH;
+
+        /* legacy rate format */
+        if (!(rate_n_flags & RATE_MCS_HT_MSK)) {
+                if (il4965_num_of_ant == 1) {
+                        if (band == IEEE80211_BAND_5GHZ)
+                                tbl->lq_type = LQ_A;
+                        else
+                                tbl->lq_type = LQ_G;
+                }
+                /* HT rate format */
+        } else {
+                if (rate_n_flags & RATE_MCS_SGI_MSK)
+                        tbl->is_SGI = 1;
+
+                if ((rate_n_flags & RATE_MCS_HT40_MSK) ||
+                    (rate_n_flags & RATE_MCS_DUP_MSK))
+                        tbl->is_ht40 = 1;
+
+                if (rate_n_flags & RATE_MCS_DUP_MSK)
+                        tbl->is_dup = 1;
+
+                mcs = il4965_rs_extract_rate(rate_n_flags);
+
+                /* SISO */
+                if (mcs <= RATE_SISO_60M_PLCP) {
+                        if (il4965_num_of_ant == 1)
+                                tbl->lq_type = LQ_SISO; /*else NONE */
+                        /* MIMO2 */
+                } else {
+                        if (il4965_num_of_ant == 2)
+                                tbl->lq_type = LQ_MIMO2;
+                }
+        }
+        return 0;
+}
+
+/* switch to another antenna/antennas and return 1 */
+/* if no other valid antenna found, return 0 */
+static int
+il4965_rs_toggle_antenna(u32 valid_ant, u32 *rate_n_flags,
+                         struct il_scale_tbl_info *tbl)
+{
+        u8 new_ant_type;
+
+        if (!tbl->ant_type || tbl->ant_type > ANT_ABC)
+                return 0;
+
+        if (!il4965_rs_is_valid_ant(valid_ant, tbl->ant_type))
+                return 0;
+
+        new_ant_type = ant_toggle_lookup[tbl->ant_type];
+
+        while (new_ant_type != tbl->ant_type &&
+               !il4965_rs_is_valid_ant(valid_ant, new_ant_type))
+                new_ant_type = ant_toggle_lookup[new_ant_type];
+
+        if (new_ant_type == tbl->ant_type)
+                return 0;
+
+        tbl->ant_type = new_ant_type;
+        *rate_n_flags &= ~RATE_MCS_ANT_ABC_MSK;
+        *rate_n_flags |= new_ant_type << RATE_MCS_ANT_POS;
+        return 1;
+}
+
+/**
+ * Green-field mode is valid if the station supports it and
+ * there are no non-GF stations present in the BSS.
+ */
+static bool
+il4965_rs_use_green(struct ieee80211_sta *sta)
+{
+        struct il_station_priv *sta_priv = (void *)sta->drv_priv;
+        struct il_rxon_context *ctx = sta_priv->common.ctx;
+
+        return (sta->ht_cap.cap & IEEE80211_HT_CAP_GRN_FLD) &&
+            !(ctx->ht.non_gf_sta_present);
+}
+
+/**
+ * il4965_rs_get_supported_rates - get the available rates
+ *
+ * if management frame or broadcast frame only return
+ * basic available rates.
+ *
+ */
+static u16
+il4965_rs_get_supported_rates(struct il_lq_sta *lq_sta,
+                              struct ieee80211_hdr *hdr,
+                              enum il_table_type rate_type)
+{
+        if (is_legacy(rate_type)) {
+                return lq_sta->active_legacy_rate;
+        } else {
+                if (is_siso(rate_type))
+                        return lq_sta->active_siso_rate;
+                else
+                        return lq_sta->active_mimo2_rate;
+        }
+}
+
+static u16
+il4965_rs_get_adjacent_rate(struct il_priv *il, u8 idx, u16 rate_mask,
+                            int rate_type)
+{
+        u8 high = RATE_INVALID;
+        u8 low = RATE_INVALID;
+
+        /* 802.11A or ht walks to the next literal adjacent rate in
+         * the rate table */
+        if (is_a_band(rate_type) || !is_legacy(rate_type)) {
+                int i;
+                u32 mask;
+
+                /* Find the previous rate that is in the rate mask */
+                i = idx - 1;
+                for (mask = (1 << i); i >= 0; i--, mask >>= 1) {
+                        if (rate_mask & mask) {
+                                low = i;
+                                break;
+                        }
+                }
+
+                /* Find the next rate that is in the rate mask */
+                i = idx + 1;
+                for (mask = (1 << i); i < RATE_COUNT; i++, mask <<= 1) {
+                        if (rate_mask & mask) {
+                                high = i;
+                                break;
+                        }
+                }
+
+                return (high << 8) | low;
+        }
+
+        low = idx;
+        while (low != RATE_INVALID) {
+                low = il_rates[low].prev_rs;
+                if (low == RATE_INVALID)
+                        break;
+                if (rate_mask & (1 << low))
+                        break;
+                D_RATE("Skipping masked lower rate: %d\n", low);
+        }
+
+        high = idx;
+        while (high != RATE_INVALID) {
+                high = il_rates[high].next_rs;
+                if (high == RATE_INVALID)
+                        break;
+                if (rate_mask & (1 << high))
+                        break;
+                D_RATE("Skipping masked higher rate: %d\n", high);
+        }
+
+        return (high << 8) | low;
+}
+
+static u32
+il4965_rs_get_lower_rate(struct il_lq_sta *lq_sta,
+                         struct il_scale_tbl_info *tbl, u8 scale_idx,
+                         u8 ht_possible)
+{
+        s32 low;
+        u16 rate_mask;
+        u16 high_low;
+        u8 switch_to_legacy = 0;
+        u8 is_green = lq_sta->is_green;
+        struct il_priv *il = lq_sta->drv;
+
+        /* check if we need to switch from HT to legacy rates.
+         * assumption is that mandatory rates (1Mbps or 6Mbps)
+         * are always supported (spec demand) */
+        if (!is_legacy(tbl->lq_type) && (!ht_possible || !scale_idx)) {
+                switch_to_legacy = 1;
+                scale_idx = rs_ht_to_legacy[scale_idx];
+                if (lq_sta->band == IEEE80211_BAND_5GHZ)
+                        tbl->lq_type = LQ_A;
+                else
+                        tbl->lq_type = LQ_G;
+
+                if (il4965_num_of_ant(tbl->ant_type) > 1)
+                        tbl->ant_type =
+                            il4965_first_antenna(il->hw_params.valid_tx_ant);
+
+                tbl->is_ht40 = 0;
+                tbl->is_SGI = 0;
+                tbl->max_search = IL_MAX_SEARCH;
+        }
+
+        rate_mask = il4965_rs_get_supported_rates(lq_sta, NULL, tbl->lq_type);
+
+        /* Mask with station rate restriction */
+        if (is_legacy(tbl->lq_type)) {
+                /* supp_rates has no CCK bits in A mode */
+                if (lq_sta->band == IEEE80211_BAND_5GHZ)
+                        rate_mask =
+                            (u16) (rate_mask &
+                                   (lq_sta->supp_rates << IL_FIRST_OFDM_RATE));
+                else
+                        rate_mask = (u16) (rate_mask & lq_sta->supp_rates);
+        }
+
+        /* If we switched from HT to legacy, check current rate */
+        if (switch_to_legacy && (rate_mask & (1 << scale_idx))) {
+                low = scale_idx;
+                goto out;
+        }
+
+        high_low =
+            il4965_rs_get_adjacent_rate(lq_sta->drv, scale_idx, rate_mask,
+                                        tbl->lq_type);
+        low = high_low & 0xff;
+
+        if (low == RATE_INVALID)
+                low = scale_idx;
+
+out:
+        return il4965_rate_n_flags_from_tbl(lq_sta->drv, tbl, low, is_green);
+}
+
+/*
+ * Simple function to compare two rate scale table types
+ */
+static bool
+il4965_table_type_matches(struct il_scale_tbl_info *a,
+                          struct il_scale_tbl_info *b)
+{
+        return (a->lq_type == b->lq_type && a->ant_type == b->ant_type &&
+                a->is_SGI == b->is_SGI);
+}
+
+/*
+ * mac80211 sends us Tx status
+ */
+static void
+il4965_rs_tx_status(void *il_r, struct ieee80211_supported_band *sband,
+                    struct ieee80211_sta *sta, void *il_sta,
+                    struct sk_buff *skb)
+{
+        int legacy_success;
+        int retries;
+        int rs_idx, mac_idx, i;
+        struct il_lq_sta *lq_sta = il_sta;
+        struct il_link_quality_cmd *table;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+        struct il_priv *il = (struct il_priv *)il_r;
+        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+        enum mac80211_rate_control_flags mac_flags;
+        u32 tx_rate;
+        struct il_scale_tbl_info tbl_type;
+        struct il_scale_tbl_info *curr_tbl, *other_tbl, *tmp_tbl;
+        struct il_station_priv *sta_priv = (void *)sta->drv_priv;
+        struct il_rxon_context *ctx = sta_priv->common.ctx;
+
+        D_RATE("get frame ack response, update rate scale win\n");
+
+        /* Treat uninitialized rate scaling data same as non-existing. */
+        if (!lq_sta) {
+                D_RATE("Station rate scaling not created yet.\n");
+                return;
+        } else if (!lq_sta->drv) {
+                D_RATE("Rate scaling not initialized yet.\n");
+                return;
+        }
+
+        if (!ieee80211_is_data(hdr->frame_control) ||
+            (info->flags & IEEE80211_TX_CTL_NO_ACK))
+                return;
+
+        /* This packet was aggregated but doesn't carry status info */
+        if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
+            !(info->flags & IEEE80211_TX_STAT_AMPDU))
+                return;
+
+        /*
+         * Ignore this Tx frame response if its initial rate doesn't match
+         * that of latest Link Quality command.  There may be stragglers
+         * from a previous Link Quality command, but we're no longer interested
+         * in those; they're either from the "active" mode while we're trying
+         * 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).
+         */
+        table = &lq_sta->lq;
+        tx_rate = le32_to_cpu(table->rs_table[0].rate_n_flags);
+        il4965_rs_get_tbl_info_from_mcs(tx_rate, il->band, &tbl_type, &rs_idx);
+        if (il->band == IEEE80211_BAND_5GHZ)
+                rs_idx -= IL_FIRST_OFDM_RATE;
+        mac_flags = info->status.rates[0].flags;
+        mac_idx = info->status.rates[0].idx;
+        /* For HT packets, map MCS to PLCP */
+        if (mac_flags & IEEE80211_TX_RC_MCS) {
+                mac_idx &= RATE_MCS_CODE_MSK;   /* Remove # of streams */
+                if (mac_idx >= (RATE_9M_IDX - IL_FIRST_OFDM_RATE))
+                        mac_idx++;
+                /*
+                 * mac80211 HT idx is always zero-idxed; we need to move
+                 * HT OFDM rates after CCK rates in 2.4 GHz band
+                 */
+                if (il->band == IEEE80211_BAND_2GHZ)
+                        mac_idx += IL_FIRST_OFDM_RATE;
+        }
+        /* Here we actually compare this rate to the latest LQ command */
+        if (mac_idx < 0 ||
+            tbl_type.is_SGI != !!(mac_flags & IEEE80211_TX_RC_SHORT_GI) ||
+            tbl_type.is_ht40 != !!(mac_flags & IEEE80211_TX_RC_40_MHZ_WIDTH) ||
+            tbl_type.is_dup != !!(mac_flags & IEEE80211_TX_RC_DUP_DATA) ||
+            tbl_type.ant_type != info->antenna_sel_tx ||
+            !!(tx_rate & RATE_MCS_HT_MSK) != !!(mac_flags & IEEE80211_TX_RC_MCS)
+            || !!(tx_rate & RATE_MCS_GF_MSK) !=
+            !!(mac_flags & IEEE80211_TX_RC_GREEN_FIELD) || rs_idx != mac_idx) {
+                D_RATE("initial rate %d does not match %d (0x%x)\n", mac_idx,
+                       rs_idx, tx_rate);
+                /*
+                 * Since rates mis-match, the last LQ command may have failed.
+                 * After IL_MISSED_RATE_MAX mis-matches, resync the uCode with
+                 * ... driver.
+                 */
+                lq_sta->missed_rate_counter++;
+                if (lq_sta->missed_rate_counter > IL_MISSED_RATE_MAX) {
+                        lq_sta->missed_rate_counter = 0;
+                        il_send_lq_cmd(il, ctx, &lq_sta->lq, CMD_ASYNC, false);
+                }
+                /* Regardless, ignore this status info for outdated rate */
+                return;
+        } else
+                /* Rate did match, so reset the missed_rate_counter */
+                lq_sta->missed_rate_counter = 0;
+
+        /* Figure out if rate scale algorithm is in active or search table */
+        if (il4965_table_type_matches
+            (&tbl_type, &(lq_sta->lq_info[lq_sta->active_tbl]))) {
+                curr_tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
+                other_tbl = &(lq_sta->lq_info[1 - lq_sta->active_tbl]);
+        } else
+            if (il4965_table_type_matches
+                (&tbl_type, &lq_sta->lq_info[1 - lq_sta->active_tbl])) {
+                curr_tbl = &(lq_sta->lq_info[1 - lq_sta->active_tbl]);
+                other_tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
+        } else {
+                D_RATE("Neither active nor search matches tx rate\n");
+                tmp_tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
+                D_RATE("active- lq:%x, ant:%x, SGI:%d\n", tmp_tbl->lq_type,
+                       tmp_tbl->ant_type, tmp_tbl->is_SGI);
+                tmp_tbl = &(lq_sta->lq_info[1 - lq_sta->active_tbl]);
+                D_RATE("search- lq:%x, ant:%x, SGI:%d\n", tmp_tbl->lq_type,
+                       tmp_tbl->ant_type, tmp_tbl->is_SGI);
+                D_RATE("actual- lq:%x, ant:%x, SGI:%d\n", tbl_type.lq_type,
+                       tbl_type.ant_type, tbl_type.is_SGI);
+                /*
+                 * no matching table found, let's by-pass the data collection
+                 * and continue to perform rate scale to find the rate table
+                 */
+                il4965_rs_stay_in_table(lq_sta, true);
+                goto done;
+        }
+
+        /*
+         * Updating the frame history depends on whether packets were
+         * aggregated.
+         *
+         * For aggregation, all packets were transmitted at the same rate, the
+         * first idx into rate scale table.
+         */
+        if (info->flags & IEEE80211_TX_STAT_AMPDU) {
+                tx_rate = le32_to_cpu(table->rs_table[0].rate_n_flags);
+                il4965_rs_get_tbl_info_from_mcs(tx_rate, il->band, &tbl_type,
+                                                &rs_idx);
+                il4965_rs_collect_tx_data(curr_tbl, rs_idx,
+                                          info->status.ampdu_len,
+                                          info->status.ampdu_ack_len);
+
+                /* Update success/fail counts if not searching for new mode */
+                if (lq_sta->stay_in_tbl) {
+                        lq_sta->total_success += info->status.ampdu_ack_len;
+                        lq_sta->total_failed +=
+                            (info->status.ampdu_len -
+                             info->status.ampdu_ack_len);
+                }
+        } else {
+                /*
+                 * For legacy, update frame history with for each Tx retry.
+                 */
+                retries = info->status.rates[0].count - 1;
+                /* HW doesn't send more than 15 retries */
+                retries = min(retries, 15);
+
+                /* The last transmission may have been successful */
+                legacy_success = !!(info->flags & IEEE80211_TX_STAT_ACK);
+                /* Collect data for each rate used during failed TX attempts */
+                for (i = 0; i <= retries; ++i) {
+                        tx_rate = le32_to_cpu(table->rs_table[i].rate_n_flags);
+                        il4965_rs_get_tbl_info_from_mcs(tx_rate, il->band,
+                                                        &tbl_type, &rs_idx);
+                        /*
+                         * Only collect stats if retried rate is in the same RS
+                         * table as active/search.
+                         */
+                        if (il4965_table_type_matches(&tbl_type, curr_tbl))
+                                tmp_tbl = curr_tbl;
+                        else if (il4965_table_type_matches
+                                 (&tbl_type, other_tbl))
+                                tmp_tbl = other_tbl;
+                        else
+                                continue;
+                        il4965_rs_collect_tx_data(tmp_tbl, rs_idx, 1,
+                                                  i <
+                                                  retries ? 0 : legacy_success);
+                }
+
+                /* Update success/fail counts if not searching for new mode */
+                if (lq_sta->stay_in_tbl) {
+                        lq_sta->total_success += legacy_success;
+                        lq_sta->total_failed += retries + (1 - legacy_success);
+                }
+        }
+        /* The last TX rate is cached in lq_sta; it's set in if/else above */
+        lq_sta->last_rate_n_flags = tx_rate;
+done:
+        /* See if there's a better rate or modulation mode to try. */
+        if (sta->supp_rates[sband->band])
+                il4965_rs_rate_scale_perform(il, skb, sta, lq_sta);
+}
+
+/*
+ * Begin a period of staying with a selected modulation mode.
+ * Set "stay_in_tbl" flag to prevent any mode switches.
+ * Set frame tx success limits according to legacy vs. high-throughput,
+ * and reset overall (spanning all rates) tx success history stats.
+ * These control how long we stay using same modulation mode before
+ * searching for a new mode.
+ */
+static void
+il4965_rs_set_stay_in_table(struct il_priv *il, u8 is_legacy,
+                            struct il_lq_sta *lq_sta)
+{
+        D_RATE("we are staying in the same table\n");
+        lq_sta->stay_in_tbl = 1;        /* only place this gets set */
+        if (is_legacy) {
+                lq_sta->table_count_limit = IL_LEGACY_TBL_COUNT;
+                lq_sta->max_failure_limit = IL_LEGACY_FAILURE_LIMIT;
+                lq_sta->max_success_limit = IL_LEGACY_SUCCESS_LIMIT;
+        } else {
+                lq_sta->table_count_limit = IL_NONE_LEGACY_TBL_COUNT;
+                lq_sta->max_failure_limit = IL_NONE_LEGACY_FAILURE_LIMIT;
+                lq_sta->max_success_limit = IL_NONE_LEGACY_SUCCESS_LIMIT;
+        }
+        lq_sta->table_count = 0;
+        lq_sta->total_failed = 0;
+        lq_sta->total_success = 0;
+        lq_sta->flush_timer = jiffies;
+        lq_sta->action_counter = 0;
+}
+
+/*
+ * Find correct throughput table for given mode of modulation
+ */
+static void
+il4965_rs_set_expected_tpt_table(struct il_lq_sta *lq_sta,
+                                 struct il_scale_tbl_info *tbl)
+{
+        /* Used to choose among HT tables */
+        s32(*ht_tbl_pointer)[RATE_COUNT];
+
+        /* Check for invalid LQ type */
+        if (WARN_ON_ONCE(!is_legacy(tbl->lq_type) && !is_Ht(tbl->lq_type))) {
+                tbl->expected_tpt = expected_tpt_legacy;
+                return;
+        }
+
+        /* Legacy rates have only one table */
+        if (is_legacy(tbl->lq_type)) {
+                tbl->expected_tpt = expected_tpt_legacy;
+                return;
+        }
+
+        /* Choose among many HT tables depending on number of streams
+         * (SISO/MIMO2), channel width (20/40), SGI, and aggregation
+         * status */
+        if (is_siso(tbl->lq_type) && (!tbl->is_ht40 || lq_sta->is_dup))
+                ht_tbl_pointer = expected_tpt_siso20MHz;
+        else if (is_siso(tbl->lq_type))
+                ht_tbl_pointer = expected_tpt_siso40MHz;
+        else if (is_mimo2(tbl->lq_type) && (!tbl->is_ht40 || lq_sta->is_dup))
+                ht_tbl_pointer = expected_tpt_mimo2_20MHz;
+        else                    /* if (is_mimo2(tbl->lq_type)) <-- must be true */
+                ht_tbl_pointer = expected_tpt_mimo2_40MHz;
+
+        if (!tbl->is_SGI && !lq_sta->is_agg)    /* Normal */
+                tbl->expected_tpt = ht_tbl_pointer[0];
+        else if (tbl->is_SGI && !lq_sta->is_agg)        /* SGI */
+                tbl->expected_tpt = ht_tbl_pointer[1];
+        else if (!tbl->is_SGI && lq_sta->is_agg)        /* AGG */
+                tbl->expected_tpt = ht_tbl_pointer[2];
+        else                    /* AGG+SGI */
+                tbl->expected_tpt = ht_tbl_pointer[3];
+}
+
+/*
+ * Find starting rate for new "search" high-throughput mode of modulation.
+ * Goal is to find lowest expected rate (under perfect conditions) that is
+ * above the current measured throughput of "active" mode, to give new mode
+ * a fair chance to prove itself without too many challenges.
+ *
+ * This gets called when transitioning to more aggressive modulation
+ * (i.e. legacy to SISO or MIMO, or SISO to MIMO), as well as less aggressive
+ * (i.e. MIMO to SISO).  When moving to MIMO, bit rate will typically need
+ * 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
+il4965_rs_get_best_rate(struct il_priv *il, struct il_lq_sta *lq_sta,
+                        struct il_scale_tbl_info *tbl,  /* "search" */
+                        u16 rate_mask, s8 idx)
+{
+        /* "active" values */
+        struct il_scale_tbl_info *active_tbl =
+            &(lq_sta->lq_info[lq_sta->active_tbl]);
+        s32 active_sr = active_tbl->win[idx].success_ratio;
+        s32 active_tpt = active_tbl->expected_tpt[idx];
+
+        /* expected "search" throughput */
+        s32 *tpt_tbl = tbl->expected_tpt;
+
+        s32 new_rate, high, low, start_hi;
+        u16 high_low;
+        s8 rate = idx;
+
+        new_rate = high = low = start_hi = RATE_INVALID;
+
+        for (;;) {
+                high_low =
+                    il4965_rs_get_adjacent_rate(il, rate, rate_mask,
+                                                tbl->lq_type);
+
+                low = high_low & 0xff;
+                high = (high_low >> 8) & 0xff;
+
+                /*
+                 * Lower the "search" bit rate, to give new "search" mode
+                 * approximately the same throughput as "active" if:
+                 *
+                 * 1) "Active" mode has been working modestly well (but not
+                 *    great), and expected "search" throughput (under perfect
+                 *    conditions) at candidate rate is above the actual
+                 *    measured "active" throughput (but less than expected
+                 *    "active" throughput under perfect conditions).
+                 * OR
+                 * 2) "Active" mode has been working perfectly or very well
+                 *    and expected "search" throughput (under perfect
+                 *    conditions) at candidate rate is above expected
+                 *    "active" throughput (under perfect conditions).
+                 */
+                if ((100 * tpt_tbl[rate] > lq_sta->last_tpt &&
+                     (active_sr > RATE_DECREASE_TH && active_sr <= RATE_HIGH_TH
+                      && tpt_tbl[rate] <= active_tpt)) ||
+                    (active_sr >= RATE_SCALE_SWITCH &&
+                     tpt_tbl[rate] > active_tpt)) {
+
+                        /* (2nd or later pass)
+                         * If we've already tried to raise the rate, and are
+                         * now trying to lower it, use the higher rate. */
+                        if (start_hi != RATE_INVALID) {
+                                new_rate = start_hi;
+                                break;
+                        }
+
+                        new_rate = rate;
+
+                        /* Loop again with lower rate */
+                        if (low != RATE_INVALID)
+                                rate = low;
+
+                        /* Lower rate not available, use the original */
+                        else
+                                break;
+
+                        /* Else try to raise the "search" rate to match "active" */
+                } else {
+                        /* (2nd or later pass)
+                         * If we've already tried to lower the rate, and are
+                         * now trying to raise it, use the lower rate. */
+                        if (new_rate != RATE_INVALID)
+                                break;
+
+                        /* Loop again with higher rate */
+                        else if (high != RATE_INVALID) {
+                                start_hi = high;
+                                rate = high;
+
+                                /* Higher rate not available, use the original */
+                        } else {
+                                new_rate = rate;
+                                break;
+                        }
+                }
+        }
+
+        return new_rate;
+}
+
+/*
+ * Set up search table for MIMO2
+ */
+static int
+il4965_rs_switch_to_mimo2(struct il_priv *il, struct il_lq_sta *lq_sta,
+                          struct ieee80211_conf *conf,
+                          struct ieee80211_sta *sta,
+                          struct il_scale_tbl_info *tbl, int idx)
+{
+        u16 rate_mask;
+        s32 rate;
+        s8 is_green = lq_sta->is_green;
+        struct il_station_priv *sta_priv = (void *)sta->drv_priv;
+        struct il_rxon_context *ctx = sta_priv->common.ctx;
+
+        if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported)
+                return -1;
+
+        if (((sta->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >> 2) ==
+            WLAN_HT_CAP_SM_PS_STATIC)
+                return -1;
+
+        /* Need both Tx chains/antennas to support MIMO */
+        if (il->hw_params.tx_chains_num < 2)
+                return -1;
+
+        D_RATE("LQ: try to switch to MIMO2\n");
+
+        tbl->lq_type = LQ_MIMO2;
+        tbl->is_dup = lq_sta->is_dup;
+        tbl->action = 0;
+        tbl->max_search = IL_MAX_SEARCH;
+        rate_mask = lq_sta->active_mimo2_rate;
+
+        if (il_is_ht40_tx_allowed(il, ctx, &sta->ht_cap))
+                tbl->is_ht40 = 1;
+        else
+                tbl->is_ht40 = 0;
+
+        il4965_rs_set_expected_tpt_table(lq_sta, tbl);
+
+        rate = il4965_rs_get_best_rate(il, lq_sta, tbl, rate_mask, idx);
+
+        D_RATE("LQ: MIMO2 best rate %d mask %X\n", rate, rate_mask);
+        if (rate == RATE_INVALID || !((1 << rate) & rate_mask)) {
+                D_RATE("Can't switch with idx %d rate mask %x\n", rate,
+                       rate_mask);
+                return -1;
+        }
+        tbl->current_rate =
+            il4965_rate_n_flags_from_tbl(il, tbl, rate, is_green);
+
+        D_RATE("LQ: Switch to new mcs %X idx is green %X\n", tbl->current_rate,
+               is_green);
+        return 0;
+}
+
+/*
+ * Set up search table for SISO
+ */
+static int
+il4965_rs_switch_to_siso(struct il_priv *il, struct il_lq_sta *lq_sta,
+                         struct ieee80211_conf *conf, struct ieee80211_sta *sta,
+                         struct il_scale_tbl_info *tbl, int idx)
+{
+        u16 rate_mask;
+        u8 is_green = lq_sta->is_green;
+        s32 rate;
+        struct il_station_priv *sta_priv = (void *)sta->drv_priv;
+        struct il_rxon_context *ctx = sta_priv->common.ctx;
+
+        if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported)
+                return -1;
+
+        D_RATE("LQ: try to switch to SISO\n");
+
+        tbl->is_dup = lq_sta->is_dup;
+        tbl->lq_type = LQ_SISO;
+        tbl->action = 0;
+        tbl->max_search = IL_MAX_SEARCH;
+        rate_mask = lq_sta->active_siso_rate;
+
+        if (il_is_ht40_tx_allowed(il, ctx, &sta->ht_cap))
+                tbl->is_ht40 = 1;
+        else
+                tbl->is_ht40 = 0;
+
+        if (is_green)
+                tbl->is_SGI = 0;        /*11n spec: no SGI in SISO+Greenfield */
+
+        il4965_rs_set_expected_tpt_table(lq_sta, tbl);
+        rate = il4965_rs_get_best_rate(il, lq_sta, tbl, rate_mask, idx);
+
+        D_RATE("LQ: get best rate %d mask %X\n", rate, rate_mask);
+        if (rate == RATE_INVALID || !((1 << rate) & rate_mask)) {
+                D_RATE("can not switch with idx %d rate mask %x\n", rate,
+                       rate_mask);
+                return -1;
+        }
+        tbl->current_rate =
+            il4965_rate_n_flags_from_tbl(il, tbl, rate, is_green);
+        D_RATE("LQ: Switch to new mcs %X idx is green %X\n", tbl->current_rate,
+               is_green);
+        return 0;
+}
+
+/*
+ * Try to switch to new modulation mode from legacy
+ */
+static int
+il4965_rs_move_legacy_other(struct il_priv *il, struct il_lq_sta *lq_sta,
+                            struct ieee80211_conf *conf,
+                            struct ieee80211_sta *sta, int idx)
+{
+        struct il_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
+        struct il_scale_tbl_info *search_tbl =
+            &(lq_sta->lq_info[(1 - lq_sta->active_tbl)]);
+        struct il_rate_scale_data *win = &(tbl->win[idx]);
+        u32 sz =
+            (sizeof(struct il_scale_tbl_info) -
+             (sizeof(struct il_rate_scale_data) * RATE_COUNT));
+        u8 start_action;
+        u8 valid_tx_ant = il->hw_params.valid_tx_ant;
+        u8 tx_chains_num = il->hw_params.tx_chains_num;
+        int ret = 0;
+        u8 update_search_tbl_counter = 0;
+
+        tbl->action = IL_LEGACY_SWITCH_SISO;
+
+        start_action = tbl->action;
+        for (;;) {
+                lq_sta->action_counter++;
+                switch (tbl->action) {
+                case IL_LEGACY_SWITCH_ANTENNA1:
+                case IL_LEGACY_SWITCH_ANTENNA2:
+                        D_RATE("LQ: Legacy toggle Antenna\n");
+
+                        if ((tbl->action == IL_LEGACY_SWITCH_ANTENNA1 &&
+                             tx_chains_num <= 1) ||
+                            (tbl->action == IL_LEGACY_SWITCH_ANTENNA2 &&
+                             tx_chains_num <= 2))
+                                break;
+
+                        /* Don't change antenna if success has been great */
+                        if (win->success_ratio >= IL_RS_GOOD_RATIO)
+                                break;
+
+                        /* Set up search table to try other antenna */
+                        memcpy(search_tbl, tbl, sz);
+
+                        if (il4965_rs_toggle_antenna
+                            (valid_tx_ant, &search_tbl->current_rate,
+                             search_tbl)) {
+                                update_search_tbl_counter = 1;
+                                il4965_rs_set_expected_tpt_table(lq_sta,
+                                                                 search_tbl);
+                                goto out;
+                        }
+                        break;
+                case IL_LEGACY_SWITCH_SISO:
+                        D_RATE("LQ: Legacy switch to SISO\n");
+
+                        /* Set up search table to try SISO */
+                        memcpy(search_tbl, tbl, sz);
+                        search_tbl->is_SGI = 0;
+                        ret =
+                            il4965_rs_switch_to_siso(il, lq_sta, conf, sta,
+                                                     search_tbl, idx);
+                        if (!ret) {
+                                lq_sta->action_counter = 0;
+                                goto out;
+                        }
+
+                        break;
+                case IL_LEGACY_SWITCH_MIMO2_AB:
+                case IL_LEGACY_SWITCH_MIMO2_AC:
+                case IL_LEGACY_SWITCH_MIMO2_BC:
+                        D_RATE("LQ: Legacy switch to MIMO2\n");
+
+                        /* Set up search table to try MIMO */
+                        memcpy(search_tbl, tbl, sz);
+                        search_tbl->is_SGI = 0;
+
+                        if (tbl->action == IL_LEGACY_SWITCH_MIMO2_AB)
+                                search_tbl->ant_type = ANT_AB;
+                        else if (tbl->action == IL_LEGACY_SWITCH_MIMO2_AC)
+                                search_tbl->ant_type = ANT_AC;
+                        else
+                                search_tbl->ant_type = ANT_BC;
+
+                        if (!il4965_rs_is_valid_ant
+                            (valid_tx_ant, search_tbl->ant_type))
+                                break;
+
+                        ret =
+                            il4965_rs_switch_to_mimo2(il, lq_sta, conf, sta,
+                                                      search_tbl, idx);
+                        if (!ret) {
+                                lq_sta->action_counter = 0;
+                                goto out;
+                        }
+                        break;
+                }
+                tbl->action++;
+                if (tbl->action > IL_LEGACY_SWITCH_MIMO2_BC)
+                        tbl->action = IL_LEGACY_SWITCH_ANTENNA1;
+
+                if (tbl->action == start_action)
+                        break;
+
+        }
+        search_tbl->lq_type = LQ_NONE;
+        return 0;
+
+out:
+        lq_sta->search_better_tbl = 1;
+        tbl->action++;
+        if (tbl->action > IL_LEGACY_SWITCH_MIMO2_BC)
+                tbl->action = IL_LEGACY_SWITCH_ANTENNA1;
+        if (update_search_tbl_counter)
+                search_tbl->action = tbl->action;
+        return 0;
+
+}
+
+/*
+ * Try to switch to new modulation mode from SISO
+ */
+static int
+il4965_rs_move_siso_to_other(struct il_priv *il, struct il_lq_sta *lq_sta,
+                             struct ieee80211_conf *conf,
+                             struct ieee80211_sta *sta, int idx)
+{
+        u8 is_green = lq_sta->is_green;
+        struct il_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
+        struct il_scale_tbl_info *search_tbl =
+            &(lq_sta->lq_info[(1 - lq_sta->active_tbl)]);
+        struct il_rate_scale_data *win = &(tbl->win[idx]);
+        struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
+        u32 sz =
+            (sizeof(struct il_scale_tbl_info) -
+             (sizeof(struct il_rate_scale_data) * RATE_COUNT));
+        u8 start_action;
+        u8 valid_tx_ant = il->hw_params.valid_tx_ant;
+        u8 tx_chains_num = il->hw_params.tx_chains_num;
+        u8 update_search_tbl_counter = 0;
+        int ret;
+
+        start_action = tbl->action;
+
+        for (;;) {
+                lq_sta->action_counter++;
+                switch (tbl->action) {
+                case IL_SISO_SWITCH_ANTENNA1:
+                case IL_SISO_SWITCH_ANTENNA2:
+                        D_RATE("LQ: SISO toggle Antenna\n");
+                        if ((tbl->action == IL_SISO_SWITCH_ANTENNA1 &&
+                             tx_chains_num <= 1) ||
+                            (tbl->action == IL_SISO_SWITCH_ANTENNA2 &&
+                             tx_chains_num <= 2))
+                                break;
+
+                        if (win->success_ratio >= IL_RS_GOOD_RATIO)
+                                break;
+
+                        memcpy(search_tbl, tbl, sz);
+                        if (il4965_rs_toggle_antenna
+                            (valid_tx_ant, &search_tbl->current_rate,
+                             search_tbl)) {
+                                update_search_tbl_counter = 1;
+                                goto out;
+                        }
+                        break;
+                case IL_SISO_SWITCH_MIMO2_AB:
+                case IL_SISO_SWITCH_MIMO2_AC:
+                case IL_SISO_SWITCH_MIMO2_BC:
+                        D_RATE("LQ: SISO switch to MIMO2\n");
+                        memcpy(search_tbl, tbl, sz);
+                        search_tbl->is_SGI = 0;
+
+                        if (tbl->action == IL_SISO_SWITCH_MIMO2_AB)
+                                search_tbl->ant_type = ANT_AB;
+                        else if (tbl->action == IL_SISO_SWITCH_MIMO2_AC)
+                                search_tbl->ant_type = ANT_AC;
+                        else
+                                search_tbl->ant_type = ANT_BC;
+
+                        if (!il4965_rs_is_valid_ant
+                            (valid_tx_ant, search_tbl->ant_type))
+                                break;
+
+                        ret =
+                            il4965_rs_switch_to_mimo2(il, lq_sta, conf, sta,
+                                                      search_tbl, idx);
+                        if (!ret)
+                                goto out;
+                        break;
+                case IL_SISO_SWITCH_GI:
+                        if (!tbl->is_ht40 &&
+                            !(ht_cap->cap & IEEE80211_HT_CAP_SGI_20))
+                                break;
+                        if (tbl->is_ht40 &&
+                            !(ht_cap->cap & IEEE80211_HT_CAP_SGI_40))
+                                break;
+
+                        D_RATE("LQ: SISO toggle SGI/NGI\n");
+
+                        memcpy(search_tbl, tbl, sz);
+                        if (is_green) {
+                                if (!tbl->is_SGI)
+                                        break;
+                                else
+                                        IL_ERR("SGI was set in GF+SISO\n");
+                        }
+                        search_tbl->is_SGI = !tbl->is_SGI;
+                        il4965_rs_set_expected_tpt_table(lq_sta, search_tbl);
+                        if (tbl->is_SGI) {
+                                s32 tpt = lq_sta->last_tpt / 100;
+                                if (tpt >= search_tbl->expected_tpt[idx])
+                                        break;
+                        }
+                        search_tbl->current_rate =
+                            il4965_rate_n_flags_from_tbl(il, search_tbl, idx,
+                                                         is_green);
+                        update_search_tbl_counter = 1;
+                        goto out;
+                }
+                tbl->action++;
+                if (tbl->action > IL_SISO_SWITCH_GI)
+                        tbl->action = IL_SISO_SWITCH_ANTENNA1;
+
+                if (tbl->action == start_action)
+                        break;
+        }
+        search_tbl->lq_type = LQ_NONE;
+        return 0;
+
+out:
+        lq_sta->search_better_tbl = 1;
+        tbl->action++;
+        if (tbl->action > IL_SISO_SWITCH_GI)
+                tbl->action = IL_SISO_SWITCH_ANTENNA1;
+        if (update_search_tbl_counter)
+                search_tbl->action = tbl->action;
+
+        return 0;
+}
+
+/*
+ * Try to switch to new modulation mode from MIMO2
+ */
+static int
+il4965_rs_move_mimo2_to_other(struct il_priv *il, struct il_lq_sta *lq_sta,
+                              struct ieee80211_conf *conf,
+                              struct ieee80211_sta *sta, int idx)
+{
+        s8 is_green = lq_sta->is_green;
+        struct il_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
+        struct il_scale_tbl_info *search_tbl =
+            &(lq_sta->lq_info[(1 - lq_sta->active_tbl)]);
+        struct il_rate_scale_data *win = &(tbl->win[idx]);
+        struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
+        u32 sz =
+            (sizeof(struct il_scale_tbl_info) -
+             (sizeof(struct il_rate_scale_data) * RATE_COUNT));
+        u8 start_action;
+        u8 valid_tx_ant = il->hw_params.valid_tx_ant;
+        u8 tx_chains_num = il->hw_params.tx_chains_num;
+        u8 update_search_tbl_counter = 0;
+        int ret;
+
+        start_action = tbl->action;
+        for (;;) {
+                lq_sta->action_counter++;
+                switch (tbl->action) {
+                case IL_MIMO2_SWITCH_ANTENNA1:
+                case IL_MIMO2_SWITCH_ANTENNA2:
+                        D_RATE("LQ: MIMO2 toggle Antennas\n");
+
+                        if (tx_chains_num <= 2)
+                                break;
+
+                        if (win->success_ratio >= IL_RS_GOOD_RATIO)
+                                break;
+
+                        memcpy(search_tbl, tbl, sz);
+                        if (il4965_rs_toggle_antenna
+                            (valid_tx_ant, &search_tbl->current_rate,
+                             search_tbl)) {
+                                update_search_tbl_counter = 1;
+                                goto out;
+                        }
+                        break;
+                case IL_MIMO2_SWITCH_SISO_A:
+                case IL_MIMO2_SWITCH_SISO_B:
+                case IL_MIMO2_SWITCH_SISO_C:
+                        D_RATE("LQ: MIMO2 switch to SISO\n");
+
+                        /* Set up new search table for SISO */
+                        memcpy(search_tbl, tbl, sz);
+
+                        if (tbl->action == IL_MIMO2_SWITCH_SISO_A)
+                                search_tbl->ant_type = ANT_A;
+                        else if (tbl->action == IL_MIMO2_SWITCH_SISO_B)
+                                search_tbl->ant_type = ANT_B;
+                        else
+                                search_tbl->ant_type = ANT_C;
+
+                        if (!il4965_rs_is_valid_ant
+                            (valid_tx_ant, search_tbl->ant_type))
+                                break;
+
+                        ret =
+                            il4965_rs_switch_to_siso(il, lq_sta, conf, sta,
+                                                     search_tbl, idx);
+                        if (!ret)
+                                goto out;
+
+                        break;
+
+                case IL_MIMO2_SWITCH_GI:
+                        if (!tbl->is_ht40 &&
+                            !(ht_cap->cap & IEEE80211_HT_CAP_SGI_20))
+                                break;
+                        if (tbl->is_ht40 &&
+                            !(ht_cap->cap & IEEE80211_HT_CAP_SGI_40))
+                                break;
+
+                        D_RATE("LQ: MIMO2 toggle SGI/NGI\n");
+
+                        /* Set up new search table for MIMO2 */
+                        memcpy(search_tbl, tbl, sz);
+                        search_tbl->is_SGI = !tbl->is_SGI;
+                        il4965_rs_set_expected_tpt_table(lq_sta, search_tbl);
+                        /*
+                         * If active table already uses the fastest possible
+                         * modulation (dual stream with short guard interval),
+                         * and it's working well, there's no need to look
+                         * for a better type of modulation!
+                         */
+                        if (tbl->is_SGI) {
+                                s32 tpt = lq_sta->last_tpt / 100;
+                                if (tpt >= search_tbl->expected_tpt[idx])
+                                        break;
+                        }
+                        search_tbl->current_rate =
+                            il4965_rate_n_flags_from_tbl(il, search_tbl, idx,
+                                                         is_green);
+                        update_search_tbl_counter = 1;
+                        goto out;
+
+                }
+                tbl->action++;
+                if (tbl->action > IL_MIMO2_SWITCH_GI)
+                        tbl->action = IL_MIMO2_SWITCH_ANTENNA1;
+
+                if (tbl->action == start_action)
+                        break;
+        }
+        search_tbl->lq_type = LQ_NONE;
+        return 0;
+out:
+        lq_sta->search_better_tbl = 1;
+        tbl->action++;
+        if (tbl->action > IL_MIMO2_SWITCH_GI)
+                tbl->action = IL_MIMO2_SWITCH_ANTENNA1;
+        if (update_search_tbl_counter)
+                search_tbl->action = tbl->action;
+
+        return 0;
+
+}
+
+/*
+ * Check whether we should continue using same modulation mode, or
+ * begin search for a new mode, based on:
+ * 1) # tx successes or failures while using this mode
+ * 2) # times calling this function
+ * 3) elapsed time in this mode (not used, for now)
+ */
+static void
+il4965_rs_stay_in_table(struct il_lq_sta *lq_sta, bool force_search)
+{
+        struct il_scale_tbl_info *tbl;
+        int i;
+        int active_tbl;
+        int flush_interval_passed = 0;
+        struct il_priv *il;
+
+        il = lq_sta->drv;
+        active_tbl = lq_sta->active_tbl;
+
+        tbl = &(lq_sta->lq_info[active_tbl]);
+
+        /* If we've been disallowing search, see if we should now allow it */
+        if (lq_sta->stay_in_tbl) {
+
+                /* Elapsed time using current modulation mode */
+                if (lq_sta->flush_timer)
+                        flush_interval_passed =
+                            time_after(jiffies,
+                                       (unsigned long)(lq_sta->flush_timer +
+                                                       RATE_SCALE_FLUSH_INTVL));
+
+                /*
+                 * Check if we should allow search for new modulation mode.
+                 * If many frames have failed or succeeded, or we've used
+                 * this same modulation for a long time, allow search, and
+                 * reset history stats that keep track of whether we should
+                 * allow a new search.  Also (below) reset all bitmaps and
+                 * stats in active history.
+                 */
+                if (force_search ||
+                    lq_sta->total_failed > lq_sta->max_failure_limit ||
+                    lq_sta->total_success > lq_sta->max_success_limit ||
+                    (!lq_sta->search_better_tbl && lq_sta->flush_timer &&
+                     flush_interval_passed)) {
+                        D_RATE("LQ: stay is expired %d %d %d\n:",
+                               lq_sta->total_failed, lq_sta->total_success,
+                               flush_interval_passed);
+
+                        /* Allow search for new mode */
+                        lq_sta->stay_in_tbl = 0;        /* only place reset */
+                        lq_sta->total_failed = 0;
+                        lq_sta->total_success = 0;
+                        lq_sta->flush_timer = 0;
+
+                        /*
+                         * Else if we've used this modulation mode enough repetitions
+                         * (regardless of elapsed time or success/failure), reset
+                         * history bitmaps and rate-specific stats for all rates in
+                         * active table.
+                         */
+                } else {
+                        lq_sta->table_count++;
+                        if (lq_sta->table_count >= lq_sta->table_count_limit) {
+                                lq_sta->table_count = 0;
+
+                                D_RATE("LQ: stay in table clear win\n");
+                                for (i = 0; i < RATE_COUNT; i++)
+                                        il4965_rs_rate_scale_clear_win(&
+                                                                       (tbl->
+                                                                        win
+                                                                        [i]));
+                        }
+                }
+
+                /* If transitioning to allow "search", reset all history
+                 * bitmaps and stats in active table (this will become the new
+                 * "search" table). */
+                if (!lq_sta->stay_in_tbl) {
+                        for (i = 0; i < RATE_COUNT; i++)
+                                il4965_rs_rate_scale_clear_win(&(tbl->win[i]));
+                }
+        }
+}
+
+/*
+ * setup rate table in uCode
+ */
+static void
+il4965_rs_update_rate_tbl(struct il_priv *il, struct il_rxon_context *ctx,
+                          struct il_lq_sta *lq_sta,
+                          struct il_scale_tbl_info *tbl, int idx, u8 is_green)
+{
+        u32 rate;
+
+        /* Update uCode's rate table. */
+        rate = il4965_rate_n_flags_from_tbl(il, tbl, idx, is_green);
+        il4965_rs_fill_link_cmd(il, lq_sta, rate);
+        il_send_lq_cmd(il, ctx, &lq_sta->lq, CMD_ASYNC, false);
+}
+
+/*
+ * Do rate scaling and search for new modulation mode.
+ */
+static void
+il4965_rs_rate_scale_perform(struct il_priv *il, struct sk_buff *skb,
+                             struct ieee80211_sta *sta,
+                             struct il_lq_sta *lq_sta)
+{
+        struct ieee80211_hw *hw = il->hw;
+        struct ieee80211_conf *conf = &hw->conf;
+        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+        int low = RATE_INVALID;
+        int high = RATE_INVALID;
+        int idx;
+        int i;
+        struct il_rate_scale_data *win = NULL;
+        int current_tpt = IL_INVALID_VALUE;
+        int low_tpt = IL_INVALID_VALUE;
+        int high_tpt = IL_INVALID_VALUE;
+        u32 fail_count;
+        s8 scale_action = 0;
+        u16 rate_mask;
+        u8 update_lq = 0;
+        struct il_scale_tbl_info *tbl, *tbl1;
+        u16 rate_scale_idx_msk = 0;
+        u8 is_green = 0;
+        u8 active_tbl = 0;
+        u8 done_search = 0;
+        u16 high_low;
+        s32 sr;
+        u8 tid = MAX_TID_COUNT;
+        struct il_tid_data *tid_data;
+        struct il_station_priv *sta_priv = (void *)sta->drv_priv;
+        struct il_rxon_context *ctx = sta_priv->common.ctx;
+
+        D_RATE("rate scale calculate new rate for skb\n");
+
+        /* Send management frames and NO_ACK data using lowest rate. */
+        /* TODO: this could probably be improved.. */
+        if (!ieee80211_is_data(hdr->frame_control) ||
+            (info->flags & IEEE80211_TX_CTL_NO_ACK))
+                return;
+
+        lq_sta->supp_rates = sta->supp_rates[lq_sta->band];
+
+        tid = il4965_rs_tl_add_packet(lq_sta, hdr);
+        if (tid != MAX_TID_COUNT && (lq_sta->tx_agg_tid_en & (1 << tid))) {
+                tid_data = &il->stations[lq_sta->lq.sta_id].tid[tid];
+                if (tid_data->agg.state == IL_AGG_OFF)
+                        lq_sta->is_agg = 0;
+                else
+                        lq_sta->is_agg = 1;
+        } else
+                lq_sta->is_agg = 0;
+
+        /*
+         * Select rate-scale / modulation-mode table to work with in
+         * the rest of this function:  "search" if searching for better
+         * modulation mode, or "active" if doing rate scaling within a mode.
+         */
+        if (!lq_sta->search_better_tbl)
+                active_tbl = lq_sta->active_tbl;
+        else
+                active_tbl = 1 - lq_sta->active_tbl;
+
+        tbl = &(lq_sta->lq_info[active_tbl]);
+        if (is_legacy(tbl->lq_type))
+                lq_sta->is_green = 0;
+        else
+                lq_sta->is_green = il4965_rs_use_green(sta);
+        is_green = lq_sta->is_green;
+
+        /* current tx rate */
+        idx = lq_sta->last_txrate_idx;
+
+        D_RATE("Rate scale idx %d for type %d\n", idx, tbl->lq_type);
+
+        /* rates available for this association, and for modulation mode */
+        rate_mask = il4965_rs_get_supported_rates(lq_sta, hdr, tbl->lq_type);
+
+        D_RATE("mask 0x%04X\n", rate_mask);
+
+        /* mask with station rate restriction */
+        if (is_legacy(tbl->lq_type)) {
+                if (lq_sta->band == IEEE80211_BAND_5GHZ)
+                        /* supp_rates has no CCK bits in A mode */
+                        rate_scale_idx_msk =
+                            (u16) (rate_mask &
+                                   (lq_sta->supp_rates << IL_FIRST_OFDM_RATE));
+                else
+                        rate_scale_idx_msk =
+                            (u16) (rate_mask & lq_sta->supp_rates);
+
+        } else
+                rate_scale_idx_msk = rate_mask;
+
+        if (!rate_scale_idx_msk)
+                rate_scale_idx_msk = rate_mask;
+
+        if (!((1 << idx) & rate_scale_idx_msk)) {
+                IL_ERR("Current Rate is not valid\n");
+                if (lq_sta->search_better_tbl) {
+                        /* revert to active table if search table is not valid */
+                        tbl->lq_type = LQ_NONE;
+                        lq_sta->search_better_tbl = 0;
+                        tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
+                        /* get "active" rate info */
+                        idx = il4965_hwrate_to_plcp_idx(tbl->current_rate);
+                        il4965_rs_update_rate_tbl(il, ctx, lq_sta, tbl, idx,
+                                                      is_green);
+                }
+                return;
+        }
+
+        /* Get expected throughput table and history win for current rate */
+        if (!tbl->expected_tpt) {
+                IL_ERR("tbl->expected_tpt is NULL\n");
+                return;
+        }
+
+        /* force user max rate if set by user */
+        if (lq_sta->max_rate_idx != -1 && lq_sta->max_rate_idx < idx) {
+                idx = lq_sta->max_rate_idx;
+                update_lq = 1;
+                win = &(tbl->win[idx]);
+                goto lq_update;
+        }
+
+        win = &(tbl->win[idx]);
+
+        /*
+         * If there is not enough history to calculate actual average
+         * throughput, keep analyzing results of more tx frames, without
+         * changing rate or mode (bypass most of the rest of this function).
+         * Set up new rate table in uCode only if old rate is not supported
+         * in current association (use new rate found above).
+         */
+        fail_count = win->counter - win->success_counter;
+        if (fail_count < RATE_MIN_FAILURE_TH &&
+            win->success_counter < RATE_MIN_SUCCESS_TH) {
+                D_RATE("LQ: still below TH. succ=%d total=%d " "for idx %d\n",
+                       win->success_counter, win->counter, idx);
+
+                /* Can't calculate this yet; not enough history */
+                win->average_tpt = IL_INVALID_VALUE;
+
+                /* Should we stay with this modulation mode,
+                 * or search for a new one? */
+                il4965_rs_stay_in_table(lq_sta, false);
+
+                goto out;
+        }
+        /* Else we have enough samples; calculate estimate of
+         * actual average throughput */
+        if (win->average_tpt !=
+            ((win->success_ratio * tbl->expected_tpt[idx] + 64) / 128)) {
+                IL_ERR("expected_tpt should have been calculated by now\n");
+                win->average_tpt =
+                    ((win->success_ratio * tbl->expected_tpt[idx] + 64) / 128);
+        }
+
+        /* If we are searching for better modulation mode, check success. */
+        if (lq_sta->search_better_tbl) {
+                /* If good success, continue using the "search" mode;
+                 * no need to send new link quality command, since we're
+                 * continuing to use the setup that we've been trying. */
+                if (win->average_tpt > lq_sta->last_tpt) {
+
+                        D_RATE("LQ: SWITCHING TO NEW TBL "
+                               "suc=%d cur-tpt=%d old-tpt=%d\n",
+                               win->success_ratio, win->average_tpt,
+                               lq_sta->last_tpt);
+
+                        if (!is_legacy(tbl->lq_type))
+                                lq_sta->enable_counter = 1;
+
+                        /* Swap tables; "search" becomes "active" */
+                        lq_sta->active_tbl = active_tbl;
+                        current_tpt = win->average_tpt;
+
+                        /* Else poor success; go back to mode in "active" table */
+                } else {
+
+                        D_RATE("LQ: GOING BACK TO THE OLD TBL "
+                               "suc=%d cur-tpt=%d old-tpt=%d\n",
+                               win->success_ratio, win->average_tpt,
+                               lq_sta->last_tpt);
+
+                        /* Nullify "search" table */
+                        tbl->lq_type = LQ_NONE;
+
+                        /* Revert to "active" table */
+                        active_tbl = lq_sta->active_tbl;
+                        tbl = &(lq_sta->lq_info[active_tbl]);
+
+                        /* Revert to "active" rate and throughput info */
+                        idx = il4965_hwrate_to_plcp_idx(tbl->current_rate);
+                        current_tpt = lq_sta->last_tpt;
+
+                        /* Need to set up a new rate table in uCode */
+                        update_lq = 1;
+                }
+
+                /* Either way, we've made a decision; modulation mode
+                 * search is done, allow rate adjustment next time. */
+                lq_sta->search_better_tbl = 0;
+                done_search = 1;        /* Don't switch modes below! */
+                goto lq_update;
+        }
+
+        /* (Else) not in search of better modulation mode, try for better
+         * starting rate, while staying in this mode. */
+        high_low =
+            il4965_rs_get_adjacent_rate(il, idx, rate_scale_idx_msk,
+                                        tbl->lq_type);
+        low = high_low & 0xff;
+        high = (high_low >> 8) & 0xff;
+
+        /* If user set max rate, dont allow higher than user constrain */
+        if (lq_sta->max_rate_idx != -1 && lq_sta->max_rate_idx < high)
+                high = RATE_INVALID;
+
+        sr = win->success_ratio;
+
+        /* Collect measured throughputs for current and adjacent rates */
+        current_tpt = win->average_tpt;
+        if (low != RATE_INVALID)
+                low_tpt = tbl->win[low].average_tpt;
+        if (high != RATE_INVALID)
+                high_tpt = tbl->win[high].average_tpt;
+
+        scale_action = 0;
+
+        /* Too many failures, decrease rate */
+        if (sr <= RATE_DECREASE_TH || current_tpt == 0) {
+                D_RATE("decrease rate because of low success_ratio\n");
+                scale_action = -1;
+
+                /* No throughput measured yet for adjacent rates; try increase. */
+        } else if (low_tpt == IL_INVALID_VALUE && high_tpt == IL_INVALID_VALUE) {
+
+                if (high != RATE_INVALID && sr >= RATE_INCREASE_TH)
+                        scale_action = 1;
+                else if (low != RATE_INVALID)
+                        scale_action = 0;
+        }
+
+        /* Both adjacent throughputs are measured, but neither one has better
+         * throughput; we're using the best rate, don't change it! */
+        else if (low_tpt != IL_INVALID_VALUE && high_tpt != IL_INVALID_VALUE &&
+                 low_tpt < current_tpt && high_tpt < current_tpt)
+                scale_action = 0;
+
+        /* At least one adjacent rate's throughput is measured,
+         * and may have better performance. */
+        else {
+                /* Higher adjacent rate's throughput is measured */
+                if (high_tpt != IL_INVALID_VALUE) {
+                        /* Higher rate has better throughput */
+                        if (high_tpt > current_tpt && sr >= RATE_INCREASE_TH)
+                                scale_action = 1;
+                        else
+                                scale_action = 0;
+
+                        /* Lower adjacent rate's throughput is measured */
+                } else if (low_tpt != IL_INVALID_VALUE) {
+                        /* Lower rate has better throughput */
+                        if (low_tpt > current_tpt) {
+                                D_RATE("decrease rate because of low tpt\n");
+                                scale_action = -1;
+                        } else if (sr >= RATE_INCREASE_TH) {
+                                scale_action = 1;
+                        }
+                }
+        }
+
+        /* Sanity check; asked for decrease, but success rate or throughput
+         * has been good at old rate.  Don't change it. */
+        if (scale_action == -1 && low != RATE_INVALID &&
+            (sr > RATE_HIGH_TH || current_tpt > 100 * tbl->expected_tpt[low]))
+                scale_action = 0;
+
+        switch (scale_action) {
+        case -1:
+                /* Decrease starting rate, update uCode's rate table */
+                if (low != RATE_INVALID) {
+                        update_lq = 1;
+                        idx = low;
+                }
+
+                break;
+        case 1:
+                /* Increase starting rate, update uCode's rate table */
+                if (high != RATE_INVALID) {
+                        update_lq = 1;
+                        idx = high;
+                }
+
+                break;
+        case 0:
+                /* No change */
+        default:
+                break;
+        }
+
+        D_RATE("choose rate scale idx %d action %d low %d " "high %d type %d\n",
+               idx, scale_action, low, high, tbl->lq_type);
+
+lq_update:
+        /* Replace uCode's rate table for the destination station. */
+        if (update_lq)
+                il4965_rs_update_rate_tbl(il, ctx, lq_sta, tbl, idx,
+                                              is_green);
+
+        /* Should we stay with this modulation mode,
+         * or search for a new one? */
+        il4965_rs_stay_in_table(lq_sta, false);
+
+        /*
+         * Search for new modulation mode if we're:
+         * 1)  Not changing rates right now
+         * 2)  Not just finishing up a search
+         * 3)  Allowing a new search
+         */
+        if (!update_lq && !done_search && !lq_sta->stay_in_tbl && win->counter) {
+                /* Save current throughput to compare with "search" throughput */
+                lq_sta->last_tpt = current_tpt;
+
+                /* Select a new "search" modulation mode to try.
+                 * If one is found, set up the new "search" table. */
+                if (is_legacy(tbl->lq_type))
+                        il4965_rs_move_legacy_other(il, lq_sta, conf, sta, idx);
+                else if (is_siso(tbl->lq_type))
+                        il4965_rs_move_siso_to_other(il, lq_sta, conf, sta,
+                                                     idx);
+                else            /* (is_mimo2(tbl->lq_type)) */
+                        il4965_rs_move_mimo2_to_other(il, lq_sta, conf, sta,
+                                                      idx);
+
+                /* If new "search" mode was selected, set up in uCode table */
+                if (lq_sta->search_better_tbl) {
+                        /* Access the "search" table, clear its history. */
+                        tbl = &(lq_sta->lq_info[(1 - lq_sta->active_tbl)]);
+                        for (i = 0; i < RATE_COUNT; i++)
+                                il4965_rs_rate_scale_clear_win(&(tbl->win[i]));
+
+                        /* Use new "search" start rate */
+                        idx = il4965_hwrate_to_plcp_idx(tbl->current_rate);
+
+                        D_RATE("Switch current  mcs: %X idx: %d\n",
+                               tbl->current_rate, idx);
+                        il4965_rs_fill_link_cmd(il, lq_sta, tbl->current_rate);
+                        il_send_lq_cmd(il, ctx, &lq_sta->lq, CMD_ASYNC, false);
+                } else
+                        done_search = 1;
+        }
+
+        if (done_search && !lq_sta->stay_in_tbl) {
+                /* If the "active" (non-search) mode was legacy,
+                 * and we've tried switching antennas,
+                 * but we haven't been able to try HT modes (not available),
+                 * stay with best antenna legacy modulation for a while
+                 * before next round of mode comparisons. */
+                tbl1 = &(lq_sta->lq_info[lq_sta->active_tbl]);
+                if (is_legacy(tbl1->lq_type) && !conf_is_ht(conf) &&
+                    lq_sta->action_counter > tbl1->max_search) {
+                        D_RATE("LQ: STAY in legacy table\n");
+                        il4965_rs_set_stay_in_table(il, 1, lq_sta);
+                }
+
+                /* If we're in an HT mode, and all 3 mode switch actions
+                 * have been tried and compared, stay in this best modulation
+                 * mode for a while before next round of mode comparisons. */
+                if (lq_sta->enable_counter &&
+                    lq_sta->action_counter >= tbl1->max_search) {
+                        if (lq_sta->last_tpt > IL_AGG_TPT_THREHOLD &&
+                            (lq_sta->tx_agg_tid_en & (1 << tid)) &&
+                            tid != MAX_TID_COUNT) {
+                                tid_data =
+                                    &il->stations[lq_sta->lq.sta_id].tid[tid];
+                                if (tid_data->agg.state == IL_AGG_OFF) {
+                                        D_RATE("try to aggregate tid %d\n",
+                                               tid);
+                                        il4965_rs_tl_turn_on_agg(il, tid,
+                                                                 lq_sta, sta);
+                                }
+                        }
+                        il4965_rs_set_stay_in_table(il, 0, lq_sta);
+                }
+        }
+
+out:
+        tbl->current_rate =
+            il4965_rate_n_flags_from_tbl(il, tbl, idx, is_green);
+        i = idx;
+        lq_sta->last_txrate_idx = i;
+}
+
+/**
+ * il4965_rs_initialize_lq - Initialize a station's hardware rate table
+ *
+ * The uCode's station table contains a table of fallback rates
+ * for automatic fallback during transmission.
+ *
+ * NOTE: This sets up a default set of values.  These will be replaced later
+ *       if the driver's iwl-4965-rs rate scaling algorithm is used, instead of
+ *       rc80211_simple.
+ *
+ * NOTE: Run C_ADD_STA command to set up station table entry, before
+ *       calling this function (which runs C_TX_LINK_QUALITY_CMD,
+ *       which requires station table entry to exist).
+ */
+static void
+il4965_rs_initialize_lq(struct il_priv *il, struct ieee80211_conf *conf,
+                        struct ieee80211_sta *sta, struct il_lq_sta *lq_sta)
+{
+        struct il_scale_tbl_info *tbl;
+        int rate_idx;
+        int i;
+        u32 rate;
+        u8 use_green = il4965_rs_use_green(sta);
+        u8 active_tbl = 0;
+        u8 valid_tx_ant;
+        struct il_station_priv *sta_priv;
+        struct il_rxon_context *ctx;
+
+        if (!sta || !lq_sta)
+                return;
+
+        sta_priv = (void *)sta->drv_priv;
+        ctx = sta_priv->common.ctx;
+
+        i = lq_sta->last_txrate_idx;
+
+        valid_tx_ant = il->hw_params.valid_tx_ant;
+
+        if (!lq_sta->search_better_tbl)
+                active_tbl = lq_sta->active_tbl;
+        else
+                active_tbl = 1 - lq_sta->active_tbl;
+
+        tbl = &(lq_sta->lq_info[active_tbl]);
+
+        if (i < 0 || i >= RATE_COUNT)
+                i = 0;
+
+        rate = il_rates[i].plcp;
+        tbl->ant_type = il4965_first_antenna(valid_tx_ant);
+        rate |= tbl->ant_type << RATE_MCS_ANT_POS;
+
+        if (i >= IL_FIRST_CCK_RATE && i <= IL_LAST_CCK_RATE)
+                rate |= RATE_MCS_CCK_MSK;
+
+        il4965_rs_get_tbl_info_from_mcs(rate, il->band, tbl, &rate_idx);
+        if (!il4965_rs_is_valid_ant(valid_tx_ant, tbl->ant_type))
+                il4965_rs_toggle_antenna(valid_tx_ant, &rate, tbl);
+
+        rate = il4965_rate_n_flags_from_tbl(il, tbl, rate_idx, use_green);
+        tbl->current_rate = rate;
+        il4965_rs_set_expected_tpt_table(lq_sta, tbl);
+        il4965_rs_fill_link_cmd(NULL, lq_sta, rate);
+        il->stations[lq_sta->lq.sta_id].lq = &lq_sta->lq;
+        il_send_lq_cmd(il, ctx, &lq_sta->lq, CMD_SYNC, true);
+}
+
+static void
+il4965_rs_get_rate(void *il_r, struct ieee80211_sta *sta, void *il_sta,
+                   struct ieee80211_tx_rate_control *txrc)
+{
+
+        struct sk_buff *skb = txrc->skb;
+        struct ieee80211_supported_band *sband = txrc->sband;
+        struct il_priv *il __maybe_unused = (struct il_priv *)il_r;
+        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+        struct il_lq_sta *lq_sta = il_sta;
+        int rate_idx;
+
+        D_RATE("rate scale calculate new rate for skb\n");
+
+        /* Get max rate if user set max rate */
+        if (lq_sta) {
+                lq_sta->max_rate_idx = txrc->max_rate_idx;
+                if (sband->band == IEEE80211_BAND_5GHZ &&
+                    lq_sta->max_rate_idx != -1)
+                        lq_sta->max_rate_idx += IL_FIRST_OFDM_RATE;
+                if (lq_sta->max_rate_idx < 0 ||
+                    lq_sta->max_rate_idx >= RATE_COUNT)
+                        lq_sta->max_rate_idx = -1;
+        }
+
+        /* Treat uninitialized rate scaling data same as non-existing. */
+        if (lq_sta && !lq_sta->drv) {
+                D_RATE("Rate scaling not initialized yet.\n");
+                il_sta = NULL;
+        }
+
+        /* Send management frames and NO_ACK data using lowest rate. */
+        if (rate_control_send_low(sta, il_sta, txrc))
+                return;
+
+        if (!lq_sta)
+                return;
+
+        rate_idx = lq_sta->last_txrate_idx;
+
+        if (lq_sta->last_rate_n_flags & RATE_MCS_HT_MSK) {
+                rate_idx -= IL_FIRST_OFDM_RATE;
+                /* 6M and 9M shared same MCS idx */
+                rate_idx = (rate_idx > 0) ? (rate_idx - 1) : 0;
+                if (il4965_rs_extract_rate(lq_sta->last_rate_n_flags) >=
+                    RATE_MIMO2_6M_PLCP)
+                        rate_idx = rate_idx + MCS_IDX_PER_STREAM;
+                info->control.rates[0].flags = IEEE80211_TX_RC_MCS;
+                if (lq_sta->last_rate_n_flags & RATE_MCS_SGI_MSK)
+                        info->control.rates[0].flags |=
+                            IEEE80211_TX_RC_SHORT_GI;
+                if (lq_sta->last_rate_n_flags & RATE_MCS_DUP_MSK)
+                        info->control.rates[0].flags |=
+                            IEEE80211_TX_RC_DUP_DATA;
+                if (lq_sta->last_rate_n_flags & RATE_MCS_HT40_MSK)
+                        info->control.rates[0].flags |=
+                            IEEE80211_TX_RC_40_MHZ_WIDTH;
+                if (lq_sta->last_rate_n_flags & RATE_MCS_GF_MSK)
+                        info->control.rates[0].flags |=
+                            IEEE80211_TX_RC_GREEN_FIELD;
+        } else {
+                /* Check for invalid rates */
+                if (rate_idx < 0 || rate_idx >= RATE_COUNT_LEGACY ||
+                    (sband->band == IEEE80211_BAND_5GHZ &&
+                     rate_idx < IL_FIRST_OFDM_RATE))
+                        rate_idx = rate_lowest_index(sband, sta);
+                /* On valid 5 GHz rate, adjust idx */
+                else if (sband->band == IEEE80211_BAND_5GHZ)
+                        rate_idx -= IL_FIRST_OFDM_RATE;
+                info->control.rates[0].flags = 0;
+        }
+        info->control.rates[0].idx = rate_idx;
+
+}
+
+static void *
+il4965_rs_alloc_sta(void *il_rate, struct ieee80211_sta *sta, gfp_t gfp)
+{
+        struct il_station_priv *sta_priv =
+            (struct il_station_priv *)sta->drv_priv;
+        struct il_priv *il;
+
+        il = (struct il_priv *)il_rate;
+        D_RATE("create station rate scale win\n");
+
+        return &sta_priv->lq_sta;
+}
+
+/*
+ * Called after adding a new station to initialize rate scaling
+ */
+void
+il4965_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta, u8 sta_id)
+{
+        int i, j;
+        struct ieee80211_hw *hw = il->hw;
+        struct ieee80211_conf *conf = &il->hw->conf;
+        struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
+        struct il_station_priv *sta_priv;
+        struct il_lq_sta *lq_sta;
+        struct ieee80211_supported_band *sband;
+
+        sta_priv = (struct il_station_priv *)sta->drv_priv;
+        lq_sta = &sta_priv->lq_sta;
+        sband = hw->wiphy->bands[conf->channel->band];
+
+        lq_sta->lq.sta_id = sta_id;
+
+        for (j = 0; j < LQ_SIZE; j++)
+                for (i = 0; i < RATE_COUNT; i++)
+                        il4965_rs_rate_scale_clear_win(&lq_sta->lq_info[j].
+                                                       win[i]);
+
+        lq_sta->flush_timer = 0;
+        lq_sta->supp_rates = sta->supp_rates[sband->band];
+        for (j = 0; j < LQ_SIZE; j++)
+                for (i = 0; i < RATE_COUNT; i++)
+                        il4965_rs_rate_scale_clear_win(&lq_sta->lq_info[j].
+                                                       win[i]);
+
+        D_RATE("LQ:" "*** rate scale station global init for station %d ***\n",
+               sta_id);
+        /* TODO: what is a good starting rate for STA? About middle? Maybe not
+         * the lowest or the highest rate.. Could consider using RSSI from
+         * previous packets? Need to have IEEE 802.1X auth succeed immediately
+         * after assoc.. */
+
+        lq_sta->is_dup = 0;
+        lq_sta->max_rate_idx = -1;
+        lq_sta->missed_rate_counter = IL_MISSED_RATE_MAX;
+        lq_sta->is_green = il4965_rs_use_green(sta);
+        lq_sta->active_legacy_rate = il->active_rate & ~(0x1000);
+        lq_sta->band = il->band;
+        /*
+         * active_siso_rate mask includes 9 MBits (bit 5), and CCK (bits 0-3),
+         * supp_rates[] does not; shift to convert format, force 9 MBits off.
+         */
+        lq_sta->active_siso_rate = ht_cap->mcs.rx_mask[0] << 1;
+        lq_sta->active_siso_rate |= ht_cap->mcs.rx_mask[0] & 0x1;
+        lq_sta->active_siso_rate &= ~((u16) 0x2);
+        lq_sta->active_siso_rate <<= IL_FIRST_OFDM_RATE;
+
+        /* Same here */
+        lq_sta->active_mimo2_rate = ht_cap->mcs.rx_mask[1] << 1;
+        lq_sta->active_mimo2_rate |= ht_cap->mcs.rx_mask[1] & 0x1;
+        lq_sta->active_mimo2_rate &= ~((u16) 0x2);
+        lq_sta->active_mimo2_rate <<= IL_FIRST_OFDM_RATE;
+
+        /* These values will be overridden later */
+        lq_sta->lq.general_params.single_stream_ant_msk =
+            il4965_first_antenna(il->hw_params.valid_tx_ant);
+        lq_sta->lq.general_params.dual_stream_ant_msk =
+            il->hw_params.valid_tx_ant & ~il4965_first_antenna(il->hw_params.
+                                                               valid_tx_ant);
+        if (!lq_sta->lq.general_params.dual_stream_ant_msk) {
+                lq_sta->lq.general_params.dual_stream_ant_msk = ANT_AB;
+        } else if (il4965_num_of_ant(il->hw_params.valid_tx_ant) == 2) {
+                lq_sta->lq.general_params.dual_stream_ant_msk =
+                    il->hw_params.valid_tx_ant;
+        }
+
+        /* as default allow aggregation for all tids */
+        lq_sta->tx_agg_tid_en = IL_AGG_ALL_TID;
+        lq_sta->drv = il;
+
+        /* Set last_txrate_idx to lowest rate */
+        lq_sta->last_txrate_idx = rate_lowest_index(sband, sta);
+        if (sband->band == IEEE80211_BAND_5GHZ)
+                lq_sta->last_txrate_idx += IL_FIRST_OFDM_RATE;
+        lq_sta->is_agg = 0;
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+        lq_sta->dbg_fixed_rate = 0;
+#endif
+
+        il4965_rs_initialize_lq(il, conf, sta, lq_sta);
+}
+
+static void
+il4965_rs_fill_link_cmd(struct il_priv *il, struct il_lq_sta *lq_sta,
+                        u32 new_rate)
+{
+        struct il_scale_tbl_info tbl_type;
+        int idx = 0;
+        int rate_idx;
+        int repeat_rate = 0;
+        u8 ant_toggle_cnt = 0;
+        u8 use_ht_possible = 1;
+        u8 valid_tx_ant = 0;
+        struct il_link_quality_cmd *lq_cmd = &lq_sta->lq;
+
+        /* Override starting rate (idx 0) if needed for debug purposes */
+        il4965_rs_dbgfs_set_mcs(lq_sta, &new_rate, idx);
+
+        /* Interpret new_rate (rate_n_flags) */
+        il4965_rs_get_tbl_info_from_mcs(new_rate, lq_sta->band, &tbl_type,
+                                        &rate_idx);
+
+        /* How many times should we repeat the initial rate? */
+        if (is_legacy(tbl_type.lq_type)) {
+                ant_toggle_cnt = 1;
+                repeat_rate = IL_NUMBER_TRY;
+        } else {
+                repeat_rate = IL_HT_NUMBER_TRY;
+        }
+
+        lq_cmd->general_params.mimo_delimiter =
+            is_mimo(tbl_type.lq_type) ? 1 : 0;
+
+        /* Fill 1st table entry (idx 0) */
+        lq_cmd->rs_table[idx].rate_n_flags = cpu_to_le32(new_rate);
+
+        if (il4965_num_of_ant(tbl_type.ant_type) == 1) {
+                lq_cmd->general_params.single_stream_ant_msk =
+                    tbl_type.ant_type;
+        } else if (il4965_num_of_ant(tbl_type.ant_type) == 2) {
+                lq_cmd->general_params.dual_stream_ant_msk = tbl_type.ant_type;
+        }
+        /* otherwise we don't modify the existing value */
+        idx++;
+        repeat_rate--;
+        if (il)
+                valid_tx_ant = il->hw_params.valid_tx_ant;
+
+        /* Fill rest of rate table */
+        while (idx < LINK_QUAL_MAX_RETRY_NUM) {
+                /* Repeat initial/next rate.
+                 * For legacy IL_NUMBER_TRY == 1, this loop will not execute.
+                 * For HT IL_HT_NUMBER_TRY == 3, this executes twice. */
+                while (repeat_rate > 0 && idx < LINK_QUAL_MAX_RETRY_NUM) {
+                        if (is_legacy(tbl_type.lq_type)) {
+                                if (ant_toggle_cnt < NUM_TRY_BEFORE_ANT_TOGGLE)
+                                        ant_toggle_cnt++;
+                                else if (il &&
+                                         il4965_rs_toggle_antenna(valid_tx_ant,
+                                                                  &new_rate,
+                                                                  &tbl_type))
+                                        ant_toggle_cnt = 1;
+                        }
+
+                        /* Override next rate if needed for debug purposes */
+                        il4965_rs_dbgfs_set_mcs(lq_sta, &new_rate, idx);
+
+                        /* Fill next table entry */
+                        lq_cmd->rs_table[idx].rate_n_flags =
+                            cpu_to_le32(new_rate);
+                        repeat_rate--;
+                        idx++;
+                }
+
+                il4965_rs_get_tbl_info_from_mcs(new_rate, lq_sta->band,
+                                                &tbl_type, &rate_idx);
+
+                /* Indicate to uCode which entries might be MIMO.
+                 * If initial rate was MIMO, this will finally end up
+                 * as (IL_HT_NUMBER_TRY * 2), after 2nd pass, otherwise 0. */
+                if (is_mimo(tbl_type.lq_type))
+                        lq_cmd->general_params.mimo_delimiter = idx;
+
+                /* Get next rate */
+                new_rate =
+                    il4965_rs_get_lower_rate(lq_sta, &tbl_type, rate_idx,
+                                             use_ht_possible);
+
+                /* How many times should we repeat the next rate? */
+                if (is_legacy(tbl_type.lq_type)) {
+                        if (ant_toggle_cnt < NUM_TRY_BEFORE_ANT_TOGGLE)
+                                ant_toggle_cnt++;
+                        else if (il &&
+                                 il4965_rs_toggle_antenna(valid_tx_ant,
+                                                          &new_rate, &tbl_type))
+                                ant_toggle_cnt = 1;
+
+                        repeat_rate = IL_NUMBER_TRY;
+                } else {
+                        repeat_rate = IL_HT_NUMBER_TRY;
+                }
+
+                /* Don't allow HT rates after next pass.
+                 * il4965_rs_get_lower_rate() will change type to LQ_A or LQ_G. */
+                use_ht_possible = 0;
+
+                /* Override next rate if needed for debug purposes */
+                il4965_rs_dbgfs_set_mcs(lq_sta, &new_rate, idx);
+
+                /* Fill next table entry */
+                lq_cmd->rs_table[idx].rate_n_flags = cpu_to_le32(new_rate);
+
+                idx++;
+                repeat_rate--;
+        }
+
+        lq_cmd->agg_params.agg_frame_cnt_limit = LINK_QUAL_AGG_FRAME_LIMIT_DEF;
+        lq_cmd->agg_params.agg_dis_start_th = LINK_QUAL_AGG_DISABLE_START_DEF;
+
+        lq_cmd->agg_params.agg_time_limit =
+            cpu_to_le16(LINK_QUAL_AGG_TIME_LIMIT_DEF);
+}
+
+static void *
+il4965_rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
+{
+        return hw->priv;
+}
+
+/* rate scale requires free function to be implemented */
+static void
+il4965_rs_free(void *il_rate)
+{
+        return;
+}
+
+static void
+il4965_rs_free_sta(void *il_r, struct ieee80211_sta *sta, void *il_sta)
+{
+        struct il_priv *il __maybe_unused = il_r;
+
+        D_RATE("enter\n");
+        D_RATE("leave\n");
+}
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+static int
+il4965_open_file_generic(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->i_private;
+        return 0;
+}
+
+static void
+il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta, u32 * rate_n_flags, int idx)
+{
+        struct il_priv *il;
+        u8 valid_tx_ant;
+        u8 ant_sel_tx;
+
+        il = lq_sta->drv;
+        valid_tx_ant = il->hw_params.valid_tx_ant;
+        if (lq_sta->dbg_fixed_rate) {
+                ant_sel_tx =
+                    ((lq_sta->
+                      dbg_fixed_rate & RATE_MCS_ANT_ABC_MSK) >>
+                     RATE_MCS_ANT_POS);
+                if ((valid_tx_ant & ant_sel_tx) == ant_sel_tx) {
+                        *rate_n_flags = lq_sta->dbg_fixed_rate;
+                        D_RATE("Fixed rate ON\n");
+                } else {
+                        lq_sta->dbg_fixed_rate = 0;
+                        IL_ERR
+                            ("Invalid antenna selection 0x%X, Valid is 0x%X\n",
+                             ant_sel_tx, valid_tx_ant);
+                        D_RATE("Fixed rate OFF\n");
+                }
+        } else {
+                D_RATE("Fixed rate OFF\n");
+        }
+}
+
+static ssize_t
+il4965_rs_sta_dbgfs_scale_table_write(struct file *file,
+                                      const char __user *user_buf,
+                                      size_t count, loff_t *ppos)
+{
+        struct il_lq_sta *lq_sta = file->private_data;
+        struct il_priv *il;
+        char buf[64];
+        size_t buf_size;
+        u32 parsed_rate;
+        struct il_station_priv *sta_priv =
+            container_of(lq_sta, struct il_station_priv, lq_sta);
+        struct il_rxon_context *ctx = sta_priv->common.ctx;
+
+        il = lq_sta->drv;
+        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", &parsed_rate) == 1)
+                lq_sta->dbg_fixed_rate = parsed_rate;
+        else
+                lq_sta->dbg_fixed_rate = 0;
+
+        lq_sta->active_legacy_rate = 0x0FFF;    /* 1 - 54 MBits, includes CCK */
+        lq_sta->active_siso_rate = 0x1FD0;      /* 6 - 60 MBits, no 9, no CCK */
+        lq_sta->active_mimo2_rate = 0x1FD0;     /* 6 - 60 MBits, no 9, no CCK */
+
+        D_RATE("sta_id %d rate 0x%X\n", lq_sta->lq.sta_id,
+               lq_sta->dbg_fixed_rate);
+
+        if (lq_sta->dbg_fixed_rate) {
+                il4965_rs_fill_link_cmd(NULL, lq_sta, lq_sta->dbg_fixed_rate);
+                il_send_lq_cmd(lq_sta->drv, ctx, &lq_sta->lq, CMD_ASYNC, false);
+        }
+
+        return count;
+}
+
+static ssize_t
+il4965_rs_sta_dbgfs_scale_table_read(struct file *file, char __user *user_buf,
+                                     size_t count, loff_t *ppos)
+{
+        char *buff;
+        int desc = 0;
+        int i = 0;
+        int idx = 0;
+        ssize_t ret;
+
+        struct il_lq_sta *lq_sta = file->private_data;
+        struct il_priv *il;
+        struct il_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
+
+        il = lq_sta->drv;
+        buff = kmalloc(1024, GFP_KERNEL);
+        if (!buff)
+                return -ENOMEM;
+
+        desc += sprintf(buff + desc, "sta_id %d\n", lq_sta->lq.sta_id);
+        desc +=
+            sprintf(buff + desc, "failed=%d success=%d rate=0%X\n",
+                    lq_sta->total_failed, lq_sta->total_success,
+                    lq_sta->active_legacy_rate);
+        desc +=
+            sprintf(buff + desc, "fixed rate 0x%X\n", lq_sta->dbg_fixed_rate);
+        desc +=
+            sprintf(buff + desc, "valid_tx_ant %s%s%s\n",
+                    (il->hw_params.valid_tx_ant & ANT_A) ? "ANT_A," : "",
+                    (il->hw_params.valid_tx_ant & ANT_B) ? "ANT_B," : "",
+                    (il->hw_params.valid_tx_ant & ANT_C) ? "ANT_C" : "");
+        desc +=
+            sprintf(buff + desc, "lq type %s\n",
+                    (is_legacy(tbl->lq_type)) ? "legacy" : "HT");
+        if (is_Ht(tbl->lq_type)) {
+                desc +=
+                    sprintf(buff + desc, " %s",
+                            (is_siso(tbl->lq_type)) ? "SISO" : "MIMO2");
+                desc +=
+                    sprintf(buff + desc, " %s",
+                            (tbl->is_ht40) ? "40MHz" : "20MHz");
+                desc +=
+                    sprintf(buff + desc, " %s %s %s\n",
+                            (tbl->is_SGI) ? "SGI" : "",
+                            (lq_sta->is_green) ? "GF enabled" : "",
+                            (lq_sta->is_agg) ? "AGG on" : "");
+        }
+        desc +=
+            sprintf(buff + desc, "last tx rate=0x%X\n",
+                    lq_sta->last_rate_n_flags);
+        desc +=
+            sprintf(buff + desc,
+                    "general:" "flags=0x%X mimo-d=%d s-ant0x%x d-ant=0x%x\n",
+                    lq_sta->lq.general_params.flags,
+                    lq_sta->lq.general_params.mimo_delimiter,
+                    lq_sta->lq.general_params.single_stream_ant_msk,
+                    lq_sta->lq.general_params.dual_stream_ant_msk);
+
+        desc +=
+            sprintf(buff + desc,
+                    "agg:"
+                    "time_limit=%d dist_start_th=%d frame_cnt_limit=%d\n",
+                    le16_to_cpu(lq_sta->lq.agg_params.agg_time_limit),
+                    lq_sta->lq.agg_params.agg_dis_start_th,
+                    lq_sta->lq.agg_params.agg_frame_cnt_limit);
+
+        desc +=
+            sprintf(buff + desc,
+                    "Start idx [0]=0x%x [1]=0x%x [2]=0x%x [3]=0x%x\n",
+                    lq_sta->lq.general_params.start_rate_idx[0],
+                    lq_sta->lq.general_params.start_rate_idx[1],
+                    lq_sta->lq.general_params.start_rate_idx[2],
+                    lq_sta->lq.general_params.start_rate_idx[3]);
+
+        for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++) {
+                idx =
+                    il4965_hwrate_to_plcp_idx(le32_to_cpu
+                                              (lq_sta->lq.rs_table[i].
+                                               rate_n_flags));
+                if (is_legacy(tbl->lq_type)) {
+                        desc +=
+                            sprintf(buff + desc, " rate[%d] 0x%X %smbps\n", i,
+                                    le32_to_cpu(lq_sta->lq.rs_table[i].
+                                                rate_n_flags),
+                                    il_rate_mcs[idx].mbps);
+                } else {
+                        desc +=
+                            sprintf(buff + desc, " rate[%d] 0x%X %smbps (%s)\n",
+                                    i,
+                                    le32_to_cpu(lq_sta->lq.rs_table[i].
+                                                rate_n_flags),
+                                    il_rate_mcs[idx].mbps,
+                                    il_rate_mcs[idx].mcs);
+                }
+        }
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+        kfree(buff);
+        return ret;
+}
+
+static const struct file_operations rs_sta_dbgfs_scale_table_ops = {
+        .write = il4965_rs_sta_dbgfs_scale_table_write,
+        .read = il4965_rs_sta_dbgfs_scale_table_read,
+        .open = il4965_open_file_generic,
+        .llseek = default_llseek,
+};
+
+static ssize_t
+il4965_rs_sta_dbgfs_stats_table_read(struct file *file, char __user *user_buf,
+                                     size_t count, loff_t *ppos)
+{
+        char *buff;
+        int desc = 0;
+        int i, j;
+        ssize_t ret;
+
+        struct il_lq_sta *lq_sta = file->private_data;
+
+        buff = kmalloc(1024, GFP_KERNEL);
+        if (!buff)
+                return -ENOMEM;
+
+        for (i = 0; i < LQ_SIZE; i++) {
+                desc +=
+                    sprintf(buff + desc,
+                            "%s type=%d SGI=%d HT40=%d DUP=%d GF=%d\n"
+                            "rate=0x%X\n", lq_sta->active_tbl == i ? "*" : "x",
+                            lq_sta->lq_info[i].lq_type,
+                            lq_sta->lq_info[i].is_SGI,
+                            lq_sta->lq_info[i].is_ht40,
+                            lq_sta->lq_info[i].is_dup, lq_sta->is_green,
+                            lq_sta->lq_info[i].current_rate);
+                for (j = 0; j < RATE_COUNT; j++) {
+                        desc +=
+                            sprintf(buff + desc,
+                                    "counter=%d success=%d %%=%d\n",
+                                    lq_sta->lq_info[i].win[j].counter,
+                                    lq_sta->lq_info[i].win[j].success_counter,
+                                    lq_sta->lq_info[i].win[j].success_ratio);
+                }
+        }
+        ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+        kfree(buff);
+        return ret;
+}
+
+static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
+        .read = il4965_rs_sta_dbgfs_stats_table_read,
+        .open = il4965_open_file_generic,
+        .llseek = default_llseek,
+};
+
+static ssize_t
+il4965_rs_sta_dbgfs_rate_scale_data_read(struct file *file,
+                                         char __user *user_buf, size_t count,
+                                         loff_t *ppos)
+{
+        char buff[120];
+        int desc = 0;
+        struct il_lq_sta *lq_sta = file->private_data;
+        struct il_scale_tbl_info *tbl = &lq_sta->lq_info[lq_sta->active_tbl];
+
+        if (is_Ht(tbl->lq_type))
+                desc +=
+                    sprintf(buff + desc, "Bit Rate= %d Mb/s\n",
+                            tbl->expected_tpt[lq_sta->last_txrate_idx]);
+        else
+                desc +=
+                    sprintf(buff + desc, "Bit Rate= %d Mb/s\n",
+                            il_rates[lq_sta->last_txrate_idx].ieee >> 1);
+
+        return simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+}
+
+static const struct file_operations rs_sta_dbgfs_rate_scale_data_ops = {
+        .read = il4965_rs_sta_dbgfs_rate_scale_data_read,
+        .open = il4965_open_file_generic,
+        .llseek = default_llseek,
+};
+
+static void
+il4965_rs_add_debugfs(void *il, void *il_sta, struct dentry *dir)
+{
+        struct il_lq_sta *lq_sta = il_sta;
+        lq_sta->rs_sta_dbgfs_scale_table_file =
+            debugfs_create_file("rate_scale_table", S_IRUSR | S_IWUSR, dir,
+                                lq_sta, &rs_sta_dbgfs_scale_table_ops);
+        lq_sta->rs_sta_dbgfs_stats_table_file =
+            debugfs_create_file("rate_stats_table", S_IRUSR, dir, lq_sta,
+                                &rs_sta_dbgfs_stats_table_ops);
+        lq_sta->rs_sta_dbgfs_rate_scale_data_file =
+            debugfs_create_file("rate_scale_data", S_IRUSR, dir, lq_sta,
+                                &rs_sta_dbgfs_rate_scale_data_ops);
+        lq_sta->rs_sta_dbgfs_tx_agg_tid_en_file =
+            debugfs_create_u8("tx_agg_tid_enable", S_IRUSR | S_IWUSR, dir,
+                              &lq_sta->tx_agg_tid_en);
+
+}
+
+static void
+il4965_rs_remove_debugfs(void *il, void *il_sta)
+{
+        struct il_lq_sta *lq_sta = il_sta;
+        debugfs_remove(lq_sta->rs_sta_dbgfs_scale_table_file);
+        debugfs_remove(lq_sta->rs_sta_dbgfs_stats_table_file);
+        debugfs_remove(lq_sta->rs_sta_dbgfs_rate_scale_data_file);
+        debugfs_remove(lq_sta->rs_sta_dbgfs_tx_agg_tid_en_file);
+}
+#endif
+
+/*
+ * Initialization of rate scaling information is done by driver after
+ * the station is added. Since mac80211 calls this function before a
+ * station is added we ignore it.
+ */
+static void
+il4965_rs_rate_init_stub(void *il_r, struct ieee80211_supported_band *sband,
+                         struct ieee80211_sta *sta, void *il_sta)
+{
+}
+
+static struct rate_control_ops rs_4965_ops = {
+        .module = NULL,
+        .name = IL4965_RS_NAME,
+        .tx_status = il4965_rs_tx_status,
+        .get_rate = il4965_rs_get_rate,
+        .rate_init = il4965_rs_rate_init_stub,
+        .alloc = il4965_rs_alloc,
+        .free = il4965_rs_free,
+        .alloc_sta = il4965_rs_alloc_sta,
+        .free_sta = il4965_rs_free_sta,
+#ifdef CONFIG_MAC80211_DEBUGFS
+        .add_sta_debugfs = il4965_rs_add_debugfs,
+        .remove_sta_debugfs = il4965_rs_remove_debugfs,
+#endif
+};
+
+int
+il4965_rate_control_register(void)
+{
+        return ieee80211_rate_control_register(&rs_4965_ops);
+}
+
+void
+il4965_rate_control_unregister(void)
+{
+        ieee80211_rate_control_unregister(&rs_4965_ops);
+}
diff --git a/drivers/net/wireless/iwlegacy/4965.c b/drivers/net/wireless/iwlegacy/4965.c
new file mode 100644
index 000000000000..84c54dccf195
--- /dev/null
+++ b/drivers/net/wireless/iwlegacy/4965.c
@@ -0,0 +1,2421 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2003 - 2011 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:
+ *  Intel Linux Wireless <ilw@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/init.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <linux/sched.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <net/mac80211.h>
+#include <linux/etherdevice.h>
+#include <asm/unaligned.h>
+
+#include "common.h"
+#include "4965.h"
+
+/**
+ * il_verify_inst_sparse - verify runtime uCode image in card vs. host,
+ *   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
+il4965_verify_inst_sparse(struct il_priv *il, __le32 * image, u32 len)
+{
+        u32 val;
+        int ret = 0;
+        u32 errcnt = 0;
+        u32 i;
+
+        D_INFO("ucode inst image size is %u\n", len);
+
+        for (i = 0; i < len; i += 100, image += 100 / sizeof(u32)) {
+                /* read data comes through single port, auto-incr addr */
+                /* NOTE: Use the debugless read so we don't flood kernel log
+                 * if IL_DL_IO is set */
+                il_wr(il, HBUS_TARG_MEM_RADDR, i + IL4965_RTC_INST_LOWER_BOUND);
+                val = _il_rd(il, HBUS_TARG_MEM_RDAT);
+                if (val != le32_to_cpu(*image)) {
+                        ret = -EIO;
+                        errcnt++;
+                        if (errcnt >= 3)
+                                break;
+                }
+        }
+
+        return ret;
+}
+
+/**
+ * il4965_verify_inst_full - verify runtime uCode image in card vs. host,
+ *     looking at all data.
+ */
+static int
+il4965_verify_inst_full(struct il_priv *il, __le32 * image, u32 len)
+{
+        u32 val;
+        u32 save_len = len;
+        int ret = 0;
+        u32 errcnt;
+
+        D_INFO("ucode inst image size is %u\n", len);
+
+        il_wr(il, HBUS_TARG_MEM_RADDR, IL4965_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 IL_DL_IO is set */
+                val = _il_rd(il, HBUS_TARG_MEM_RDAT);
+                if (val != le32_to_cpu(*image)) {
+                        IL_ERR("uCode INST section is invalid at "
+                               "offset 0x%x, is 0x%x, s/b 0x%x\n",
+                               save_len - len, val, le32_to_cpu(*image));
+                        ret = -EIO;
+                        errcnt++;
+                        if (errcnt >= 20)
+                                break;
+                }
+        }
+
+        if (!errcnt)
+                D_INFO("ucode image in INSTRUCTION memory is good\n");
+
+        return ret;
+}
+
+/**
+ * il4965_verify_ucode - determine which instruction image is in SRAM,
+ *    and verify its contents
+ */
+int
+il4965_verify_ucode(struct il_priv *il)
+{
+        __le32 *image;
+        u32 len;
+        int ret;
+
+        /* Try bootstrap */
+        image = (__le32 *) il->ucode_boot.v_addr;
+        len = il->ucode_boot.len;
+        ret = il4965_verify_inst_sparse(il, image, len);
+        if (!ret) {
+                D_INFO("Bootstrap uCode is good in inst SRAM\n");
+                return 0;
+        }
+
+        /* Try initialize */
+        image = (__le32 *) il->ucode_init.v_addr;
+        len = il->ucode_init.len;
+        ret = il4965_verify_inst_sparse(il, image, len);
+        if (!ret) {
+                D_INFO("Initialize uCode is good in inst SRAM\n");
+                return 0;
+        }
+
+        /* Try runtime/protocol */
+        image = (__le32 *) il->ucode_code.v_addr;
+        len = il->ucode_code.len;
+        ret = il4965_verify_inst_sparse(il, image, len);
+        if (!ret) {
+                D_INFO("Runtime uCode is good in inst SRAM\n");
+                return 0;
+        }
+
+        IL_ERR("NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n");
+
+        /* Since nothing seems to match, show first several data entries in
+         * instruction SRAM, so maybe visual inspection will give a clue.
+         * Selection of bootstrap image (vs. other images) is arbitrary. */
+        image = (__le32 *) il->ucode_boot.v_addr;
+        len = il->ucode_boot.len;
+        ret = il4965_verify_inst_full(il, image, len);
+
+        return ret;
+}
+
+/******************************************************************************
+ *
+ * EEPROM related functions
+ *
+******************************************************************************/
+
+/*
+ * 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
+il4965_eeprom_acquire_semaphore(struct il_priv *il)
+{
+        u16 count;
+        int ret;
+
+        for (count = 0; count < EEPROM_SEM_RETRY_LIMIT; count++) {
+                /* Request semaphore */
+                il_set_bit(il, CSR_HW_IF_CONFIG_REG,
+                           CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
+
+                /* See if we got it */
+                ret =
+                    _il_poll_bit(il, 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)
+                        return ret;
+        }
+
+        return ret;
+}
+
+void
+il4965_eeprom_release_semaphore(struct il_priv *il)
+{
+        il_clear_bit(il, CSR_HW_IF_CONFIG_REG,
+                     CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
+
+}
+
+int
+il4965_eeprom_check_version(struct il_priv *il)
+{
+        u16 eeprom_ver;
+        u16 calib_ver;
+
+        eeprom_ver = il_eeprom_query16(il, EEPROM_VERSION);
+        calib_ver = il_eeprom_query16(il, EEPROM_4965_CALIB_VERSION_OFFSET);
+
+        if (eeprom_ver < il->cfg->eeprom_ver ||
+            calib_ver < il->cfg->eeprom_calib_ver)
+                goto err;
+
+        IL_INFO("device EEPROM VER=0x%x, CALIB=0x%x\n", eeprom_ver, calib_ver);
+
+        return 0;
+err:
+        IL_ERR("Unsupported (too old) EEPROM VER=0x%x < 0x%x "
+               "CALIB=0x%x < 0x%x\n", eeprom_ver, il->cfg->eeprom_ver,
+               calib_ver, il->cfg->eeprom_calib_ver);
+        return -EINVAL;
+
+}
+
+void
+il4965_eeprom_get_mac(const struct il_priv *il, u8 * mac)
+{
+        const u8 *addr = il_eeprom_query_addr(il,
+                                              EEPROM_MAC_ADDRESS);
+        memcpy(mac, addr, ETH_ALEN);
+}
+
+/* Send led command */
+static int
+il4965_send_led_cmd(struct il_priv *il, struct il_led_cmd *led_cmd)
+{
+        struct il_host_cmd cmd = {
+                .id = C_LEDS,
+                .len = sizeof(struct il_led_cmd),
+                .data = led_cmd,
+                .flags = CMD_ASYNC,
+                .callback = NULL,
+        };
+        u32 reg;
+
+        reg = _il_rd(il, CSR_LED_REG);
+        if (reg != (reg & CSR_LED_BSM_CTRL_MSK))
+                _il_wr(il, CSR_LED_REG, reg & CSR_LED_BSM_CTRL_MSK);
+
+        return il_send_cmd(il, &cmd);
+}
+
+/* Set led register off */
+void
+il4965_led_enable(struct il_priv *il)
+{
+        _il_wr(il, CSR_LED_REG, CSR_LED_REG_TRUN_ON);
+}
+
+const struct il_led_ops il4965_led_ops = {
+        .cmd = il4965_send_led_cmd,
+};
+
+static int il4965_send_tx_power(struct il_priv *il);
+static int il4965_hw_get_temperature(struct il_priv *il);
+
+/* Highest firmware API version supported */
+#define IL4965_UCODE_API_MAX 2
+
+/* Lowest firmware API version supported */
+#define IL4965_UCODE_API_MIN 2
+
+#define IL4965_FW_PRE "iwlwifi-4965-"
+#define _IL4965_MODULE_FIRMWARE(api) IL4965_FW_PRE #api ".ucode"
+#define IL4965_MODULE_FIRMWARE(api) _IL4965_MODULE_FIRMWARE(api)
+
+/* check contents of special bootstrap uCode SRAM */
+static int
+il4965_verify_bsm(struct il_priv *il)
+{
+        __le32 *image = il->ucode_boot.v_addr;
+        u32 len = il->ucode_boot.len;
+        u32 reg;
+        u32 val;
+
+        D_INFO("Begin verify bsm\n");
+
+        /* verify BSM SRAM contents */
+        val = il_rd_prph(il, BSM_WR_DWCOUNT_REG);
+        for (reg = BSM_SRAM_LOWER_BOUND; reg < BSM_SRAM_LOWER_BOUND + len;
+             reg += sizeof(u32), image++) {
+                val = il_rd_prph(il, reg);
+                if (val != le32_to_cpu(*image)) {
+                        IL_ERR("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;
+                }
+        }
+
+        D_INFO("BSM bootstrap uCode image OK\n");
+
+        return 0;
+}
+
+/**
+ * il4965_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
+il4965_load_bsm(struct il_priv *il)
+{
+        __le32 *image = il->ucode_boot.v_addr;
+        u32 len = il->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;
+
+        D_INFO("Begin load bsm\n");
+
+        il->ucode_type = UCODE_RT;
+
+        /* make sure bootstrap program is no larger than BSM's SRAM size */
+        if (len > IL49_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:  il_init_alive_start() will replace these values,
+         *        after the "initialize" uCode has run, to point to
+         *        runtime/protocol instructions and backup data cache.
+         */
+        pinst = il->ucode_init.p_addr >> 4;
+        pdata = il->ucode_init_data.p_addr >> 4;
+        inst_len = il->ucode_init.len;
+        data_len = il->ucode_init_data.len;
+
+        il_wr_prph(il, BSM_DRAM_INST_PTR_REG, pinst);
+        il_wr_prph(il, BSM_DRAM_DATA_PTR_REG, pdata);
+        il_wr_prph(il, BSM_DRAM_INST_BYTECOUNT_REG, inst_len);
+        il_wr_prph(il, 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++)
+                _il_wr_prph(il, reg_offset, le32_to_cpu(*image));
+
+        ret = il4965_verify_bsm(il);
+        if (ret)
+                return ret;
+
+        /* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */
+        il_wr_prph(il, BSM_WR_MEM_SRC_REG, 0x0);
+        il_wr_prph(il, BSM_WR_MEM_DST_REG, IL49_RTC_INST_LOWER_BOUND);
+        il_wr_prph(il, BSM_WR_DWCOUNT_REG, len / sizeof(u32));
+
+        /* Load bootstrap code into instruction SRAM now,
+         *   to prepare to load "initialize" uCode */
+        il_wr_prph(il, 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 = il_rd_prph(il, BSM_WR_CTRL_REG);
+                if (!(done & BSM_WR_CTRL_REG_BIT_START))
+                        break;
+                udelay(10);
+        }
+        if (i < 100)
+                D_INFO("BSM write complete, poll %d iterations\n", i);
+        else {
+                IL_ERR("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) */
+        il_wr_prph(il, BSM_WR_CTRL_REG, BSM_WR_CTRL_REG_BIT_START_EN);
+
+        return 0;
+}
+
+/**
+ * il4965_set_ucode_ptrs - Set uCode address location
+ *
+ * Tell initialization uCode where to find runtime uCode.
+ *
+ * BSM registers initially contain pointers to initialization uCode.
+ * We need to replace them to load runtime uCode inst and data,
+ * and to save runtime data when powering down.
+ */
+static int
+il4965_set_ucode_ptrs(struct il_priv *il)
+{
+        dma_addr_t pinst;
+        dma_addr_t pdata;
+        int ret = 0;
+
+        /* bits 35:4 for 4965 */
+        pinst = il->ucode_code.p_addr >> 4;
+        pdata = il->ucode_data_backup.p_addr >> 4;
+
+        /* Tell bootstrap uCode where to find image to load */
+        il_wr_prph(il, BSM_DRAM_INST_PTR_REG, pinst);
+        il_wr_prph(il, BSM_DRAM_DATA_PTR_REG, pdata);
+        il_wr_prph(il, BSM_DRAM_DATA_BYTECOUNT_REG, il->ucode_data.len);
+
+        /* Inst byte count must be last to set up, bit 31 signals uCode
+         *   that all new ptr/size info is in place */
+        il_wr_prph(il, BSM_DRAM_INST_BYTECOUNT_REG,
+                   il->ucode_code.len | BSM_DRAM_INST_LOAD);
+        D_INFO("Runtime uCode pointers are set.\n");
+
+        return ret;
+}
+
+/**
+ * il4965_init_alive_start - Called after N_ALIVE notification received
+ *
+ * Called after N_ALIVE notification received from "initialize" uCode.
+ *
+ * The 4965 "initialize" ALIVE reply contains calibration data for:
+ *   Voltage, temperature, and MIMO tx gain correction, now stored in il
+ *   (3945 does not contain this data).
+ *
+ * Tell "initialize" uCode to go ahead and load the runtime uCode.
+*/
+static void
+il4965_init_alive_start(struct il_priv *il)
+{
+        /* Bootstrap uCode has loaded initialize uCode ... verify inst image.
+         * This is a paranoid check, because we would not have gotten the
+         * "initialize" alive if code weren't properly loaded.  */
+        if (il4965_verify_ucode(il)) {
+                /* Runtime instruction load was bad;
+                 * take it all the way back down so we can try again */
+                D_INFO("Bad \"initialize\" uCode load.\n");
+                goto restart;
+        }
+
+        /* Calculate temperature */
+        il->temperature = il4965_hw_get_temperature(il);
+
+        /* Send pointers to protocol/runtime uCode image ... init code will
+         * load and launch runtime uCode, which will send us another "Alive"
+         * notification. */
+        D_INFO("Initialization Alive received.\n");
+        if (il4965_set_ucode_ptrs(il)) {
+                /* Runtime instruction load won't happen;
+                 * take it all the way back down so we can try again */
+                D_INFO("Couldn't set up uCode pointers.\n");
+                goto restart;
+        }
+        return;
+
+restart:
+        queue_work(il->workqueue, &il->restart);
+}
+
+static bool
+iw4965_is_ht40_channel(__le32 rxon_flags)
+{
+        int chan_mod =
+            le32_to_cpu(rxon_flags & RXON_FLG_CHANNEL_MODE_MSK) >>
+            RXON_FLG_CHANNEL_MODE_POS;
+        return (chan_mod == CHANNEL_MODE_PURE_40 ||
+                chan_mod == CHANNEL_MODE_MIXED);
+}
+
+static void
+il4965_nic_config(struct il_priv *il)
+{
+        unsigned long flags;
+        u16 radio_cfg;
+
+        spin_lock_irqsave(&il->lock, flags);
+
+        radio_cfg = il_eeprom_query16(il, EEPROM_RADIO_CONFIG);
+
+        /* write radio config values to register */
+        if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) == EEPROM_4965_RF_CFG_TYPE_MAX)
+                il_set_bit(il, CSR_HW_IF_CONFIG_REG,
+                           EEPROM_RF_CFG_TYPE_MSK(radio_cfg) |
+                           EEPROM_RF_CFG_STEP_MSK(radio_cfg) |
+                           EEPROM_RF_CFG_DASH_MSK(radio_cfg));
+
+        /* set CSR_HW_CONFIG_REG for uCode use */
+        il_set_bit(il, CSR_HW_IF_CONFIG_REG,
+                   CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
+                   CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
+
+        il->calib_info =
+            (struct il_eeprom_calib_info *)
+            il_eeprom_query_addr(il, EEPROM_4965_CALIB_TXPOWER_OFFSET);
+
+        spin_unlock_irqrestore(&il->lock, flags);
+}
+
+/* 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.  */
+static void
+il4965_chain_noise_reset(struct il_priv *il)
+{
+        struct il_chain_noise_data *data = &(il->chain_noise_data);
+
+        if (data->state == IL_CHAIN_NOISE_ALIVE && il_is_any_associated(il)) {
+                struct il_calib_diff_gain_cmd cmd;
+
+                /* clear data for chain noise calibration algorithm */
+                data->chain_noise_a = 0;
+                data->chain_noise_b = 0;
+                data->chain_noise_c = 0;
+                data->chain_signal_a = 0;
+                data->chain_signal_b = 0;
+                data->chain_signal_c = 0;
+                data->beacon_count = 0;
+
+                memset(&cmd, 0, sizeof(cmd));
+                cmd.hdr.op_code = IL_PHY_CALIBRATE_DIFF_GAIN_CMD;
+                cmd.diff_gain_a = 0;
+                cmd.diff_gain_b = 0;
+                cmd.diff_gain_c = 0;
+                if (il_send_cmd_pdu(il, C_PHY_CALIBRATION, sizeof(cmd), &cmd))
+                        IL_ERR("Could not send C_PHY_CALIBRATION\n");
+                data->state = IL_CHAIN_NOISE_ACCUMULATE;
+                D_CALIB("Run chain_noise_calibrate\n");
+        }
+}
+
+static struct il_sensitivity_ranges il4965_sensitivity = {
+        .min_nrg_cck = 97,
+        .max_nrg_cck = 0,       /* not used, set to 0 */
+
+        .auto_corr_min_ofdm = 85,
+        .auto_corr_min_ofdm_mrc = 170,
+        .auto_corr_min_ofdm_x1 = 105,
+        .auto_corr_min_ofdm_mrc_x1 = 220,
+
+        .auto_corr_max_ofdm = 120,
+        .auto_corr_max_ofdm_mrc = 210,
+        .auto_corr_max_ofdm_x1 = 140,
+        .auto_corr_max_ofdm_mrc_x1 = 270,
+
+        .auto_corr_min_cck = 125,
+        .auto_corr_max_cck = 200,
+        .auto_corr_min_cck_mrc = 200,
+        .auto_corr_max_cck_mrc = 400,
+
+        .nrg_th_cck = 100,
+        .nrg_th_ofdm = 100,
+
+        .barker_corr_th_min = 190,
+        .barker_corr_th_min_mrc = 390,
+        .nrg_th_cca = 62,
+};
+
+static void
+il4965_set_ct_threshold(struct il_priv *il)
+{
+        /* want Kelvin */
+        il->hw_params.ct_kill_threshold =
+            CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD_LEGACY);
+}
+
+/**
+ * il4965_hw_set_hw_params
+ *
+ * Called when initializing driver
+ */
+static int
+il4965_hw_set_hw_params(struct il_priv *il)
+{
+        if (il->cfg->mod_params->num_of_queues >= IL_MIN_NUM_QUEUES &&
+            il->cfg->mod_params->num_of_queues <= IL49_NUM_QUEUES)
+                il->cfg->base_params->num_of_queues =
+                    il->cfg->mod_params->num_of_queues;
+
+        il->hw_params.max_txq_num = il->cfg->base_params->num_of_queues;
+        il->hw_params.dma_chnl_num = FH49_TCSR_CHNL_NUM;
+        il->hw_params.scd_bc_tbls_size =
+            il->cfg->base_params->num_of_queues *
+            sizeof(struct il4965_scd_bc_tbl);
+        il->hw_params.tfd_size = sizeof(struct il_tfd);
+        il->hw_params.max_stations = IL4965_STATION_COUNT;
+        il->ctx.bcast_sta_id = IL4965_BROADCAST_ID;
+        il->hw_params.max_data_size = IL49_RTC_DATA_SIZE;
+        il->hw_params.max_inst_size = IL49_RTC_INST_SIZE;
+        il->hw_params.max_bsm_size = BSM_SRAM_SIZE;
+        il->hw_params.ht40_channel = BIT(IEEE80211_BAND_5GHZ);
+
+        il->hw_params.rx_wrt_ptr_reg = FH49_RSCSR_CHNL0_WPTR;
+
+        il->hw_params.tx_chains_num = il4965_num_of_ant(il->cfg->valid_tx_ant);
+        il->hw_params.rx_chains_num = il4965_num_of_ant(il->cfg->valid_rx_ant);
+        il->hw_params.valid_tx_ant = il->cfg->valid_tx_ant;
+        il->hw_params.valid_rx_ant = il->cfg->valid_rx_ant;
+
+        il4965_set_ct_threshold(il);
+
+        il->hw_params.sens = &il4965_sensitivity;
+        il->hw_params.beacon_time_tsf_bits = IL4965_EXT_BEACON_TIME_POS;
+
+        return 0;
+}
+
+static s32
+il4965_math_div_round(s32 num, s32 denom, s32 * res)
+{
+        s32 sign = 1;
+
+        if (num < 0) {
+                sign = -sign;
+                num = -num;
+        }
+        if (denom < 0) {
+                sign = -sign;
+                denom = -denom;
+        }
+        *res = 1;
+        *res = ((num * 2 + denom) / (denom * 2)) * sign;
+
+        return 1;
+}
+
+/**
+ * il4965_get_voltage_compensation - Power supply voltage comp for txpower
+ *
+ * Determines power supply voltage compensation for txpower calculations.
+ * Returns number of 1/2-dB steps to subtract from gain table idx,
+ * to compensate for difference between power supply voltage during
+ * factory measurements, vs. current power supply voltage.
+ *
+ * Voltage indication is higher for lower voltage.
+ * Lower voltage requires more gain (lower gain table idx).
+ */
+static s32
+il4965_get_voltage_compensation(s32 eeprom_voltage, s32 current_voltage)
+{
+        s32 comp = 0;
+
+        if (TX_POWER_IL_ILLEGAL_VOLTAGE == eeprom_voltage ||
+            TX_POWER_IL_ILLEGAL_VOLTAGE == current_voltage)
+                return 0;
+
+        il4965_math_div_round(current_voltage - eeprom_voltage,
+                              TX_POWER_IL_VOLTAGE_CODES_PER_03V, &comp);
+
+        if (current_voltage > eeprom_voltage)
+                comp *= 2;
+        if ((comp < -2) || (comp > 2))
+                comp = 0;
+
+        return comp;
+}
+
+static s32
+il4965_get_tx_atten_grp(u16 channel)
+{
+        if (channel >= CALIB_IL_TX_ATTEN_GR5_FCH &&
+            channel <= CALIB_IL_TX_ATTEN_GR5_LCH)
+                return CALIB_CH_GROUP_5;
+
+        if (channel >= CALIB_IL_TX_ATTEN_GR1_FCH &&
+            channel <= CALIB_IL_TX_ATTEN_GR1_LCH)
+                return CALIB_CH_GROUP_1;
+
+        if (channel >= CALIB_IL_TX_ATTEN_GR2_FCH &&
+            channel <= CALIB_IL_TX_ATTEN_GR2_LCH)
+                return CALIB_CH_GROUP_2;
+
+        if (channel >= CALIB_IL_TX_ATTEN_GR3_FCH &&
+            channel <= CALIB_IL_TX_ATTEN_GR3_LCH)
+                return CALIB_CH_GROUP_3;
+
+        if (channel >= CALIB_IL_TX_ATTEN_GR4_FCH &&
+            channel <= CALIB_IL_TX_ATTEN_GR4_LCH)
+                return CALIB_CH_GROUP_4;
+
+        return -EINVAL;
+}
+
+static u32
+il4965_get_sub_band(const struct il_priv *il, u32 channel)
+{
+        s32 b = -1;
+
+        for (b = 0; b < EEPROM_TX_POWER_BANDS; b++) {
+                if (il->calib_info->band_info[b].ch_from == 0)
+                        continue;
+
+                if (channel >= il->calib_info->band_info[b].ch_from &&
+                    channel <= il->calib_info->band_info[b].ch_to)
+                        break;
+        }
+
+        return b;
+}
+
+static s32
+il4965_interpolate_value(s32 x, s32 x1, s32 y1, s32 x2, s32 y2)
+{
+        s32 val;
+
+        if (x2 == x1)
+                return y1;
+        else {
+                il4965_math_div_round((x2 - x) * (y1 - y2), (x2 - x1), &val);
+                return val + y2;
+        }
+}
+
+/**
+ * il4965_interpolate_chan - Interpolate factory measurements for one channel
+ *
+ * Interpolates factory measurements from the two sample channels within a
+ * sub-band, to apply to channel of interest.  Interpolation is proportional to
+ * differences in channel frequencies, which is proportional to differences
+ * in channel number.
+ */
+static int
+il4965_interpolate_chan(struct il_priv *il, u32 channel,
+                        struct il_eeprom_calib_ch_info *chan_info)
+{
+        s32 s = -1;
+        u32 c;
+        u32 m;
+        const struct il_eeprom_calib_measure *m1;
+        const struct il_eeprom_calib_measure *m2;
+        struct il_eeprom_calib_measure *omeas;
+        u32 ch_i1;
+        u32 ch_i2;
+
+        s = il4965_get_sub_band(il, channel);
+        if (s >= EEPROM_TX_POWER_BANDS) {
+                IL_ERR("Tx Power can not find channel %d\n", channel);
+                return -1;
+        }
+
+        ch_i1 = il->calib_info->band_info[s].ch1.ch_num;
+        ch_i2 = il->calib_info->band_info[s].ch2.ch_num;
+        chan_info->ch_num = (u8) channel;
+
+        D_TXPOWER("channel %d subband %d factory cal ch %d & %d\n", channel, s,
+                  ch_i1, ch_i2);
+
+        for (c = 0; c < EEPROM_TX_POWER_TX_CHAINS; c++) {
+                for (m = 0; m < EEPROM_TX_POWER_MEASUREMENTS; m++) {
+                        m1 = &(il->calib_info->band_info[s].ch1.
+                               measurements[c][m]);
+                        m2 = &(il->calib_info->band_info[s].ch2.
+                               measurements[c][m]);
+                        omeas = &(chan_info->measurements[c][m]);
+
+                        omeas->actual_pow =
+                            (u8) il4965_interpolate_value(channel, ch_i1,
+                                                          m1->actual_pow, ch_i2,
+                                                          m2->actual_pow);
+                        omeas->gain_idx =
+                            (u8) il4965_interpolate_value(channel, ch_i1,
+                                                          m1->gain_idx, ch_i2,
+                                                          m2->gain_idx);
+                        omeas->temperature =
+                            (u8) il4965_interpolate_value(channel, ch_i1,
+                                                          m1->temperature,
+                                                          ch_i2,
+                                                          m2->temperature);
+                        omeas->pa_det =
+                            (s8) il4965_interpolate_value(channel, ch_i1,
+                                                          m1->pa_det, ch_i2,
+                                                          m2->pa_det);
+
+                        D_TXPOWER("chain %d meas %d AP1=%d AP2=%d AP=%d\n", c,
+                                  m, m1->actual_pow, m2->actual_pow,
+                                  omeas->actual_pow);
+                        D_TXPOWER("chain %d meas %d NI1=%d NI2=%d NI=%d\n", c,
+                                  m, m1->gain_idx, m2->gain_idx,
+                                  omeas->gain_idx);
+                        D_TXPOWER("chain %d meas %d PA1=%d PA2=%d PA=%d\n", c,
+                                  m, m1->pa_det, m2->pa_det, omeas->pa_det);
+                        D_TXPOWER("chain %d meas %d  T1=%d  T2=%d  T=%d\n", c,
+                                  m, m1->temperature, m2->temperature,
+                                  omeas->temperature);
+                }
+        }
+
+        return 0;
+}
+
+/* bit-rate-dependent table to prevent Tx distortion, in half-dB units,
+ * for OFDM 6, 12, 18, 24, 36, 48, 54, 60 MBit, and CCK all rates. */
+static s32 back_off_table[] = {
+        10, 10, 10, 10, 10, 15, 17, 20, /* OFDM SISO 20 MHz */
+        10, 10, 10, 10, 10, 15, 17, 20, /* OFDM MIMO 20 MHz */
+        10, 10, 10, 10, 10, 15, 17, 20, /* OFDM SISO 40 MHz */
+        10, 10, 10, 10, 10, 15, 17, 20, /* OFDM MIMO 40 MHz */
+        10                      /* CCK */
+};
+
+/* Thermal compensation values for txpower for various frequency ranges ...
+ *   ratios from 3:1 to 4.5:1 of degrees (Celsius) per half-dB gain adjust */
+static struct il4965_txpower_comp_entry {
+        s32 degrees_per_05db_a;
+        s32 degrees_per_05db_a_denom;
+} tx_power_cmp_tble[CALIB_CH_GROUP_MAX] = {
+        {
+        9, 2},                  /* group 0 5.2, ch  34-43 */
+        {
+        4, 1},                  /* group 1 5.2, ch  44-70 */
+        {
+        4, 1},                  /* group 2 5.2, ch  71-124 */
+        {
+        4, 1},                  /* group 3 5.2, ch 125-200 */
+        {
+        3, 1}                   /* group 4 2.4, ch   all */
+};
+
+static s32
+get_min_power_idx(s32 rate_power_idx, u32 band)
+{
+        if (!band) {
+                if ((rate_power_idx & 7) <= 4)
+                        return MIN_TX_GAIN_IDX_52GHZ_EXT;
+        }
+        return MIN_TX_GAIN_IDX;
+}
+
+struct gain_entry {
+        u8 dsp;
+        u8 radio;
+};
+
+static const struct gain_entry gain_table[2][108] = {
+        /* 5.2GHz power gain idx table */
+        {
+         {123, 0x3F},           /* highest txpower */
+         {117, 0x3F},
+         {110, 0x3F},
+         {104, 0x3F},
+         {98, 0x3F},
+         {110, 0x3E},
+         {104, 0x3E},
+         {98, 0x3E},
+         {110, 0x3D},
+         {104, 0x3D},
+         {98, 0x3D},
+         {110, 0x3C},
+         {104, 0x3C},
+         {98, 0x3C},
+         {110, 0x3B},
+         {104, 0x3B},
+         {98, 0x3B},
+         {110, 0x3A},
+         {104, 0x3A},
+         {98, 0x3A},
+         {110, 0x39},
+         {104, 0x39},
+         {98, 0x39},
+         {110, 0x38},
+         {104, 0x38},
+         {98, 0x38},
+         {110, 0x37},
+         {104, 0x37},
+         {98, 0x37},
+         {110, 0x36},
+         {104, 0x36},
+         {98, 0x36},
+         {110, 0x35},
+         {104, 0x35},
+         {98, 0x35},
+         {110, 0x34},
+         {104, 0x34},
+         {98, 0x34},
+         {110, 0x33},
+         {104, 0x33},
+         {98, 0x33},
+         {110, 0x32},
+         {104, 0x32},
+         {98, 0x32},
+         {110, 0x31},
+         {104, 0x31},
+         {98, 0x31},
+         {110, 0x30},
+         {104, 0x30},
+         {98, 0x30},
+         {110, 0x25},
+         {104, 0x25},
+         {98, 0x25},
+         {110, 0x24},
+         {104, 0x24},
+         {98, 0x24},
+         {110, 0x23},
+         {104, 0x23},
+         {98, 0x23},
+         {110, 0x22},
+         {104, 0x18},
+         {98, 0x18},
+         {110, 0x17},
+         {104, 0x17},
+         {98, 0x17},
+         {110, 0x16},
+         {104, 0x16},
+         {98, 0x16},
+         {110, 0x15},
+         {104, 0x15},
+         {98, 0x15},
+         {110, 0x14},
+         {104, 0x14},
+         {98, 0x14},
+         {110, 0x13},
+         {104, 0x13},
+         {98, 0x13},
+         {110, 0x12},
+         {104, 0x08},
+         {98, 0x08},
+         {110, 0x07},
+         {104, 0x07},
+         {98, 0x07},
+         {110, 0x06},
+         {104, 0x06},
+         {98, 0x06},
+         {110, 0x05},
+         {104, 0x05},
+         {98, 0x05},
+         {110, 0x04},
+         {104, 0x04},
+         {98, 0x04},
+         {110, 0x03},
+         {104, 0x03},
+         {98, 0x03},
+         {110, 0x02},
+         {104, 0x02},
+         {98, 0x02},
+         {110, 0x01},
+         {104, 0x01},
+         {98, 0x01},
+         {110, 0x00},
+         {104, 0x00},
+         {98, 0x00},
+         {93, 0x00},
+         {88, 0x00},
+         {83, 0x00},
+         {78, 0x00},
+         },
+        /* 2.4GHz power gain idx table */
+        {
+         {110, 0x3f},           /* highest txpower */
+         {104, 0x3f},
+         {98, 0x3f},
+         {110, 0x3e},
+         {104, 0x3e},
+         {98, 0x3e},
+         {110, 0x3d},
+         {104, 0x3d},
+         {98, 0x3d},
+         {110, 0x3c},
+         {104, 0x3c},
+         {98, 0x3c},
+         {110, 0x3b},
+         {104, 0x3b},
+         {98, 0x3b},
+         {110, 0x3a},
+         {104, 0x3a},
+         {98, 0x3a},
+         {110, 0x39},
+         {104, 0x39},
+         {98, 0x39},
+         {110, 0x38},
+         {104, 0x38},
+         {98, 0x38},
+         {110, 0x37},
+         {104, 0x37},
+         {98, 0x37},
+         {110, 0x36},
+         {104, 0x36},
+         {98, 0x36},
+         {110, 0x35},
+         {104, 0x35},
+         {98, 0x35},
+         {110, 0x34},
+         {104, 0x34},
+         {98, 0x34},
+         {110, 0x33},
+         {104, 0x33},
+         {98, 0x33},
+         {110, 0x32},
+         {104, 0x32},
+         {98, 0x32},
+         {110, 0x31},
+         {104, 0x31},
+         {98, 0x31},
+         {110, 0x30},
+         {104, 0x30},
+         {98, 0x30},
+         {110, 0x6},
+         {104, 0x6},
+         {98, 0x6},
+         {110, 0x5},
+         {104, 0x5},
+         {98, 0x5},
+         {110, 0x4},
+         {104, 0x4},
+         {98, 0x4},
+         {110, 0x3},
+         {104, 0x3},
+         {98, 0x3},
+         {110, 0x2},
+         {104, 0x2},
+         {98, 0x2},
+         {110, 0x1},
+         {104, 0x1},
+         {98, 0x1},
+         {110, 0x0},
+         {104, 0x0},
+         {98, 0x0},
+         {97, 0},
+         {96, 0},
+         {95, 0},
+         {94, 0},
+         {93, 0},
+         {92, 0},
+         {91, 0},
+         {90, 0},
+         {89, 0},
+         {88, 0},
+         {87, 0},
+         {86, 0},
+         {85, 0},
+         {84, 0},
+         {83, 0},
+         {82, 0},
+         {81, 0},
+         {80, 0},
+         {79, 0},
+         {78, 0},
+         {77, 0},
+         {76, 0},
+         {75, 0},
+         {74, 0},
+         {73, 0},
+         {72, 0},
+         {71, 0},
+         {70, 0},
+         {69, 0},
+         {68, 0},
+         {67, 0},
+         {66, 0},
+         {65, 0},
+         {64, 0},
+         {63, 0},
+         {62, 0},
+         {61, 0},
+         {60, 0},
+         {59, 0},
+         }
+};
+
+static int
+il4965_fill_txpower_tbl(struct il_priv *il, u8 band, u16 channel, u8 is_ht40,
+                        u8 ctrl_chan_high,
+                        struct il4965_tx_power_db *tx_power_tbl)
+{
+        u8 saturation_power;
+        s32 target_power;
+        s32 user_target_power;
+        s32 power_limit;
+        s32 current_temp;
+        s32 reg_limit;
+        s32 current_regulatory;
+        s32 txatten_grp = CALIB_CH_GROUP_MAX;
+        int i;
+        int c;
+        const struct il_channel_info *ch_info = NULL;
+        struct il_eeprom_calib_ch_info ch_eeprom_info;
+        const struct il_eeprom_calib_measure *measurement;
+        s16 voltage;
+        s32 init_voltage;
+        s32 voltage_compensation;
+        s32 degrees_per_05db_num;
+        s32 degrees_per_05db_denom;
+        s32 factory_temp;
+        s32 temperature_comp[2];
+        s32 factory_gain_idx[2];
+        s32 factory_actual_pwr[2];
+        s32 power_idx;
+
+        /* tx_power_user_lmt is in dBm, convert to half-dBm (half-dB units
+         *   are used for idxing into txpower table) */
+        user_target_power = 2 * il->tx_power_user_lmt;
+
+        /* Get current (RXON) channel, band, width */
+        D_TXPOWER("chan %d band %d is_ht40 %d\n", channel, band, is_ht40);
+
+        ch_info = il_get_channel_info(il, il->band, channel);
+
+        if (!il_is_channel_valid(ch_info))
+                return -EINVAL;
+
+        /* get txatten group, used to select 1) thermal txpower adjustment
+         *   and 2) mimo txpower balance between Tx chains. */
+        txatten_grp = il4965_get_tx_atten_grp(channel);
+        if (txatten_grp < 0) {
+                IL_ERR("Can't find txatten group for channel %d.\n", channel);
+                return txatten_grp;
+        }
+
+        D_TXPOWER("channel %d belongs to txatten group %d\n", channel,
+                  txatten_grp);
+
+        if (is_ht40) {
+                if (ctrl_chan_high)
+                        channel -= 2;
+                else
+                        channel += 2;
+        }
+
+        /* hardware txpower limits ...
+         * saturation (clipping distortion) txpowers are in half-dBm */
+        if (band)
+                saturation_power = il->calib_info->saturation_power24;
+        else
+                saturation_power = il->calib_info->saturation_power52;
+
+        if (saturation_power < IL_TX_POWER_SATURATION_MIN ||
+            saturation_power > IL_TX_POWER_SATURATION_MAX) {
+                if (band)
+                        saturation_power = IL_TX_POWER_DEFAULT_SATURATION_24;
+                else
+                        saturation_power = IL_TX_POWER_DEFAULT_SATURATION_52;
+        }
+
+        /* regulatory txpower limits ... reg_limit values are in half-dBm,
+         *   max_power_avg values are in dBm, convert * 2 */
+        if (is_ht40)
+                reg_limit = ch_info->ht40_max_power_avg * 2;
+        else
+                reg_limit = ch_info->max_power_avg * 2;
+
+        if ((reg_limit < IL_TX_POWER_REGULATORY_MIN) ||
+            (reg_limit > IL_TX_POWER_REGULATORY_MAX)) {
+                if (band)
+                        reg_limit = IL_TX_POWER_DEFAULT_REGULATORY_24;
+                else
+                        reg_limit = IL_TX_POWER_DEFAULT_REGULATORY_52;
+        }
+
+        /* Interpolate txpower calibration values for this channel,
+         *   based on factory calibration tests on spaced channels. */
+        il4965_interpolate_chan(il, channel, &ch_eeprom_info);
+
+        /* calculate tx gain adjustment based on power supply voltage */
+        voltage = le16_to_cpu(il->calib_info->voltage);
+        init_voltage = (s32) le32_to_cpu(il->card_alive_init.voltage);
+        voltage_compensation =
+            il4965_get_voltage_compensation(voltage, init_voltage);
+
+        D_TXPOWER("curr volt %d eeprom volt %d volt comp %d\n", init_voltage,
+                  voltage, voltage_compensation);
+
+        /* get current temperature (Celsius) */
+        current_temp = max(il->temperature, IL_TX_POWER_TEMPERATURE_MIN);
+        current_temp = min(il->temperature, IL_TX_POWER_TEMPERATURE_MAX);
+        current_temp = KELVIN_TO_CELSIUS(current_temp);
+
+        /* select thermal txpower adjustment params, based on channel group
+         *   (same frequency group used for mimo txatten adjustment) */
+        degrees_per_05db_num =
+            tx_power_cmp_tble[txatten_grp].degrees_per_05db_a;
+        degrees_per_05db_denom =
+            tx_power_cmp_tble[txatten_grp].degrees_per_05db_a_denom;
+
+        /* get per-chain txpower values from factory measurements */
+        for (c = 0; c < 2; c++) {
+                measurement = &ch_eeprom_info.measurements[c][1];
+
+                /* txgain adjustment (in half-dB steps) based on difference
+                 *   between factory and current temperature */
+                factory_temp = measurement->temperature;
+                il4965_math_div_round((current_temp -
+                                       factory_temp) * degrees_per_05db_denom,
+                                      degrees_per_05db_num,
+                                      &temperature_comp[c]);
+
+                factory_gain_idx[c] = measurement->gain_idx;
+                factory_actual_pwr[c] = measurement->actual_pow;
+
+                D_TXPOWER("chain = %d\n", c);
+                D_TXPOWER("fctry tmp %d, " "curr tmp %d, comp %d steps\n",
+                          factory_temp, current_temp, temperature_comp[c]);
+
+                D_TXPOWER("fctry idx %d, fctry pwr %d\n", factory_gain_idx[c],
+                          factory_actual_pwr[c]);
+        }
+
+        /* for each of 33 bit-rates (including 1 for CCK) */
+        for (i = 0; i < POWER_TBL_NUM_ENTRIES; i++) {
+                u8 is_mimo_rate;
+                union il4965_tx_power_dual_stream tx_power;
+
+                /* for mimo, reduce each chain's txpower by half
+                 * (3dB, 6 steps), so total output power is regulatory
+                 * compliant. */
+                if (i & 0x8) {
+                        current_regulatory =
+                            reg_limit -
+                            IL_TX_POWER_MIMO_REGULATORY_COMPENSATION;
+                        is_mimo_rate = 1;
+                } else {
+                        current_regulatory = reg_limit;
+                        is_mimo_rate = 0;
+                }
+
+                /* find txpower limit, either hardware or regulatory */
+                power_limit = saturation_power - back_off_table[i];
+                if (power_limit > current_regulatory)
+                        power_limit = current_regulatory;
+
+                /* reduce user's txpower request if necessary
+                 * for this rate on this channel */
+                target_power = user_target_power;
+                if (target_power > power_limit)
+                        target_power = power_limit;
+
+                D_TXPOWER("rate %d sat %d reg %d usr %d tgt %d\n", i,
+                          saturation_power - back_off_table[i],
+                          current_regulatory, user_target_power, target_power);
+
+                /* for each of 2 Tx chains (radio transmitters) */
+                for (c = 0; c < 2; c++) {
+                        s32 atten_value;
+
+                        if (is_mimo_rate)
+                                atten_value =
+                                    (s32) le32_to_cpu(il->card_alive_init.
+                                                      tx_atten[txatten_grp][c]);
+                        else
+                                atten_value = 0;
+
+                        /* calculate idx; higher idx means lower txpower */
+                        power_idx =
+                            (u8) (factory_gain_idx[c] -
+                                  (target_power - factory_actual_pwr[c]) -
+                                  temperature_comp[c] - voltage_compensation +
+                                  atten_value);
+
+/*                      D_TXPOWER("calculated txpower idx %d\n",
+                                                power_idx); */
+
+                        if (power_idx < get_min_power_idx(i, band))
+                                power_idx = get_min_power_idx(i, band);
+
+                        /* adjust 5 GHz idx to support negative idxes */
+                        if (!band)
+                                power_idx += 9;
+
+                        /* CCK, rate 32, reduce txpower for CCK */
+                        if (i == POWER_TBL_CCK_ENTRY)
+                                power_idx +=
+                                    IL_TX_POWER_CCK_COMPENSATION_C_STEP;
+
+                        /* stay within the table! */
+                        if (power_idx > 107) {
+                                IL_WARN("txpower idx %d > 107\n", power_idx);
+                                power_idx = 107;
+                        }
+                        if (power_idx < 0) {
+                                IL_WARN("txpower idx %d < 0\n", power_idx);
+                                power_idx = 0;
+                        }
+
+                        /* fill txpower command for this rate/chain */
+                        tx_power.s.radio_tx_gain[c] =
+                            gain_table[band][power_idx].radio;
+                        tx_power.s.dsp_predis_atten[c] =
+                            gain_table[band][power_idx].dsp;
+
+                        D_TXPOWER("chain %d mimo %d idx %d "
+                                  "gain 0x%02x dsp %d\n", c, atten_value,
+                                  power_idx, tx_power.s.radio_tx_gain[c],
+                                  tx_power.s.dsp_predis_atten[c]);
+                }               /* for each chain */
+
+                tx_power_tbl->power_tbl[i].dw = cpu_to_le32(tx_power.dw);
+
+        }                       /* for each rate */
+
+        return 0;
+}
+
+/**
+ * il4965_send_tx_power - Configure the TXPOWER level user limit
+ *
+ * Uses the active RXON for channel, band, and characteristics (ht40, high)
+ * The power limit is taken from il->tx_power_user_lmt.
+ */
+static int
+il4965_send_tx_power(struct il_priv *il)
+{
+        struct il4965_txpowertable_cmd cmd = { 0 };
+        int ret;
+        u8 band = 0;
+        bool is_ht40 = false;
+        u8 ctrl_chan_high = 0;
+        struct il_rxon_context *ctx = &il->ctx;
+
+        if (WARN_ONCE
+            (test_bit(S_SCAN_HW, &il->status),
+             "TX Power requested while scanning!\n"))
+                return -EAGAIN;
+
+        band = il->band == IEEE80211_BAND_2GHZ;
+
+        is_ht40 = iw4965_is_ht40_channel(ctx->active.flags);
+
+        if (is_ht40 && (ctx->active.flags & RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK))
+                ctrl_chan_high = 1;
+
+        cmd.band = band;
+        cmd.channel = ctx->active.channel;
+
+        ret =
+            il4965_fill_txpower_tbl(il, band, le16_to_cpu(ctx->active.channel),
+                                    is_ht40, ctrl_chan_high, &cmd.tx_power);
+        if (ret)
+                goto out;
+
+        ret = il_send_cmd_pdu(il, C_TX_PWR_TBL, sizeof(cmd), &cmd);
+
+out:
+        return ret;
+}
+
+static int
+il4965_send_rxon_assoc(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        int ret = 0;
+        struct il4965_rxon_assoc_cmd rxon_assoc;
+        const struct il_rxon_cmd *rxon1 = &ctx->staging;
+        const struct il_rxon_cmd *rxon2 = &ctx->active;
+
+        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) {
+                D_INFO("Using current RXON_ASSOC.  Not resending.\n");
+                return 0;
+        }
+
+        rxon_assoc.flags = ctx->staging.flags;
+        rxon_assoc.filter_flags = ctx->staging.filter_flags;
+        rxon_assoc.ofdm_basic_rates = ctx->staging.ofdm_basic_rates;
+        rxon_assoc.cck_basic_rates = ctx->staging.cck_basic_rates;
+        rxon_assoc.reserved = 0;
+        rxon_assoc.ofdm_ht_single_stream_basic_rates =
+            ctx->staging.ofdm_ht_single_stream_basic_rates;
+        rxon_assoc.ofdm_ht_dual_stream_basic_rates =
+            ctx->staging.ofdm_ht_dual_stream_basic_rates;
+        rxon_assoc.rx_chain_select_flags = ctx->staging.rx_chain;
+
+        ret =
+            il_send_cmd_pdu_async(il, C_RXON_ASSOC, sizeof(rxon_assoc),
+                                  &rxon_assoc, NULL);
+
+        return ret;
+}
+
+static int
+il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        /* cast away the const for active_rxon in this function */
+        struct il_rxon_cmd *active_rxon = (void *)&ctx->active;
+        int ret;
+        bool new_assoc = !!(ctx->staging.filter_flags & RXON_FILTER_ASSOC_MSK);
+
+        if (!il_is_alive(il))
+                return -EBUSY;
+
+        if (!ctx->is_active)
+                return 0;
+
+        /* always get timestamp with Rx frame */
+        ctx->staging.flags |= RXON_FLG_TSF2HOST_MSK;
+
+        ret = il_check_rxon_cmd(il, ctx);
+        if (ret) {
+                IL_ERR("Invalid RXON configuration.  Not committing.\n");
+                return -EINVAL;
+        }
+
+        /*
+         * receive commit_rxon request
+         * abort any previous channel switch if still in process
+         */
+        if (test_bit(S_CHANNEL_SWITCH_PENDING, &il->status) &&
+            il->switch_channel != ctx->staging.channel) {
+                D_11H("abort channel switch on %d\n",
+                      le16_to_cpu(il->switch_channel));
+                il_chswitch_done(il, false);
+        }
+
+        /* If we don't need to send a full RXON, we can use
+         * il_rxon_assoc_cmd which is used to reconfigure filter
+         * and other flags for the current radio configuration. */
+        if (!il_full_rxon_required(il, ctx)) {
+                ret = il_send_rxon_assoc(il, ctx);
+                if (ret) {
+                        IL_ERR("Error setting RXON_ASSOC (%d)\n", ret);
+                        return ret;
+                }
+
+                memcpy(active_rxon, &ctx->staging, sizeof(*active_rxon));
+                il_print_rx_config_cmd(il, ctx);
+                /*
+                 * We do not commit tx power settings while channel changing,
+                 * do it now if tx power changed.
+                 */
+                il_set_tx_power(il, il->tx_power_next, false);
+                return 0;
+        }
+
+        /* If we are currently associated and the new config requires
+         * 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 (il_is_associated_ctx(ctx) && new_assoc) {
+                D_INFO("Toggling associated bit on current RXON\n");
+                active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+
+                ret =
+                    il_send_cmd_pdu(il, ctx->rxon_cmd,
+                                    sizeof(struct il_rxon_cmd), active_rxon);
+
+                /* If the mask clearing failed then we set
+                 * active_rxon back to what it was previously */
+                if (ret) {
+                        active_rxon->filter_flags |= RXON_FILTER_ASSOC_MSK;
+                        IL_ERR("Error clearing ASSOC_MSK (%d)\n", ret);
+                        return ret;
+                }
+                il_clear_ucode_stations(il, ctx);
+                il_restore_stations(il, ctx);
+                ret = il4965_restore_default_wep_keys(il, ctx);
+                if (ret) {
+                        IL_ERR("Failed to restore WEP keys (%d)\n", ret);
+                        return ret;
+                }
+        }
+
+        D_INFO("Sending RXON\n" "* with%s RXON_FILTER_ASSOC_MSK\n"
+               "* channel = %d\n" "* bssid = %pM\n", (new_assoc ? "" : "out"),
+               le16_to_cpu(ctx->staging.channel), ctx->staging.bssid_addr);
+
+        il_set_rxon_hwcrypto(il, ctx, !il->cfg->mod_params->sw_crypto);
+
+        /* Apply the new configuration
+         * RXON unassoc clears the station table in uCode so restoration of
+         * stations is needed after it (the RXON command) completes
+         */
+        if (!new_assoc) {
+                ret =
+                    il_send_cmd_pdu(il, ctx->rxon_cmd,
+                                    sizeof(struct il_rxon_cmd), &ctx->staging);
+                if (ret) {
+                        IL_ERR("Error setting new RXON (%d)\n", ret);
+                        return ret;
+                }
+                D_INFO("Return from !new_assoc RXON.\n");
+                memcpy(active_rxon, &ctx->staging, sizeof(*active_rxon));
+                il_clear_ucode_stations(il, ctx);
+                il_restore_stations(il, ctx);
+                ret = il4965_restore_default_wep_keys(il, ctx);
+                if (ret) {
+                        IL_ERR("Failed to restore WEP keys (%d)\n", ret);
+                        return ret;
+                }
+        }
+        if (new_assoc) {
+                il->start_calib = 0;
+                /* Apply the new configuration
+                 * RXON assoc doesn't clear the station table in uCode,
+                 */
+                ret =
+                    il_send_cmd_pdu(il, ctx->rxon_cmd,
+                                    sizeof(struct il_rxon_cmd), &ctx->staging);
+                if (ret) {
+                        IL_ERR("Error setting new RXON (%d)\n", ret);
+                        return ret;
+                }
+                memcpy(active_rxon, &ctx->staging, sizeof(*active_rxon));
+        }
+        il_print_rx_config_cmd(il, ctx);
+
+        il4965_init_sensitivity(il);
+
+        /* If we issue a new RXON command which required a tune then we must
+         * send a new TXPOWER command or we won't be able to Tx any frames */
+        ret = il_set_tx_power(il, il->tx_power_next, true);
+        if (ret) {
+                IL_ERR("Error sending TX power (%d)\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int
+il4965_hw_channel_switch(struct il_priv *il,
+                         struct ieee80211_channel_switch *ch_switch)
+{
+        struct il_rxon_context *ctx = &il->ctx;
+        int rc;
+        u8 band = 0;
+        bool is_ht40 = false;
+        u8 ctrl_chan_high = 0;
+        struct il4965_channel_switch_cmd cmd;
+        const struct il_channel_info *ch_info;
+        u32 switch_time_in_usec, ucode_switch_time;
+        u16 ch;
+        u32 tsf_low;
+        u8 switch_count;
+        u16 beacon_interval = le16_to_cpu(ctx->timing.beacon_interval);
+        struct ieee80211_vif *vif = ctx->vif;
+        band = il->band == IEEE80211_BAND_2GHZ;
+
+        is_ht40 = iw4965_is_ht40_channel(ctx->staging.flags);
+
+        if (is_ht40 && (ctx->staging.flags & RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK))
+                ctrl_chan_high = 1;
+
+        cmd.band = band;
+        cmd.expect_beacon = 0;
+        ch = ch_switch->channel->hw_value;
+        cmd.channel = cpu_to_le16(ch);
+        cmd.rxon_flags = ctx->staging.flags;
+        cmd.rxon_filter_flags = ctx->staging.filter_flags;
+        switch_count = ch_switch->count;
+        tsf_low = ch_switch->timestamp & 0x0ffffffff;
+        /*
+         * calculate the ucode channel switch time
+         * adding TSF as one of the factor for when to switch
+         */
+        if (il->ucode_beacon_time > tsf_low && beacon_interval) {
+                if (switch_count >
+                    ((il->ucode_beacon_time - tsf_low) / beacon_interval)) {
+                        switch_count -=
+                            (il->ucode_beacon_time - tsf_low) / beacon_interval;
+                } else
+                        switch_count = 0;
+        }
+        if (switch_count <= 1)
+                cmd.switch_time = cpu_to_le32(il->ucode_beacon_time);
+        else {
+                switch_time_in_usec =
+                    vif->bss_conf.beacon_int * switch_count * TIME_UNIT;
+                ucode_switch_time =
+                    il_usecs_to_beacons(il, switch_time_in_usec,
+                                        beacon_interval);
+                cmd.switch_time =
+                    il_add_beacon_time(il, il->ucode_beacon_time,
+                                       ucode_switch_time, beacon_interval);
+        }
+        D_11H("uCode time for the switch is 0x%x\n", cmd.switch_time);
+        ch_info = il_get_channel_info(il, il->band, ch);
+        if (ch_info)
+                cmd.expect_beacon = il_is_channel_radar(ch_info);
+        else {
+                IL_ERR("invalid channel switch from %u to %u\n",
+                       ctx->active.channel, ch);
+                return -EFAULT;
+        }
+
+        rc = il4965_fill_txpower_tbl(il, band, ch, is_ht40, ctrl_chan_high,
+                                     &cmd.tx_power);
+        if (rc) {
+                D_11H("error:%d  fill txpower_tbl\n", rc);
+                return rc;
+        }
+
+        return il_send_cmd_pdu(il, C_CHANNEL_SWITCH, sizeof(cmd), &cmd);
+}
+
+/**
+ * il4965_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array
+ */
+static void
+il4965_txq_update_byte_cnt_tbl(struct il_priv *il, struct il_tx_queue *txq,
+                               u16 byte_cnt)
+{
+        struct il4965_scd_bc_tbl *scd_bc_tbl = il->scd_bc_tbls.addr;
+        int txq_id = txq->q.id;
+        int write_ptr = txq->q.write_ptr;
+        int len = byte_cnt + IL_TX_CRC_SIZE + IL_TX_DELIMITER_SIZE;
+        __le16 bc_ent;
+
+        WARN_ON(len > 0xFFF || write_ptr >= TFD_QUEUE_SIZE_MAX);
+
+        bc_ent = cpu_to_le16(len & 0xFFF);
+        /* Set up byte count within first 256 entries */
+        scd_bc_tbl[txq_id].tfd_offset[write_ptr] = bc_ent;
+
+        /* If within first 64 entries, duplicate at end */
+        if (write_ptr < TFD_QUEUE_SIZE_BC_DUP)
+                scd_bc_tbl[txq_id].tfd_offset[TFD_QUEUE_SIZE_MAX + write_ptr] =
+                    bc_ent;
+}
+
+/**
+ * il4965_hw_get_temperature - return the calibrated temperature (in Kelvin)
+ * @stats: Provides the temperature reading from the uCode
+ *
+ * A return of <0 indicates bogus data in the stats
+ */
+static int
+il4965_hw_get_temperature(struct il_priv *il)
+{
+        s32 temperature;
+        s32 vt;
+        s32 R1, R2, R3;
+        u32 R4;
+
+        if (test_bit(S_TEMPERATURE, &il->status) &&
+            (il->_4965.stats.flag & STATS_REPLY_FLG_HT40_MODE_MSK)) {
+                D_TEMP("Running HT40 temperature calibration\n");
+                R1 = (s32) le32_to_cpu(il->card_alive_init.therm_r1[1]);
+                R2 = (s32) le32_to_cpu(il->card_alive_init.therm_r2[1]);
+                R3 = (s32) le32_to_cpu(il->card_alive_init.therm_r3[1]);
+                R4 = le32_to_cpu(il->card_alive_init.therm_r4[1]);
+        } else {
+                D_TEMP("Running temperature calibration\n");
+                R1 = (s32) le32_to_cpu(il->card_alive_init.therm_r1[0]);
+                R2 = (s32) le32_to_cpu(il->card_alive_init.therm_r2[0]);
+                R3 = (s32) le32_to_cpu(il->card_alive_init.therm_r3[0]);
+                R4 = le32_to_cpu(il->card_alive_init.therm_r4[0]);
+        }
+
+        /*
+         * Temperature is only 23 bits, so sign extend out to 32.
+         *
+         * NOTE If we haven't received a stats notification yet
+         * with an updated temperature, use R4 provided to us in the
+         * "initialize" ALIVE response.
+         */
+        if (!test_bit(S_TEMPERATURE, &il->status))
+                vt = sign_extend32(R4, 23);
+        else
+                vt = sign_extend32(le32_to_cpu
+                                   (il->_4965.stats.general.common.temperature),
+                                   23);
+
+        D_TEMP("Calib values R[1-3]: %d %d %d R4: %d\n", R1, R2, R3, vt);
+
+        if (R3 == R1) {
+                IL_ERR("Calibration conflict R1 == R3\n");
+                return -1;
+        }
+
+        /* Calculate temperature in degrees Kelvin, adjust by 97%.
+         * Add offset to center the adjustment around 0 degrees Centigrade. */
+        temperature = TEMPERATURE_CALIB_A_VAL * (vt - R2);
+        temperature /= (R3 - R1);
+        temperature =
+            (temperature * 97) / 100 + TEMPERATURE_CALIB_KELVIN_OFFSET;
+
+        D_TEMP("Calibrated temperature: %dK, %dC\n", temperature,
+               KELVIN_TO_CELSIUS(temperature));
+
+        return temperature;
+}
+
+/* Adjust Txpower only if temperature variance is greater than threshold. */
+#define IL_TEMPERATURE_THRESHOLD   3
+
+/**
+ * il4965_is_temp_calib_needed - determines if new calibration is needed
+ *
+ * If the temperature changed has changed sufficiently, then a recalibration
+ * is needed.
+ *
+ * Assumes caller will replace il->last_temperature once calibration
+ * executed.
+ */
+static int
+il4965_is_temp_calib_needed(struct il_priv *il)
+{
+        int temp_diff;
+
+        if (!test_bit(S_STATS, &il->status)) {
+                D_TEMP("Temperature not updated -- no stats.\n");
+                return 0;
+        }
+
+        temp_diff = il->temperature - il->last_temperature;
+
+        /* get absolute value */
+        if (temp_diff < 0) {
+                D_POWER("Getting cooler, delta %d\n", temp_diff);
+                temp_diff = -temp_diff;
+        } else if (temp_diff == 0)
+                D_POWER("Temperature unchanged\n");
+        else
+                D_POWER("Getting warmer, delta %d\n", temp_diff);
+
+        if (temp_diff < IL_TEMPERATURE_THRESHOLD) {
+                D_POWER(" => thermal txpower calib not needed\n");
+                return 0;
+        }
+
+        D_POWER(" => thermal txpower calib needed\n");
+
+        return 1;
+}
+
+static void
+il4965_temperature_calib(struct il_priv *il)
+{
+        s32 temp;
+
+        temp = il4965_hw_get_temperature(il);
+        if (IL_TX_POWER_TEMPERATURE_OUT_OF_RANGE(temp))
+                return;
+
+        if (il->temperature != temp) {
+                if (il->temperature)
+                        D_TEMP("Temperature changed " "from %dC to %dC\n",
+                               KELVIN_TO_CELSIUS(il->temperature),
+                               KELVIN_TO_CELSIUS(temp));
+                else
+                        D_TEMP("Temperature " "initialized to %dC\n",
+                               KELVIN_TO_CELSIUS(temp));
+        }
+
+        il->temperature = temp;
+        set_bit(S_TEMPERATURE, &il->status);
+
+        if (!il->disable_tx_power_cal &&
+            unlikely(!test_bit(S_SCANNING, &il->status)) &&
+            il4965_is_temp_calib_needed(il))
+                queue_work(il->workqueue, &il->txpower_work);
+}
+
+static u16
+il4965_get_hcmd_size(u8 cmd_id, u16 len)
+{
+        switch (cmd_id) {
+        case C_RXON:
+                return (u16) sizeof(struct il4965_rxon_cmd);
+        default:
+                return len;
+        }
+}
+
+static u16
+il4965_build_addsta_hcmd(const struct il_addsta_cmd *cmd, u8 * data)
+{
+        struct il4965_addsta_cmd *addsta = (struct il4965_addsta_cmd *)data;
+        addsta->mode = cmd->mode;
+        memcpy(&addsta->sta, &cmd->sta, sizeof(struct sta_id_modify));
+        memcpy(&addsta->key, &cmd->key, sizeof(struct il4965_keyinfo));
+        addsta->station_flags = cmd->station_flags;
+        addsta->station_flags_msk = cmd->station_flags_msk;
+        addsta->tid_disable_tx = cmd->tid_disable_tx;
+        addsta->add_immediate_ba_tid = cmd->add_immediate_ba_tid;
+        addsta->remove_immediate_ba_tid = cmd->remove_immediate_ba_tid;
+        addsta->add_immediate_ba_ssn = cmd->add_immediate_ba_ssn;
+        addsta->sleep_tx_count = cmd->sleep_tx_count;
+        addsta->reserved1 = cpu_to_le16(0);
+        addsta->reserved2 = cpu_to_le16(0);
+
+        return (u16) sizeof(struct il4965_addsta_cmd);
+}
+
+static inline u32
+il4965_get_scd_ssn(struct il4965_tx_resp *tx_resp)
+{
+        return le32_to_cpup(&tx_resp->u.status + tx_resp->frame_count) & MAX_SN;
+}
+
+static inline u32
+il4965_tx_status_to_mac80211(u32 status)
+{
+        status &= TX_STATUS_MSK;
+
+        switch (status) {
+        case TX_STATUS_SUCCESS:
+        case TX_STATUS_DIRECT_DONE:
+                return IEEE80211_TX_STAT_ACK;
+        case TX_STATUS_FAIL_DEST_PS:
+                return IEEE80211_TX_STAT_TX_FILTERED;
+        default:
+                return 0;
+        }
+}
+
+static inline bool
+il4965_is_tx_success(u32 status)
+{
+        status &= TX_STATUS_MSK;
+        return (status == TX_STATUS_SUCCESS || status == TX_STATUS_DIRECT_DONE);
+}
+
+/**
+ * il4965_tx_status_reply_tx - Handle Tx response for frames in aggregation queue
+ */
+static int
+il4965_tx_status_reply_tx(struct il_priv *il, struct il_ht_agg *agg,
+                          struct il4965_tx_resp *tx_resp, int txq_id,
+                          u16 start_idx)
+{
+        u16 status;
+        struct agg_tx_status *frame_status = tx_resp->u.agg_status;
+        struct ieee80211_tx_info *info = NULL;
+        struct ieee80211_hdr *hdr = NULL;
+        u32 rate_n_flags = le32_to_cpu(tx_resp->rate_n_flags);
+        int i, sh, idx;
+        u16 seq;
+        if (agg->wait_for_ba)
+                D_TX_REPLY("got tx response w/o block-ack\n");
+
+        agg->frame_count = tx_resp->frame_count;
+        agg->start_idx = start_idx;
+        agg->rate_n_flags = rate_n_flags;
+        agg->bitmap = 0;
+
+        /* num frames attempted by Tx command */
+        if (agg->frame_count == 1) {
+                /* Only one frame was attempted; no block-ack will arrive */
+                status = le16_to_cpu(frame_status[0].status);
+                idx = start_idx;
+
+                D_TX_REPLY("FrameCnt = %d, StartIdx=%d idx=%d\n",
+                           agg->frame_count, agg->start_idx, idx);
+
+                info = IEEE80211_SKB_CB(il->txq[txq_id].txb[idx].skb);
+                info->status.rates[0].count = tx_resp->failure_frame + 1;
+                info->flags &= ~IEEE80211_TX_CTL_AMPDU;
+                info->flags |= il4965_tx_status_to_mac80211(status);
+                il4965_hwrate_to_tx_control(il, rate_n_flags, info);
+
+                D_TX_REPLY("1 Frame 0x%x failure :%d\n", status & 0xff,
+                           tx_resp->failure_frame);
+                D_TX_REPLY("Rate Info rate_n_flags=%x\n", rate_n_flags);
+
+                agg->wait_for_ba = 0;
+        } else {
+                /* Two or more frames were attempted; expect block-ack */
+                u64 bitmap = 0;
+                int start = agg->start_idx;
+
+                /* Construct bit-map of pending frames within Tx win */
+                for (i = 0; i < agg->frame_count; i++) {
+                        u16 sc;
+                        status = le16_to_cpu(frame_status[i].status);
+                        seq = le16_to_cpu(frame_status[i].sequence);
+                        idx = SEQ_TO_IDX(seq);
+                        txq_id = SEQ_TO_QUEUE(seq);
+
+                        if (status &
+                            (AGG_TX_STATE_FEW_BYTES_MSK |
+                             AGG_TX_STATE_ABORT_MSK))
+                                continue;
+
+                        D_TX_REPLY("FrameCnt = %d, txq_id=%d idx=%d\n",
+                                   agg->frame_count, txq_id, idx);
+
+                        hdr = il_tx_queue_get_hdr(il, txq_id, idx);
+                        if (!hdr) {
+                                IL_ERR("BUG_ON idx doesn't point to valid skb"
+                                       " idx=%d, txq_id=%d\n", idx, txq_id);
+                                return -1;
+                        }
+
+                        sc = le16_to_cpu(hdr->seq_ctrl);
+                        if (idx != (SEQ_TO_SN(sc) & 0xff)) {
+                                IL_ERR("BUG_ON idx doesn't match seq control"
+                                       " idx=%d, seq_idx=%d, seq=%d\n", idx,
+                                       SEQ_TO_SN(sc), hdr->seq_ctrl);
+                                return -1;
+                        }
+
+                        D_TX_REPLY("AGG Frame i=%d idx %d seq=%d\n", i, idx,
+                                   SEQ_TO_SN(sc));
+
+                        sh = idx - start;
+                        if (sh > 64) {
+                                sh = (start - idx) + 0xff;
+                                bitmap = bitmap << sh;
+                                sh = 0;
+                                start = idx;
+                        } else if (sh < -64)
+                                sh = 0xff - (start - idx);
+                        else if (sh < 0) {
+                                sh = start - idx;
+                                start = idx;
+                                bitmap = bitmap << sh;
+                                sh = 0;
+                        }
+                        bitmap |= 1ULL << sh;
+                        D_TX_REPLY("start=%d bitmap=0x%llx\n", start,
+                                   (unsigned long long)bitmap);
+                }
+
+                agg->bitmap = bitmap;
+                agg->start_idx = start;
+                D_TX_REPLY("Frames %d start_idx=%d bitmap=0x%llx\n",
+                           agg->frame_count, agg->start_idx,
+                           (unsigned long long)agg->bitmap);
+
+                if (bitmap)
+                        agg->wait_for_ba = 1;
+        }
+        return 0;
+}
+
+static u8
+il4965_find_station(struct il_priv *il, const u8 * addr)
+{
+        int i;
+        int start = 0;
+        int ret = IL_INVALID_STATION;
+        unsigned long flags;
+
+        if ((il->iw_mode == NL80211_IFTYPE_ADHOC))
+                start = IL_STA_ID;
+
+        if (is_broadcast_ether_addr(addr))
+                return il->ctx.bcast_sta_id;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        for (i = start; i < il->hw_params.max_stations; i++)
+                if (il->stations[i].used &&
+                    (!compare_ether_addr(il->stations[i].sta.sta.addr, addr))) {
+                        ret = i;
+                        goto out;
+                }
+
+        D_ASSOC("can not find STA %pM total %d\n", addr, il->num_stations);
+
+out:
+        /*
+         * It may be possible that more commands interacting with stations
+         * arrive before we completed processing the adding of
+         * station
+         */
+        if (ret != IL_INVALID_STATION &&
+            (!(il->stations[ret].used & IL_STA_UCODE_ACTIVE) ||
+             ((il->stations[ret].used & IL_STA_UCODE_ACTIVE) &&
+              (il->stations[ret].used & IL_STA_UCODE_INPROGRESS)))) {
+                IL_ERR("Requested station info for sta %d before ready.\n",
+                       ret);
+                ret = IL_INVALID_STATION;
+        }
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+        return ret;
+}
+
+static int
+il4965_get_ra_sta_id(struct il_priv *il, struct ieee80211_hdr *hdr)
+{
+        if (il->iw_mode == NL80211_IFTYPE_STATION) {
+                return IL_AP_ID;
+        } else {
+                u8 *da = ieee80211_get_DA(hdr);
+                return il4965_find_station(il, da);
+        }
+}
+
+/**
+ * il4965_hdl_tx - Handle standard (non-aggregation) Tx response
+ */
+static void
+il4965_hdl_tx(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        u16 sequence = le16_to_cpu(pkt->hdr.sequence);
+        int txq_id = SEQ_TO_QUEUE(sequence);
+        int idx = SEQ_TO_IDX(sequence);
+        struct il_tx_queue *txq = &il->txq[txq_id];
+        struct ieee80211_hdr *hdr;
+        struct ieee80211_tx_info *info;
+        struct il4965_tx_resp *tx_resp = (void *)&pkt->u.raw[0];
+        u32 status = le32_to_cpu(tx_resp->u.status);
+        int uninitialized_var(tid);
+        int sta_id;
+        int freed;
+        u8 *qc = NULL;
+        unsigned long flags;
+
+        if (idx >= txq->q.n_bd || il_queue_used(&txq->q, idx) == 0) {
+                IL_ERR("Read idx for DMA queue txq_id (%d) idx %d "
+                       "is out of range [0-%d] %d %d\n", txq_id, idx,
+                       txq->q.n_bd, txq->q.write_ptr, txq->q.read_ptr);
+                return;
+        }
+
+        txq->time_stamp = jiffies;
+        info = IEEE80211_SKB_CB(txq->txb[txq->q.read_ptr].skb);
+        memset(&info->status, 0, sizeof(info->status));
+
+        hdr = il_tx_queue_get_hdr(il, txq_id, idx);
+        if (ieee80211_is_data_qos(hdr->frame_control)) {
+                qc = ieee80211_get_qos_ctl(hdr);
+                tid = qc[0] & 0xf;
+        }
+
+        sta_id = il4965_get_ra_sta_id(il, hdr);
+        if (txq->sched_retry && unlikely(sta_id == IL_INVALID_STATION)) {
+                IL_ERR("Station not known\n");
+                return;
+        }
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        if (txq->sched_retry) {
+                const u32 scd_ssn = il4965_get_scd_ssn(tx_resp);
+                struct il_ht_agg *agg = NULL;
+                WARN_ON(!qc);
+
+                agg = &il->stations[sta_id].tid[tid].agg;
+
+                il4965_tx_status_reply_tx(il, agg, tx_resp, txq_id, idx);
+
+                /* check if BAR is needed */
+                if ((tx_resp->frame_count == 1) &&
+                    !il4965_is_tx_success(status))
+                        info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;
+
+                if (txq->q.read_ptr != (scd_ssn & 0xff)) {
+                        idx = il_queue_dec_wrap(scd_ssn & 0xff, txq->q.n_bd);
+                        D_TX_REPLY("Retry scheduler reclaim scd_ssn "
+                                   "%d idx %d\n", scd_ssn, idx);
+                        freed = il4965_tx_queue_reclaim(il, txq_id, idx);
+                        if (qc)
+                                il4965_free_tfds_in_queue(il, sta_id, tid,
+                                                          freed);
+
+                        if (il->mac80211_registered &&
+                            il_queue_space(&txq->q) > txq->q.low_mark &&
+                            agg->state != IL_EMPTYING_HW_QUEUE_DELBA)
+                                il_wake_queue(il, txq);
+                }
+        } else {
+                info->status.rates[0].count = tx_resp->failure_frame + 1;
+                info->flags |= il4965_tx_status_to_mac80211(status);
+                il4965_hwrate_to_tx_control(il,
+                                            le32_to_cpu(tx_resp->rate_n_flags),
+                                            info);
+
+                D_TX_REPLY("TXQ %d status %s (0x%08x) "
+                           "rate_n_flags 0x%x retries %d\n", txq_id,
+                           il4965_get_tx_fail_reason(status), status,
+                           le32_to_cpu(tx_resp->rate_n_flags),
+                           tx_resp->failure_frame);
+
+                freed = il4965_tx_queue_reclaim(il, txq_id, idx);
+                if (qc && likely(sta_id != IL_INVALID_STATION))
+                        il4965_free_tfds_in_queue(il, sta_id, tid, freed);
+                else if (sta_id == IL_INVALID_STATION)
+                        D_TX_REPLY("Station not known\n");
+
+                if (il->mac80211_registered &&
+                    il_queue_space(&txq->q) > txq->q.low_mark)
+                        il_wake_queue(il, txq);
+        }
+        if (qc && likely(sta_id != IL_INVALID_STATION))
+                il4965_txq_check_empty(il, sta_id, tid, txq_id);
+
+        il4965_check_abort_status(il, tx_resp->frame_count, status);
+
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+}
+
+static void
+il4965_hdl_beacon(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct il4965_beacon_notif *beacon = (void *)pkt->u.raw;
+        u8 rate __maybe_unused =
+            il4965_hw_get_rate(beacon->beacon_notify_hdr.rate_n_flags);
+
+        D_RX("beacon status %#x, retries:%d ibssmgr:%d "
+             "tsf:0x%.8x%.8x rate:%d\n",
+             le32_to_cpu(beacon->beacon_notify_hdr.u.status) & TX_STATUS_MSK,
+             beacon->beacon_notify_hdr.failure_frame,
+             le32_to_cpu(beacon->ibss_mgr_status),
+             le32_to_cpu(beacon->high_tsf), le32_to_cpu(beacon->low_tsf), rate);
+
+        il->ibss_manager = le32_to_cpu(beacon->ibss_mgr_status);
+}
+
+/* Set up 4965-specific Rx frame reply handlers */
+static void
+il4965_handler_setup(struct il_priv *il)
+{
+        /* Legacy Rx frames */
+        il->handlers[N_RX] = il4965_hdl_rx;
+        /* Tx response */
+        il->handlers[C_TX] = il4965_hdl_tx;
+        il->handlers[N_BEACON] = il4965_hdl_beacon;
+}
+
+static struct il_hcmd_ops il4965_hcmd = {
+        .rxon_assoc = il4965_send_rxon_assoc,
+        .commit_rxon = il4965_commit_rxon,
+        .set_rxon_chain = il4965_set_rxon_chain,
+};
+
+static void
+il4965_post_scan(struct il_priv *il)
+{
+        struct il_rxon_context *ctx = &il->ctx;
+
+        /*
+         * Since setting the RXON may have been deferred while
+         * performing the scan, fire one off if needed
+         */
+        if (memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging)))
+                il_commit_rxon(il, ctx);
+}
+
+static void
+il4965_post_associate(struct il_priv *il)
+{
+        struct il_rxon_context *ctx = &il->ctx;
+        struct ieee80211_vif *vif = ctx->vif;
+        struct ieee80211_conf *conf = NULL;
+        int ret = 0;
+
+        if (!vif || !il->is_open)
+                return;
+
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                return;
+
+        il_scan_cancel_timeout(il, 200);
+
+        conf = &il->hw->conf;
+
+        ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+        il_commit_rxon(il, ctx);
+
+        ret = il_send_rxon_timing(il, ctx);
+        if (ret)
+                IL_WARN("RXON timing - " "Attempting to continue.\n");
+
+        ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
+
+        il_set_rxon_ht(il, &il->current_ht_config);
+
+        if (il->cfg->ops->hcmd->set_rxon_chain)
+                il->cfg->ops->hcmd->set_rxon_chain(il, ctx);
+
+        ctx->staging.assoc_id = cpu_to_le16(vif->bss_conf.aid);
+
+        D_ASSOC("assoc id %d beacon interval %d\n", vif->bss_conf.aid,
+                vif->bss_conf.beacon_int);
+
+        if (vif->bss_conf.use_short_preamble)
+                ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
+        else
+                ctx->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
+
+        if (ctx->staging.flags & RXON_FLG_BAND_24G_MSK) {
+                if (vif->bss_conf.use_short_slot)
+                        ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
+                else
+                        ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
+        }
+
+        il_commit_rxon(il, ctx);
+
+        D_ASSOC("Associated as %d to: %pM\n", vif->bss_conf.aid,
+                ctx->active.bssid_addr);
+
+        switch (vif->type) {
+        case NL80211_IFTYPE_STATION:
+                break;
+        case NL80211_IFTYPE_ADHOC:
+                il4965_send_beacon_cmd(il);
+                break;
+        default:
+                IL_ERR("%s Should not be called in %d mode\n", __func__,
+                       vif->type);
+                break;
+        }
+
+        /* the chain noise calibration will enabled PM upon completion
+         * If chain noise has already been run, then we need to enable
+         * power management here */
+        if (il->chain_noise_data.state == IL_CHAIN_NOISE_DONE)
+                il_power_update_mode(il, false);
+
+        /* Enable Rx differential gain and sensitivity calibrations */
+        il4965_chain_noise_reset(il);
+        il->start_calib = 1;
+}
+
+static void
+il4965_config_ap(struct il_priv *il)
+{
+        struct il_rxon_context *ctx = &il->ctx;
+        struct ieee80211_vif *vif = ctx->vif;
+        int ret = 0;
+
+        lockdep_assert_held(&il->mutex);
+
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                return;
+
+        /* The following should be done only at AP bring up */
+        if (!il_is_associated_ctx(ctx)) {
+
+                /* RXON - unassoc (to set timing command) */
+                ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+                il_commit_rxon(il, ctx);
+
+                /* RXON Timing */
+                ret = il_send_rxon_timing(il, ctx);
+                if (ret)
+                        IL_WARN("RXON timing failed - "
+                                "Attempting to continue.\n");
+
+                /* AP has all antennas */
+                il->chain_noise_data.active_chains = il->hw_params.valid_rx_ant;
+                il_set_rxon_ht(il, &il->current_ht_config);
+                if (il->cfg->ops->hcmd->set_rxon_chain)
+                        il->cfg->ops->hcmd->set_rxon_chain(il, ctx);
+
+                ctx->staging.assoc_id = 0;
+
+                if (vif->bss_conf.use_short_preamble)
+                        ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
+                else
+                        ctx->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
+
+                if (ctx->staging.flags & RXON_FLG_BAND_24G_MSK) {
+                        if (vif->bss_conf.use_short_slot)
+                                ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
+                        else
+                                ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
+                }
+                /* need to send beacon cmd before committing assoc RXON! */
+                il4965_send_beacon_cmd(il);
+                /* restore RXON assoc */
+                ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
+                il_commit_rxon(il, ctx);
+        }
+        il4965_send_beacon_cmd(il);
+}
+
+static struct il_hcmd_utils_ops il4965_hcmd_utils = {
+        .get_hcmd_size = il4965_get_hcmd_size,
+        .build_addsta_hcmd = il4965_build_addsta_hcmd,
+        .request_scan = il4965_request_scan,
+        .post_scan = il4965_post_scan,
+};
+
+static struct il_lib_ops il4965_lib = {
+        .set_hw_params = il4965_hw_set_hw_params,
+        .txq_update_byte_cnt_tbl = il4965_txq_update_byte_cnt_tbl,
+        .txq_attach_buf_to_tfd = il4965_hw_txq_attach_buf_to_tfd,
+        .txq_free_tfd = il4965_hw_txq_free_tfd,
+        .txq_init = il4965_hw_tx_queue_init,
+        .handler_setup = il4965_handler_setup,
+        .is_valid_rtc_data_addr = il4965_hw_valid_rtc_data_addr,
+        .init_alive_start = il4965_init_alive_start,
+        .load_ucode = il4965_load_bsm,
+        .dump_nic_error_log = il4965_dump_nic_error_log,
+        .dump_fh = il4965_dump_fh,
+        .set_channel_switch = il4965_hw_channel_switch,
+        .apm_ops = {
+                    .init = il_apm_init,
+                    .config = il4965_nic_config,
+                    },
+        .eeprom_ops = {
+                       .regulatory_bands = {
+                                            EEPROM_REGULATORY_BAND_1_CHANNELS,
+                                            EEPROM_REGULATORY_BAND_2_CHANNELS,
+                                            EEPROM_REGULATORY_BAND_3_CHANNELS,
+                                            EEPROM_REGULATORY_BAND_4_CHANNELS,
+                                            EEPROM_REGULATORY_BAND_5_CHANNELS,
+                                            EEPROM_4965_REGULATORY_BAND_24_HT40_CHANNELS,
+                                            EEPROM_4965_REGULATORY_BAND_52_HT40_CHANNELS},
+                       .acquire_semaphore = il4965_eeprom_acquire_semaphore,
+                       .release_semaphore = il4965_eeprom_release_semaphore,
+                       },
+        .send_tx_power = il4965_send_tx_power,
+        .update_chain_flags = il4965_update_chain_flags,
+        .temp_ops = {
+                     .temperature = il4965_temperature_calib,
+                     },
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+        .debugfs_ops = {
+                        .rx_stats_read = il4965_ucode_rx_stats_read,
+                        .tx_stats_read = il4965_ucode_tx_stats_read,
+                        .general_stats_read = il4965_ucode_general_stats_read,
+                        },
+#endif
+};
+
+static const struct il_legacy_ops il4965_legacy_ops = {
+        .post_associate = il4965_post_associate,
+        .config_ap = il4965_config_ap,
+        .manage_ibss_station = il4965_manage_ibss_station,
+        .update_bcast_stations = il4965_update_bcast_stations,
+};
+
+struct ieee80211_ops il4965_hw_ops = {
+        .tx = il4965_mac_tx,
+        .start = il4965_mac_start,
+        .stop = il4965_mac_stop,
+        .add_interface = il_mac_add_interface,
+        .remove_interface = il_mac_remove_interface,
+        .change_interface = il_mac_change_interface,
+        .config = il_mac_config,
+        .configure_filter = il4965_configure_filter,
+        .set_key = il4965_mac_set_key,
+        .update_tkip_key = il4965_mac_update_tkip_key,
+        .conf_tx = il_mac_conf_tx,
+        .reset_tsf = il_mac_reset_tsf,
+        .bss_info_changed = il_mac_bss_info_changed,
+        .ampdu_action = il4965_mac_ampdu_action,
+        .hw_scan = il_mac_hw_scan,
+        .sta_add = il4965_mac_sta_add,
+        .sta_remove = il_mac_sta_remove,
+        .channel_switch = il4965_mac_channel_switch,
+        .tx_last_beacon = il_mac_tx_last_beacon,
+};
+
+static const struct il_ops il4965_ops = {
+        .lib = &il4965_lib,
+        .hcmd = &il4965_hcmd,
+        .utils = &il4965_hcmd_utils,
+        .led = &il4965_led_ops,
+        .legacy = &il4965_legacy_ops,
+        .ieee80211_ops = &il4965_hw_ops,
+};
+
+static struct il_base_params il4965_base_params = {
+        .eeprom_size = IL4965_EEPROM_IMG_SIZE,
+        .num_of_queues = IL49_NUM_QUEUES,
+        .num_of_ampdu_queues = IL49_NUM_AMPDU_QUEUES,
+        .pll_cfg_val = 0,
+        .set_l0s = true,
+        .use_bsm = true,
+        .led_compensation = 61,
+        .chain_noise_num_beacons = IL4965_CAL_NUM_BEACONS,
+        .wd_timeout = IL_DEF_WD_TIMEOUT,
+        .temperature_kelvin = true,
+        .ucode_tracing = true,
+        .sensitivity_calib_by_driver = true,
+        .chain_noise_calib_by_driver = true,
+};
+
+struct il_cfg il4965_cfg = {
+        .name = "Intel(R) Wireless WiFi Link 4965AGN",
+        .fw_name_pre = IL4965_FW_PRE,
+        .ucode_api_max = IL4965_UCODE_API_MAX,
+        .ucode_api_min = IL4965_UCODE_API_MIN,
+        .sku = IL_SKU_A | IL_SKU_G | IL_SKU_N,
+        .valid_tx_ant = ANT_AB,
+        .valid_rx_ant = ANT_ABC,
+        .eeprom_ver = EEPROM_4965_EEPROM_VERSION,
+        .eeprom_calib_ver = EEPROM_4965_TX_POWER_VERSION,
+        .ops = &il4965_ops,
+        .mod_params = &il4965_mod_params,
+        .base_params = &il4965_base_params,
+        .led_mode = IL_LED_BLINK,
+        /*
+         * Force use of chains B and C for scan RX on 5 GHz band
+         * because the device has off-channel reception on chain A.
+         */
+        .scan_rx_antennas[IEEE80211_BAND_5GHZ] = ANT_BC,
+};
+
+/* Module firmware */
+MODULE_FIRMWARE(IL4965_MODULE_FIRMWARE(IL4965_UCODE_API_MAX));
diff --git a/drivers/net/wireless/iwlegacy/4965.h b/drivers/net/wireless/iwlegacy/4965.h
new file mode 100644
index 000000000000..74472314bc37
--- /dev/null
+++ b/drivers/net/wireless/iwlegacy/4965.h
@@ -0,0 +1,1309 @@
+/******************************************************************************
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2011 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:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+
+#ifndef __il_4965_h__
+#define __il_4965_h__
+
+struct il_rx_queue;
+struct il_rx_buf;
+struct il_rx_pkt;
+struct il_tx_queue;
+struct il_rxon_context;
+
+/* configuration for the _4965 devices */
+extern struct il_cfg il4965_cfg;
+
+extern struct il_mod_params il4965_mod_params;
+
+extern struct ieee80211_ops il4965_hw_ops;
+
+/* tx queue */
+void il4965_free_tfds_in_queue(struct il_priv *il, int sta_id, int tid,
+                               int freed);
+
+/* RXON */
+void il4965_set_rxon_chain(struct il_priv *il, struct il_rxon_context *ctx);
+
+/* uCode */
+int il4965_verify_ucode(struct il_priv *il);
+
+/* lib */
+void il4965_check_abort_status(struct il_priv *il, u8 frame_count, u32 status);
+
+void il4965_rx_queue_reset(struct il_priv *il, struct il_rx_queue *rxq);
+int il4965_rx_init(struct il_priv *il, struct il_rx_queue *rxq);
+int il4965_hw_nic_init(struct il_priv *il);
+int il4965_dump_fh(struct il_priv *il, char **buf, bool display);
+
+/* rx */
+void il4965_rx_queue_restock(struct il_priv *il);
+void il4965_rx_replenish(struct il_priv *il);
+void il4965_rx_replenish_now(struct il_priv *il);
+void il4965_rx_queue_free(struct il_priv *il, struct il_rx_queue *rxq);
+int il4965_rxq_stop(struct il_priv *il);
+int il4965_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band);
+void il4965_hdl_rx(struct il_priv *il, struct il_rx_buf *rxb);
+void il4965_hdl_rx_phy(struct il_priv *il, struct il_rx_buf *rxb);
+void il4965_rx_handle(struct il_priv *il);
+
+/* tx */
+void il4965_hw_txq_free_tfd(struct il_priv *il, struct il_tx_queue *txq);
+int il4965_hw_txq_attach_buf_to_tfd(struct il_priv *il, struct il_tx_queue *txq,
+                                    dma_addr_t addr, u16 len, u8 reset, u8 pad);
+int il4965_hw_tx_queue_init(struct il_priv *il, struct il_tx_queue *txq);
+void il4965_hwrate_to_tx_control(struct il_priv *il, u32 rate_n_flags,
+                                 struct ieee80211_tx_info *info);
+int il4965_tx_skb(struct il_priv *il, struct sk_buff *skb);
+int il4965_tx_agg_start(struct il_priv *il, struct ieee80211_vif *vif,
+                        struct ieee80211_sta *sta, u16 tid, u16 * ssn);
+int il4965_tx_agg_stop(struct il_priv *il, struct ieee80211_vif *vif,
+                       struct ieee80211_sta *sta, u16 tid);
+int il4965_txq_check_empty(struct il_priv *il, int sta_id, u8 tid, int txq_id);
+void il4965_hdl_compressed_ba(struct il_priv *il, struct il_rx_buf *rxb);
+int il4965_tx_queue_reclaim(struct il_priv *il, int txq_id, int idx);
+void il4965_hw_txq_ctx_free(struct il_priv *il);
+int il4965_txq_ctx_alloc(struct il_priv *il);
+void il4965_txq_ctx_reset(struct il_priv *il);
+void il4965_txq_ctx_stop(struct il_priv *il);
+void il4965_txq_set_sched(struct il_priv *il, u32 mask);
+
+/*
+ * Acquire il->lock before calling this function !
+ */
+void il4965_set_wr_ptrs(struct il_priv *il, int txq_id, u32 idx);
+/**
+ * il4965_tx_queue_set_status - (optionally) start Tx/Cmd queue
+ * @tx_fifo_id: Tx DMA/FIFO channel (range 0-7) that the queue will feed
+ * @scd_retry: (1) Indicates queue will be used in aggregation mode
+ *
+ * NOTE:  Acquire il->lock before calling this function !
+ */
+void il4965_tx_queue_set_status(struct il_priv *il, struct il_tx_queue *txq,
+                                int tx_fifo_id, int scd_retry);
+
+u8 il4965_toggle_tx_ant(struct il_priv *il, u8 ant_idx, u8 valid);
+
+/* rx */
+void il4965_hdl_missed_beacon(struct il_priv *il, struct il_rx_buf *rxb);
+bool il4965_good_plcp_health(struct il_priv *il, struct il_rx_pkt *pkt);
+void il4965_hdl_stats(struct il_priv *il, struct il_rx_buf *rxb);
+void il4965_hdl_c_stats(struct il_priv *il, struct il_rx_buf *rxb);
+
+/* scan */
+int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif);
+
+/* station mgmt */
+int il4965_manage_ibss_station(struct il_priv *il, struct ieee80211_vif *vif,
+                               bool add);
+
+/* hcmd */
+int il4965_send_beacon_cmd(struct il_priv *il);
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+const char *il4965_get_tx_fail_reason(u32 status);
+#else
+static inline const char *
+il4965_get_tx_fail_reason(u32 status)
+{
+        return "";
+}
+#endif
+
+/* station management */
+int il4965_alloc_bcast_station(struct il_priv *il, struct il_rxon_context *ctx);
+int il4965_add_bssid_station(struct il_priv *il, struct il_rxon_context *ctx,
+                             const u8 *addr, u8 *sta_id_r);
+int il4965_remove_default_wep_key(struct il_priv *il,
+                                  struct il_rxon_context *ctx,
+                                  struct ieee80211_key_conf *key);
+int il4965_set_default_wep_key(struct il_priv *il, struct il_rxon_context *ctx,
+                               struct ieee80211_key_conf *key);
+int il4965_restore_default_wep_keys(struct il_priv *il,
+                                    struct il_rxon_context *ctx);
+int il4965_set_dynamic_key(struct il_priv *il, struct il_rxon_context *ctx,
+                           struct ieee80211_key_conf *key, u8 sta_id);
+int il4965_remove_dynamic_key(struct il_priv *il, struct il_rxon_context *ctx,
+                              struct ieee80211_key_conf *key, u8 sta_id);
+void il4965_update_tkip_key(struct il_priv *il, struct il_rxon_context *ctx,
+                            struct ieee80211_key_conf *keyconf,
+                            struct ieee80211_sta *sta, u32 iv32,
+                            u16 *phase1key);
+int il4965_sta_tx_modify_enable_tid(struct il_priv *il, int sta_id, int tid);
+int il4965_sta_rx_agg_start(struct il_priv *il, struct ieee80211_sta *sta,
+                            int tid, u16 ssn);
+int il4965_sta_rx_agg_stop(struct il_priv *il, struct ieee80211_sta *sta,
+                           int tid);
+void il4965_sta_modify_sleep_tx_count(struct il_priv *il, int sta_id, int cnt);
+int il4965_update_bcast_stations(struct il_priv *il);
+
+/* rate */
+static inline u8
+il4965_hw_get_rate(__le32 rate_n_flags)
+{
+        return le32_to_cpu(rate_n_flags) & 0xFF;
+}
+
+static inline __le32
+il4965_hw_set_rate_n_flags(u8 rate, u32 flags)
+{
+        return cpu_to_le32(flags | (u32) rate);
+}
+
+/* eeprom */
+void il4965_eeprom_get_mac(const struct il_priv *il, u8 * mac);
+int il4965_eeprom_acquire_semaphore(struct il_priv *il);
+void il4965_eeprom_release_semaphore(struct il_priv *il);
+int il4965_eeprom_check_version(struct il_priv *il);
+
+/* mac80211 handlers (for 4965) */
+void il4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb);
+int il4965_mac_start(struct ieee80211_hw *hw);
+void il4965_mac_stop(struct ieee80211_hw *hw);
+void il4965_configure_filter(struct ieee80211_hw *hw,
+                             unsigned int changed_flags,
+                             unsigned int *total_flags, u64 multicast);
+int il4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+                       struct ieee80211_vif *vif, struct ieee80211_sta *sta,
+                       struct ieee80211_key_conf *key);
+void il4965_mac_update_tkip_key(struct ieee80211_hw *hw,
+                                struct ieee80211_vif *vif,
+                                struct ieee80211_key_conf *keyconf,
+                                struct ieee80211_sta *sta, u32 iv32,
+                                u16 *phase1key);
+int il4965_mac_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                            enum ieee80211_ampdu_mlme_action action,
+                            struct ieee80211_sta *sta, u16 tid, u16 * ssn,
+                            u8 buf_size);
+int il4965_mac_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                       struct ieee80211_sta *sta);
+void il4965_mac_channel_switch(struct ieee80211_hw *hw,
+                               struct ieee80211_channel_switch *ch_switch);
+
+void il4965_led_enable(struct il_priv *il);
+
+/* EEPROM */
+#define IL4965_EEPROM_IMG_SIZE                  1024
+
+/*
+ * uCode queue management definitions ...
+ * The first queue used for block-ack aggregation is #7 (4965 only).
+ * All block-ack aggregation queues should map to Tx DMA/FIFO channel 7.
+ */
+#define IL49_FIRST_AMPDU_QUEUE  7
+
+/* Sizes and addresses for instruction and data memory (SRAM) in
+ * 4965's embedded processor.  Driver access is via HBUS_TARG_MEM_* regs. */
+#define IL49_RTC_INST_LOWER_BOUND               (0x000000)
+#define IL49_RTC_INST_UPPER_BOUND               (0x018000)
+
+#define IL49_RTC_DATA_LOWER_BOUND               (0x800000)
+#define IL49_RTC_DATA_UPPER_BOUND               (0x80A000)
+
+#define IL49_RTC_INST_SIZE  (IL49_RTC_INST_UPPER_BOUND - \
+                                IL49_RTC_INST_LOWER_BOUND)
+#define IL49_RTC_DATA_SIZE  (IL49_RTC_DATA_UPPER_BOUND - \
+                                IL49_RTC_DATA_LOWER_BOUND)
+
+#define IL49_MAX_INST_SIZE IL49_RTC_INST_SIZE
+#define IL49_MAX_DATA_SIZE IL49_RTC_DATA_SIZE
+
+/* Size of uCode instruction memory in bootstrap state machine */
+#define IL49_MAX_BSM_SIZE BSM_SRAM_SIZE
+
+static inline int
+il4965_hw_valid_rtc_data_addr(u32 addr)
+{
+        return (addr >= IL49_RTC_DATA_LOWER_BOUND &&
+                addr < IL49_RTC_DATA_UPPER_BOUND);
+}
+
+/********************* START TEMPERATURE *************************************/
+
+/**
+ * 4965 temperature calculation.
+ *
+ * The driver must calculate the device temperature before calculating
+ * a txpower setting (amplifier gain is temperature dependent).  The
+ * calculation uses 4 measurements, 3 of which (R1, R2, R3) are calibration
+ * values used for the life of the driver, and one of which (R4) is the
+ * real-time temperature indicator.
+ *
+ * uCode provides all 4 values to the driver via the "initialize alive"
+ * notification (see struct il4965_init_alive_resp).  After the runtime uCode
+ * image loads, uCode updates the R4 value via stats notifications
+ * (see N_STATS), which occur after each received beacon
+ * when associated, or can be requested via C_STATS.
+ *
+ * NOTE:  uCode provides the R4 value as a 23-bit signed value.  Driver
+ *        must sign-extend to 32 bits before applying formula below.
+ *
+ * Formula:
+ *
+ * degrees Kelvin = ((97 * 259 * (R4 - R2) / (R3 - R1)) / 100) + 8
+ *
+ * NOTE:  The basic formula is 259 * (R4-R2) / (R3-R1).  The 97/100 is
+ * an additional correction, which should be centered around 0 degrees
+ * Celsius (273 degrees Kelvin).  The 8 (3 percent of 273) compensates for
+ * centering the 97/100 correction around 0 degrees K.
+ *
+ * Add 273 to Kelvin value to find degrees Celsius, for comparing current
+ * temperature with factory-measured temperatures when calculating txpower
+ * settings.
+ */
+#define TEMPERATURE_CALIB_KELVIN_OFFSET 8
+#define TEMPERATURE_CALIB_A_VAL 259
+
+/* Limit range of calculated temperature to be between these Kelvin values */
+#define IL_TX_POWER_TEMPERATURE_MIN  (263)
+#define IL_TX_POWER_TEMPERATURE_MAX  (410)
+
+#define IL_TX_POWER_TEMPERATURE_OUT_OF_RANGE(t) \
+        ((t) < IL_TX_POWER_TEMPERATURE_MIN || \
+         (t) > IL_TX_POWER_TEMPERATURE_MAX)
+
+/********************* END TEMPERATURE ***************************************/
+
+/********************* START TXPOWER *****************************************/
+
+/**
+ * 4965 txpower calculations rely on information from three sources:
+ *
+ *     1) EEPROM
+ *     2) "initialize" alive notification
+ *     3) stats notifications
+ *
+ * EEPROM data consists of:
+ *
+ * 1)  Regulatory information (max txpower and channel usage flags) is provided
+ *     separately for each channel that can possibly supported by 4965.
+ *     40 MHz wide (.11n HT40) channels are listed separately from 20 MHz
+ *     (legacy) channels.
+ *
+ *     See struct il4965_eeprom_channel for format, and struct il4965_eeprom
+ *     for locations in EEPROM.
+ *
+ * 2)  Factory txpower calibration information is provided separately for
+ *     sub-bands of contiguous channels.  2.4GHz has just one sub-band,
+ *     but 5 GHz has several sub-bands.
+ *
+ *     In addition, per-band (2.4 and 5 Ghz) saturation txpowers are provided.
+ *
+ *     See struct il4965_eeprom_calib_info (and the tree of structures
+ *     contained within it) for format, and struct il4965_eeprom for
+ *     locations in EEPROM.
+ *
+ * "Initialization alive" notification (see struct il4965_init_alive_resp)
+ * consists of:
+ *
+ * 1)  Temperature calculation parameters.
+ *
+ * 2)  Power supply voltage measurement.
+ *
+ * 3)  Tx gain compensation to balance 2 transmitters for MIMO use.
+ *
+ * Statistics notifications deliver:
+ *
+ * 1)  Current values for temperature param R4.
+ */
+
+/**
+ * To calculate a txpower setting for a given desired target txpower, channel,
+ * modulation bit rate, and transmitter chain (4965 has 2 transmitters to
+ * support MIMO and transmit diversity), driver must do the following:
+ *
+ * 1)  Compare desired txpower vs. (EEPROM) regulatory limit for this channel.
+ *     Do not exceed regulatory limit; reduce target txpower if necessary.
+ *
+ *     If setting up txpowers for MIMO rates (rate idxes 8-15, 24-31),
+ *     2 transmitters will be used simultaneously; driver must reduce the
+ *     regulatory limit by 3 dB (half-power) for each transmitter, so the
+ *     combined total output of the 2 transmitters is within regulatory limits.
+ *
+ *
+ * 2)  Compare target txpower vs. (EEPROM) saturation txpower *reduced by
+ *     backoff for this bit rate*.  Do not exceed (saturation - backoff[rate]);
+ *     reduce target txpower if necessary.
+ *
+ *     Backoff values below are in 1/2 dB units (equivalent to steps in
+ *     txpower gain tables):
+ *
+ *     OFDM 6 - 36 MBit:  10 steps (5 dB)
+ *     OFDM 48 MBit:      15 steps (7.5 dB)
+ *     OFDM 54 MBit:      17 steps (8.5 dB)
+ *     OFDM 60 MBit:      20 steps (10 dB)
+ *     CCK all rates:     10 steps (5 dB)
+ *
+ *     Backoff values apply to saturation txpower on a per-transmitter basis;
+ *     when using MIMO (2 transmitters), each transmitter uses the same
+ *     saturation level provided in EEPROM, and the same backoff values;
+ *     no reduction (such as with regulatory txpower limits) is required.
+ *
+ *     Saturation and Backoff values apply equally to 20 Mhz (legacy) channel
+ *     widths and 40 Mhz (.11n HT40) channel widths; there is no separate
+ *     factory measurement for ht40 channels.
+ *
+ *     The result of this step is the final target txpower.  The rest of
+ *     the steps figure out the proper settings for the device to achieve
+ *     that target txpower.
+ *
+ *
+ * 3)  Determine (EEPROM) calibration sub band for the target channel, by
+ *     comparing against first and last channels in each sub band
+ *     (see struct il4965_eeprom_calib_subband_info).
+ *
+ *
+ * 4)  Linearly interpolate (EEPROM) factory calibration measurement sets,
+ *     referencing the 2 factory-measured (sample) channels within the sub band.
+ *
+ *     Interpolation is based on difference between target channel's frequency
+ *     and the sample channels' frequencies.  Since channel numbers are based
+ *     on frequency (5 MHz between each channel number), this is equivalent
+ *     to interpolating based on channel number differences.
+ *
+ *     Note that the sample channels may or may not be the channels at the
+ *     edges of the sub band.  The target channel may be "outside" of the
+ *     span of the sampled channels.
+ *
+ *     Driver may choose the pair (for 2 Tx chains) of measurements (see
+ *     struct il4965_eeprom_calib_ch_info) for which the actual measured
+ *     txpower comes closest to the desired txpower.  Usually, though,
+ *     the middle set of measurements is closest to the regulatory limits,
+ *     and is therefore a good choice for all txpower calculations (this
+ *     assumes that high accuracy is needed for maximizing legal txpower,
+ *     while lower txpower configurations do not need as much accuracy).
+ *
+ *     Driver should interpolate both members of the chosen measurement pair,
+ *     i.e. for both Tx chains (radio transmitters), unless the driver knows
+ *     that only one of the chains will be used (e.g. only one tx antenna
+ *     connected, but this should be unusual).  The rate scaling algorithm
+ *     switches antennas to find best performance, so both Tx chains will
+ *     be used (although only one at a time) even for non-MIMO transmissions.
+ *
+ *     Driver should interpolate factory values for temperature, gain table
+ *     idx, and actual power.  The power amplifier detector values are
+ *     not used by the driver.
+ *
+ *     Sanity check:  If the target channel happens to be one of the sample
+ *     channels, the results should agree with the sample channel's
+ *     measurements!
+ *
+ *
+ * 5)  Find difference between desired txpower and (interpolated)
+ *     factory-measured txpower.  Using (interpolated) factory gain table idx
+ *     (shown elsewhere) as a starting point, adjust this idx lower to
+ *     increase txpower, or higher to decrease txpower, until the target
+ *     txpower is reached.  Each step in the gain table is 1/2 dB.
+ *
+ *     For example, if factory measured txpower is 16 dBm, and target txpower
+ *     is 13 dBm, add 6 steps to the factory gain idx to reduce txpower
+ *     by 3 dB.
+ *
+ *
+ * 6)  Find difference between current device temperature and (interpolated)
+ *     factory-measured temperature for sub-band.  Factory values are in
+ *     degrees Celsius.  To calculate current temperature, see comments for
+ *     "4965 temperature calculation".
+ *
+ *     If current temperature is higher than factory temperature, driver must
+ *     increase gain (lower gain table idx), and vice verse.
+ *
+ *     Temperature affects gain differently for different channels:
+ *
+ *     2.4 GHz all channels:  3.5 degrees per half-dB step
+ *     5 GHz channels 34-43:  4.5 degrees per half-dB step
+ *     5 GHz channels >= 44:  4.0 degrees per half-dB step
+ *
+ *     NOTE:  Temperature can increase rapidly when transmitting, especially
+ *            with heavy traffic at high txpowers.  Driver should update
+ *            temperature calculations often under these conditions to
+ *            maintain strong txpower in the face of rising temperature.
+ *
+ *
+ * 7)  Find difference between current power supply voltage indicator
+ *     (from "initialize alive") and factory-measured power supply voltage
+ *     indicator (EEPROM).
+ *
+ *     If the current voltage is higher (indicator is lower) than factory
+ *     voltage, gain should be reduced (gain table idx increased) by:
+ *
+ *     (eeprom - current) / 7
+ *
+ *     If the current voltage is lower (indicator is higher) than factory
+ *     voltage, gain should be increased (gain table idx decreased) by:
+ *
+ *     2 * (current - eeprom) / 7
+ *
+ *     If number of idx steps in either direction turns out to be > 2,
+ *     something is wrong ... just use 0.
+ *
+ *     NOTE:  Voltage compensation is independent of band/channel.
+ *
+ *     NOTE:  "Initialize" uCode measures current voltage, which is assumed
+ *            to be constant after this initial measurement.  Voltage
+ *            compensation for txpower (number of steps in gain table)
+ *            may be calculated once and used until the next uCode bootload.
+ *
+ *
+ * 8)  If setting up txpowers for MIMO rates (rate idxes 8-15, 24-31),
+ *     adjust txpower for each transmitter chain, so txpower is balanced
+ *     between the two chains.  There are 5 pairs of tx_atten[group][chain]
+ *     values in "initialize alive", one pair for each of 5 channel ranges:
+ *
+ *     Group 0:  5 GHz channel 34-43
+ *     Group 1:  5 GHz channel 44-70
+ *     Group 2:  5 GHz channel 71-124
+ *     Group 3:  5 GHz channel 125-200
+ *     Group 4:  2.4 GHz all channels
+ *
+ *     Add the tx_atten[group][chain] value to the idx for the target chain.
+ *     The values are signed, but are in pairs of 0 and a non-negative number,
+ *     so as to reduce gain (if necessary) of the "hotter" channel.  This
+ *     avoids any need to double-check for regulatory compliance after
+ *     this step.
+ *
+ *
+ * 9)  If setting up for a CCK rate, lower the gain by adding a CCK compensation
+ *     value to the idx:
+ *
+ *     Hardware rev B:  9 steps (4.5 dB)
+ *     Hardware rev C:  5 steps (2.5 dB)
+ *
+ *     Hardware rev for 4965 can be determined by reading CSR_HW_REV_WA_REG,
+ *     bits [3:2], 1 = B, 2 = C.
+ *
+ *     NOTE:  This compensation is in addition to any saturation backoff that
+ *            might have been applied in an earlier step.
+ *
+ *
+ * 10) Select the gain table, based on band (2.4 vs 5 GHz).
+ *
+ *     Limit the adjusted idx to stay within the table!
+ *
+ *
+ * 11) Read gain table entries for DSP and radio gain, place into appropriate
+ *     location(s) in command (struct il4965_txpowertable_cmd).
+ */
+
+/**
+ * When MIMO is used (2 transmitters operating simultaneously), driver should
+ * limit each transmitter to deliver a max of 3 dB below the regulatory limit
+ * for the device.  That is, use half power for each transmitter, so total
+ * txpower is within regulatory limits.
+ *
+ * The value "6" represents number of steps in gain table to reduce power 3 dB.
+ * Each step is 1/2 dB.
+ */
+#define IL_TX_POWER_MIMO_REGULATORY_COMPENSATION (6)
+
+/**
+ * CCK gain compensation.
+ *
+ * When calculating txpowers for CCK, after making sure that the target power
+ * is within regulatory and saturation limits, driver must additionally
+ * back off gain by adding these values to the gain table idx.
+ *
+ * Hardware rev for 4965 can be determined by reading CSR_HW_REV_WA_REG,
+ * bits [3:2], 1 = B, 2 = C.
+ */
+#define IL_TX_POWER_CCK_COMPENSATION_B_STEP (9)
+#define IL_TX_POWER_CCK_COMPENSATION_C_STEP (5)
+
+/*
+ * 4965 power supply voltage compensation for txpower
+ */
+#define TX_POWER_IL_VOLTAGE_CODES_PER_03V   (7)
+
+/**
+ * Gain tables.
+ *
+ * The following tables contain pair of values for setting txpower, i.e.
+ * gain settings for the output of the device's digital signal processor (DSP),
+ * and for the analog gain structure of the transmitter.
+ *
+ * Each entry in the gain tables represents a step of 1/2 dB.  Note that these
+ * are *relative* steps, not indications of absolute output power.  Output
+ * power varies with temperature, voltage, and channel frequency, and also
+ * requires consideration of average power (to satisfy regulatory constraints),
+ * and peak power (to avoid distortion of the output signal).
+ *
+ * Each entry contains two values:
+ * 1)  DSP gain (or sometimes called DSP attenuation).  This is a fine-grained
+ *     linear value that multiplies the output of the digital signal processor,
+ *     before being sent to the analog radio.
+ * 2)  Radio gain.  This sets the analog gain of the radio Tx path.
+ *     It is a coarser setting, and behaves in a logarithmic (dB) fashion.
+ *
+ * EEPROM contains factory calibration data for txpower.  This maps actual
+ * measured txpower levels to gain settings in the "well known" tables
+ * below ("well-known" means here that both factory calibration *and* the
+ * driver work with the same table).
+ *
+ * There are separate tables for 2.4 GHz and 5 GHz bands.  The 5 GHz table
+ * has an extension (into negative idxes), in case the driver needs to
+ * boost power setting for high device temperatures (higher than would be
+ * present during factory calibration).  A 5 Ghz EEPROM idx of "40"
+ * corresponds to the 49th entry in the table used by the driver.
+ */
+#define MIN_TX_GAIN_IDX         (0)     /* highest gain, lowest idx, 2.4 */
+#define MIN_TX_GAIN_IDX_52GHZ_EXT       (-9)    /* highest gain, lowest idx, 5 */
+
+/**
+ * 2.4 GHz gain table
+ *
+ * Index    Dsp gain   Radio gain
+ *   0        110         0x3f      (highest gain)
+ *   1        104         0x3f
+ *   2         98         0x3f
+ *   3        110         0x3e
+ *   4        104         0x3e
+ *   5         98         0x3e
+ *   6        110         0x3d
+ *   7        104         0x3d
+ *   8         98         0x3d
+ *   9        110         0x3c
+ *  10        104         0x3c
+ *  11         98         0x3c
+ *  12        110         0x3b
+ *  13        104         0x3b
+ *  14         98         0x3b
+ *  15        110         0x3a
+ *  16        104         0x3a
+ *  17         98         0x3a
+ *  18        110         0x39
+ *  19        104         0x39
+ *  20         98         0x39
+ *  21        110         0x38
+ *  22        104         0x38
+ *  23         98         0x38
+ *  24        110         0x37
+ *  25        104         0x37
+ *  26         98         0x37
+ *  27        110         0x36
+ *  28        104         0x36
+ *  29         98         0x36
+ *  30        110         0x35
+ *  31        104         0x35
+ *  32         98         0x35
+ *  33        110         0x34
+ *  34        104         0x34
+ *  35         98         0x34
+ *  36        110         0x33
+ *  37        104         0x33
+ *  38         98         0x33
+ *  39        110         0x32
+ *  40        104         0x32
+ *  41         98         0x32
+ *  42        110         0x31
+ *  43        104         0x31
+ *  44         98         0x31
+ *  45        110         0x30
+ *  46        104         0x30
+ *  47         98         0x30
+ *  48        110          0x6
+ *  49        104          0x6
+ *  50         98          0x6
+ *  51        110          0x5
+ *  52        104          0x5
+ *  53         98          0x5
+ *  54        110          0x4
+ *  55        104          0x4
+ *  56         98          0x4
+ *  57        110          0x3
+ *  58        104          0x3
+ *  59         98          0x3
+ *  60        110          0x2
+ *  61        104          0x2
+ *  62         98          0x2
+ *  63        110          0x1
+ *  64        104          0x1
+ *  65         98          0x1
+ *  66        110          0x0
+ *  67        104          0x0
+ *  68         98          0x0
+ *  69         97            0
+ *  70         96            0
+ *  71         95            0
+ *  72         94            0
+ *  73         93            0
+ *  74         92            0
+ *  75         91            0
+ *  76         90            0
+ *  77         89            0
+ *  78         88            0
+ *  79         87            0
+ *  80         86            0
+ *  81         85            0
+ *  82         84            0
+ *  83         83            0
+ *  84         82            0
+ *  85         81            0
+ *  86         80            0
+ *  87         79            0
+ *  88         78            0
+ *  89         77            0
+ *  90         76            0
+ *  91         75            0
+ *  92         74            0
+ *  93         73            0
+ *  94         72            0
+ *  95         71            0
+ *  96         70            0
+ *  97         69            0
+ *  98         68            0
+ */
+
+/**
+ * 5 GHz gain table
+ *
+ * Index    Dsp gain   Radio gain
+ *  -9        123         0x3F      (highest gain)
+ *  -8        117         0x3F
+ *  -7        110         0x3F
+ *  -6        104         0x3F
+ *  -5         98         0x3F
+ *  -4        110         0x3E
+ *  -3        104         0x3E
+ *  -2         98         0x3E
+ *  -1        110         0x3D
+ *   0        104         0x3D
+ *   1         98         0x3D
+ *   2        110         0x3C
+ *   3        104         0x3C
+ *   4         98         0x3C
+ *   5        110         0x3B
+ *   6        104         0x3B
+ *   7         98         0x3B
+ *   8        110         0x3A
+ *   9        104         0x3A
+ *  10         98         0x3A
+ *  11        110         0x39
+ *  12        104         0x39
+ *  13         98         0x39
+ *  14        110         0x38
+ *  15        104         0x38
+ *  16         98         0x38
+ *  17        110         0x37
+ *  18        104         0x37
+ *  19         98         0x37
+ *  20        110         0x36
+ *  21        104         0x36
+ *  22         98         0x36
+ *  23        110         0x35
+ *  24        104         0x35
+ *  25         98         0x35
+ *  26        110         0x34
+ *  27        104         0x34
+ *  28         98         0x34
+ *  29        110         0x33
+ *  30        104         0x33
+ *  31         98         0x33
+ *  32        110         0x32
+ *  33        104         0x32
+ *  34         98         0x32
+ *  35        110         0x31
+ *  36        104         0x31
+ *  37         98         0x31
+ *  38        110         0x30
+ *  39        104         0x30
+ *  40         98         0x30
+ *  41        110         0x25
+ *  42        104         0x25
+ *  43         98         0x25
+ *  44        110         0x24
+ *  45        104         0x24
+ *  46         98         0x24
+ *  47        110         0x23
+ *  48        104         0x23
+ *  49         98         0x23
+ *  50        110         0x22
+ *  51        104         0x18
+ *  52         98         0x18
+ *  53        110         0x17
+ *  54        104         0x17
+ *  55         98         0x17
+ *  56        110         0x16
+ *  57        104         0x16
+ *  58         98         0x16
+ *  59        110         0x15
+ *  60        104         0x15
+ *  61         98         0x15
+ *  62        110         0x14
+ *  63        104         0x14
+ *  64         98         0x14
+ *  65        110         0x13
+ *  66        104         0x13
+ *  67         98         0x13
+ *  68        110         0x12
+ *  69        104         0x08
+ *  70         98         0x08
+ *  71        110         0x07
+ *  72        104         0x07
+ *  73         98         0x07
+ *  74        110         0x06
+ *  75        104         0x06
+ *  76         98         0x06
+ *  77        110         0x05
+ *  78        104         0x05
+ *  79         98         0x05
+ *  80        110         0x04
+ *  81        104         0x04
+ *  82         98         0x04
+ *  83        110         0x03
+ *  84        104         0x03
+ *  85         98         0x03
+ *  86        110         0x02
+ *  87        104         0x02
+ *  88         98         0x02
+ *  89        110         0x01
+ *  90        104         0x01
+ *  91         98         0x01
+ *  92        110         0x00
+ *  93        104         0x00
+ *  94         98         0x00
+ *  95         93         0x00
+ *  96         88         0x00
+ *  97         83         0x00
+ *  98         78         0x00
+ */
+
+/**
+ * Sanity checks and default values for EEPROM regulatory levels.
+ * If EEPROM values fall outside MIN/MAX range, use default values.
+ *
+ * Regulatory limits refer to the maximum average txpower allowed by
+ * regulatory agencies in the geographies in which the device is meant
+ * to be operated.  These limits are SKU-specific (i.e. geography-specific),
+ * and channel-specific; each channel has an individual regulatory limit
+ * listed in the EEPROM.
+ *
+ * Units are in half-dBm (i.e. "34" means 17 dBm).
+ */
+#define IL_TX_POWER_DEFAULT_REGULATORY_24   (34)
+#define IL_TX_POWER_DEFAULT_REGULATORY_52   (34)
+#define IL_TX_POWER_REGULATORY_MIN          (0)
+#define IL_TX_POWER_REGULATORY_MAX          (34)
+
+/**
+ * Sanity checks and default values for EEPROM saturation levels.
+ * If EEPROM values fall outside MIN/MAX range, use default values.
+ *
+ * Saturation is the highest level that the output power amplifier can produce
+ * without significant clipping distortion.  This is a "peak" power level.
+ * Different types of modulation (i.e. various "rates", and OFDM vs. CCK)
+ * require differing amounts of backoff, relative to their average power output,
+ * in order to avoid clipping distortion.
+ *
+ * Driver must make sure that it is violating neither the saturation limit,
+ * nor the regulatory limit, when calculating Tx power settings for various
+ * rates.
+ *
+ * Units are in half-dBm (i.e. "38" means 19 dBm).
+ */
+#define IL_TX_POWER_DEFAULT_SATURATION_24   (38)
+#define IL_TX_POWER_DEFAULT_SATURATION_52   (38)
+#define IL_TX_POWER_SATURATION_MIN          (20)
+#define IL_TX_POWER_SATURATION_MAX          (50)
+
+/**
+ * Channel groups used for Tx Attenuation calibration (MIMO tx channel balance)
+ * and thermal Txpower calibration.
+ *
+ * When calculating txpower, driver must compensate for current device
+ * temperature; higher temperature requires higher gain.  Driver must calculate
+ * current temperature (see "4965 temperature calculation"), then compare vs.
+ * factory calibration temperature in EEPROM; if current temperature is higher
+ * than factory temperature, driver must *increase* gain by proportions shown
+ * in table below.  If current temperature is lower than factory, driver must
+ * *decrease* gain.
+ *
+ * Different frequency ranges require different compensation, as shown below.
+ */
+/* Group 0, 5.2 GHz ch 34-43:  4.5 degrees per 1/2 dB. */
+#define CALIB_IL_TX_ATTEN_GR1_FCH 34
+#define CALIB_IL_TX_ATTEN_GR1_LCH 43
+
+/* Group 1, 5.3 GHz ch 44-70:  4.0 degrees per 1/2 dB. */
+#define CALIB_IL_TX_ATTEN_GR2_FCH 44
+#define CALIB_IL_TX_ATTEN_GR2_LCH 70
+
+/* Group 2, 5.5 GHz ch 71-124:  4.0 degrees per 1/2 dB. */
+#define CALIB_IL_TX_ATTEN_GR3_FCH 71
+#define CALIB_IL_TX_ATTEN_GR3_LCH 124
+
+/* Group 3, 5.7 GHz ch 125-200:  4.0 degrees per 1/2 dB. */
+#define CALIB_IL_TX_ATTEN_GR4_FCH 125
+#define CALIB_IL_TX_ATTEN_GR4_LCH 200
+
+/* Group 4, 2.4 GHz all channels:  3.5 degrees per 1/2 dB. */
+#define CALIB_IL_TX_ATTEN_GR5_FCH 1
+#define CALIB_IL_TX_ATTEN_GR5_LCH 20
+
+enum {
+        CALIB_CH_GROUP_1 = 0,
+        CALIB_CH_GROUP_2 = 1,
+        CALIB_CH_GROUP_3 = 2,
+        CALIB_CH_GROUP_4 = 3,
+        CALIB_CH_GROUP_5 = 4,
+        CALIB_CH_GROUP_MAX
+};
+
+/********************* END TXPOWER *****************************************/
+
+/**
+ * Tx/Rx Queues
+ *
+ * Most communication between driver and 4965 is via queues of data buffers.
+ * For example, all commands that the driver issues to device's embedded
+ * controller (uCode) are via the command queue (one of the Tx queues).  All
+ * uCode command responses/replies/notifications, including Rx frames, are
+ * conveyed from uCode to driver via the Rx queue.
+ *
+ * Most support for these queues, including handshake support, resides in
+ * structures in host DRAM, shared between the driver and the device.  When
+ * allocating this memory, the driver must make sure that data written by
+ * the host CPU updates DRAM immediately (and does not get "stuck" in CPU's
+ * cache memory), so DRAM and cache are consistent, and the device can
+ * immediately see changes made by the driver.
+ *
+ * 4965 supports up to 16 DRAM-based Tx queues, and services these queues via
+ * up to 7 DMA channels (FIFOs).  Each Tx queue is supported by a circular array
+ * in DRAM containing 256 Transmit Frame Descriptors (TFDs).
+ */
+#define IL49_NUM_FIFOS  7
+#define IL49_CMD_FIFO_NUM       4
+#define IL49_NUM_QUEUES 16
+#define IL49_NUM_AMPDU_QUEUES   8
+
+/**
+ * struct il4965_schedq_bc_tbl
+ *
+ * Byte Count table
+ *
+ * Each Tx queue uses a byte-count table containing 320 entries:
+ * one 16-bit entry for each of 256 TFDs, plus an additional 64 entries that
+ * duplicate the first 64 entries (to avoid wrap-around within a Tx win;
+ * max Tx win is 64 TFDs).
+ *
+ * When driver sets up a new TFD, it must also enter the total byte count
+ * of the frame to be transmitted into the corresponding entry in the byte
+ * count table for the chosen Tx queue.  If the TFD idx is 0-63, the driver
+ * must duplicate the byte count entry in corresponding idx 256-319.
+ *
+ * padding puts each byte count table on a 1024-byte boundary;
+ * 4965 assumes tables are separated by 1024 bytes.
+ */
+struct il4965_scd_bc_tbl {
+        __le16 tfd_offset[TFD_QUEUE_BC_SIZE];
+        u8 pad[1024 - (TFD_QUEUE_BC_SIZE) * sizeof(__le16)];
+} __packed;
+
+#define IL4965_RTC_INST_LOWER_BOUND             (0x000000)
+
+/* RSSI to dBm */
+#define IL4965_RSSI_OFFSET      44
+
+/* PCI registers */
+#define PCI_CFG_RETRY_TIMEOUT   0x041
+
+/* PCI register values */
+#define PCI_CFG_LINK_CTRL_VAL_L0S_EN    0x01
+#define PCI_CFG_LINK_CTRL_VAL_L1_EN     0x02
+
+#define IL4965_DEFAULT_TX_RETRY  15
+
+/* EEPROM */
+#define IL4965_FIRST_AMPDU_QUEUE        10
+
+/* Calibration */
+void il4965_chain_noise_calibration(struct il_priv *il, void *stat_resp);
+void il4965_sensitivity_calibration(struct il_priv *il, void *resp);
+void il4965_init_sensitivity(struct il_priv *il);
+void il4965_reset_run_time_calib(struct il_priv *il);
+void il4965_calib_free_results(struct il_priv *il);
+
+/* Debug */
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+ssize_t il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
+                                   size_t count, loff_t *ppos);
+ssize_t il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,
+                                   size_t count, loff_t *ppos);
+ssize_t il4965_ucode_general_stats_read(struct file *file,
+                                        char __user *user_buf, size_t count,
+                                        loff_t *ppos);
+#endif
+
+/****************************/
+/* Flow Handler Definitions */
+/****************************/
+
+/**
+ * This I/O area is directly read/writable by driver (e.g. Linux uses writel())
+ * Addresses are offsets from device's PCI hardware base address.
+ */
+#define FH49_MEM_LOWER_BOUND                   (0x1000)
+#define FH49_MEM_UPPER_BOUND                   (0x2000)
+
+/**
+ * Keep-Warm (KW) buffer base address.
+ *
+ * Driver must allocate a 4KByte buffer that is used by 4965 for keeping the
+ * host DRAM powered on (via dummy accesses to DRAM) to maintain low-latency
+ * DRAM access when 4965 is Txing or Rxing.  The dummy accesses prevent host
+ * from going into a power-savings mode that would cause higher DRAM latency,
+ * and possible data over/under-runs, before all Tx/Rx is complete.
+ *
+ * Driver loads FH49_KW_MEM_ADDR_REG with the physical address (bits 35:4)
+ * of the buffer, which must be 4K aligned.  Once this is set up, the 4965
+ * automatically invokes keep-warm accesses when normal accesses might not
+ * be sufficient to maintain fast DRAM response.
+ *
+ * Bit fields:
+ *  31-0:  Keep-warm buffer physical base address [35:4], must be 4K aligned
+ */
+#define FH49_KW_MEM_ADDR_REG                 (FH49_MEM_LOWER_BOUND + 0x97C)
+
+/**
+ * TFD Circular Buffers Base (CBBC) addresses
+ *
+ * 4965 has 16 base pointer registers, one for each of 16 host-DRAM-resident
+ * circular buffers (CBs/queues) containing Transmit Frame Descriptors (TFDs)
+ * (see struct il_tfd_frame).  These 16 pointer registers are offset by 0x04
+ * bytes from one another.  Each TFD circular buffer in DRAM must be 256-byte
+ * aligned (address bits 0-7 must be 0).
+ *
+ * Bit fields in each pointer register:
+ *  27-0: TFD CB physical base address [35:8], must be 256-byte aligned
+ */
+#define FH49_MEM_CBBC_LOWER_BOUND          (FH49_MEM_LOWER_BOUND + 0x9D0)
+#define FH49_MEM_CBBC_UPPER_BOUND          (FH49_MEM_LOWER_BOUND + 0xA10)
+
+/* Find TFD CB base pointer for given queue (range 0-15). */
+#define FH49_MEM_CBBC_QUEUE(x)  (FH49_MEM_CBBC_LOWER_BOUND + (x) * 0x4)
+
+/**
+ * Rx SRAM Control and Status Registers (RSCSR)
+ *
+ * These registers provide handshake between driver and 4965 for the Rx queue
+ * (this queue handles *all* command responses, notifications, Rx data, etc.
+ * sent from 4965 uCode to host driver).  Unlike Tx, there is only one Rx
+ * queue, and only one Rx DMA/FIFO channel.  Also unlike Tx, which can
+ * concatenate up to 20 DRAM buffers to form a Tx frame, each Receive Buffer
+ * Descriptor (RBD) points to only one Rx Buffer (RB); there is a 1:1
+ * mapping between RBDs and RBs.
+ *
+ * Driver must allocate host DRAM memory for the following, and set the
+ * physical address of each into 4965 registers:
+ *
+ * 1)  Receive Buffer Descriptor (RBD) circular buffer (CB), typically with 256
+ *     entries (although any power of 2, up to 4096, is selectable by driver).
+ *     Each entry (1 dword) points to a receive buffer (RB) of consistent size
+ *     (typically 4K, although 8K or 16K are also selectable by driver).
+ *     Driver sets up RB size and number of RBDs in the CB via Rx config
+ *     register FH49_MEM_RCSR_CHNL0_CONFIG_REG.
+ *
+ *     Bit fields within one RBD:
+ *     27-0:  Receive Buffer physical address bits [35:8], 256-byte aligned
+ *
+ *     Driver sets physical address [35:8] of base of RBD circular buffer
+ *     into FH49_RSCSR_CHNL0_RBDCB_BASE_REG [27:0].
+ *
+ * 2)  Rx status buffer, 8 bytes, in which 4965 indicates which Rx Buffers
+ *     (RBs) have been filled, via a "write pointer", actually the idx of
+ *     the RB's corresponding RBD within the circular buffer.  Driver sets
+ *     physical address [35:4] into FH49_RSCSR_CHNL0_STTS_WPTR_REG [31:0].
+ *
+ *     Bit fields in lower dword of Rx status buffer (upper dword not used
+ *     by driver; see struct il4965_shared, val0):
+ *     31-12:  Not used by driver
+ *     11- 0:  Index of last filled Rx buffer descriptor
+ *             (4965 writes, driver reads this value)
+ *
+ * As the driver prepares Receive Buffers (RBs) for 4965 to fill, driver must
+ * enter pointers to these RBs into contiguous RBD circular buffer entries,
+ * and update the 4965's "write" idx register,
+ * FH49_RSCSR_CHNL0_RBDCB_WPTR_REG.
+ *
+ * This "write" idx corresponds to the *next* RBD that the driver will make
+ * available, i.e. one RBD past the tail of the ready-to-fill RBDs within
+ * the circular buffer.  This value should initially be 0 (before preparing any
+ * RBs), should be 8 after preparing the first 8 RBs (for example), and must
+ * wrap back to 0 at the end of the circular buffer (but don't wrap before
+ * "read" idx has advanced past 1!  See below).
+ * NOTE:  4965 EXPECTS THE WRITE IDX TO BE INCREMENTED IN MULTIPLES OF 8.
+ *
+ * As the 4965 fills RBs (referenced from contiguous RBDs within the circular
+ * buffer), it updates the Rx status buffer in host DRAM, 2) described above,
+ * to tell the driver the idx of the latest filled RBD.  The driver must
+ * read this "read" idx from DRAM after receiving an Rx interrupt from 4965.
+ *
+ * The driver must also internally keep track of a third idx, which is the
+ * next RBD to process.  When receiving an Rx interrupt, driver should process
+ * all filled but unprocessed RBs up to, but not including, the RB
+ * corresponding to the "read" idx.  For example, if "read" idx becomes "1",
+ * driver may process the RB pointed to by RBD 0.  Depending on volume of
+ * traffic, there may be many RBs to process.
+ *
+ * If read idx == write idx, 4965 thinks there is no room to put new data.
+ * Due to this, the maximum number of filled RBs is 255, instead of 256.  To
+ * be safe, make sure that there is a gap of at least 2 RBDs between "write"
+ * and "read" idxes; that is, make sure that there are no more than 254
+ * buffers waiting to be filled.
+ */
+#define FH49_MEM_RSCSR_LOWER_BOUND      (FH49_MEM_LOWER_BOUND + 0xBC0)
+#define FH49_MEM_RSCSR_UPPER_BOUND      (FH49_MEM_LOWER_BOUND + 0xC00)
+#define FH49_MEM_RSCSR_CHNL0            (FH49_MEM_RSCSR_LOWER_BOUND)
+
+/**
+ * Physical base address of 8-byte Rx Status buffer.
+ * Bit fields:
+ *  31-0: Rx status buffer physical base address [35:4], must 16-byte aligned.
+ */
+#define FH49_RSCSR_CHNL0_STTS_WPTR_REG  (FH49_MEM_RSCSR_CHNL0)
+
+/**
+ * Physical base address of Rx Buffer Descriptor Circular Buffer.
+ * Bit fields:
+ *  27-0:  RBD CD physical base address [35:8], must be 256-byte aligned.
+ */
+#define FH49_RSCSR_CHNL0_RBDCB_BASE_REG (FH49_MEM_RSCSR_CHNL0 + 0x004)
+
+/**
+ * Rx write pointer (idx, really!).
+ * Bit fields:
+ *  11-0:  Index of driver's most recent prepared-to-be-filled RBD, + 1.
+ *         NOTE:  For 256-entry circular buffer, use only bits [7:0].
+ */
+#define FH49_RSCSR_CHNL0_RBDCB_WPTR_REG (FH49_MEM_RSCSR_CHNL0 + 0x008)
+#define FH49_RSCSR_CHNL0_WPTR        (FH49_RSCSR_CHNL0_RBDCB_WPTR_REG)
+
+/**
+ * Rx Config/Status Registers (RCSR)
+ * Rx Config Reg for channel 0 (only channel used)
+ *
+ * Driver must initialize FH49_MEM_RCSR_CHNL0_CONFIG_REG as follows for
+ * normal operation (see bit fields).
+ *
+ * Clearing FH49_MEM_RCSR_CHNL0_CONFIG_REG to 0 turns off Rx DMA.
+ * Driver should poll FH49_MEM_RSSR_RX_STATUS_REG       for
+ * FH49_RSSR_CHNL0_RX_STATUS_CHNL_IDLE (bit 24) before continuing.
+ *
+ * Bit fields:
+ * 31-30: Rx DMA channel enable: '00' off/pause, '01' pause at end of frame,
+ *        '10' operate normally
+ * 29-24: reserved
+ * 23-20: # RBDs in circular buffer = 2^value; use "8" for 256 RBDs (normal),
+ *        min "5" for 32 RBDs, max "12" for 4096 RBDs.
+ * 19-18: reserved
+ * 17-16: size of each receive buffer; '00' 4K (normal), '01' 8K,
+ *        '10' 12K, '11' 16K.
+ * 15-14: reserved
+ * 13-12: IRQ destination; '00' none, '01' host driver (normal operation)
+ * 11- 4: timeout for closing Rx buffer and interrupting host (units 32 usec)
+ *        typical value 0x10 (about 1/2 msec)
+ *  3- 0: reserved
+ */
+#define FH49_MEM_RCSR_LOWER_BOUND      (FH49_MEM_LOWER_BOUND + 0xC00)
+#define FH49_MEM_RCSR_UPPER_BOUND      (FH49_MEM_LOWER_BOUND + 0xCC0)
+#define FH49_MEM_RCSR_CHNL0            (FH49_MEM_RCSR_LOWER_BOUND)
+
+#define FH49_MEM_RCSR_CHNL0_CONFIG_REG  (FH49_MEM_RCSR_CHNL0)
+
+#define FH49_RCSR_CHNL0_RX_CONFIG_RB_TIMEOUT_MSK (0x00000FF0)   /* bits 4-11 */
+#define FH49_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_MSK   (0x00001000)   /* bits 12 */
+#define FH49_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME_MSK (0x00008000) /* bit 15 */
+#define FH49_RCSR_CHNL0_RX_CONFIG_RB_SIZE_MSK   (0x00030000)    /* bits 16-17 */
+#define FH49_RCSR_CHNL0_RX_CONFIG_RBDBC_SIZE_MSK (0x00F00000)   /* bits 20-23 */
+#define FH49_RCSR_CHNL0_RX_CONFIG_DMA_CHNL_EN_MSK (0xC0000000)  /* bits 30-31 */
+
+#define FH49_RCSR_RX_CONFIG_RBDCB_SIZE_POS      (20)
+#define FH49_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS    (4)
+#define RX_RB_TIMEOUT   (0x10)
+
+#define FH49_RCSR_RX_CONFIG_CHNL_EN_PAUSE_VAL         (0x00000000)
+#define FH49_RCSR_RX_CONFIG_CHNL_EN_PAUSE_EOF_VAL     (0x40000000)
+#define FH49_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL        (0x80000000)
+
+#define FH49_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K    (0x00000000)
+#define FH49_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_8K    (0x00010000)
+#define FH49_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_12K   (0x00020000)
+#define FH49_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_16K   (0x00030000)
+
+#define FH49_RCSR_CHNL0_RX_IGNORE_RXF_EMPTY              (0x00000004)
+#define FH49_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_NO_INT_VAL    (0x00000000)
+#define FH49_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL  (0x00001000)
+
+/**
+ * Rx Shared Status Registers (RSSR)
+ *
+ * After stopping Rx DMA channel (writing 0 to
+ * FH49_MEM_RCSR_CHNL0_CONFIG_REG), driver must poll
+ * FH49_MEM_RSSR_RX_STATUS_REG until Rx channel is idle.
+ *
+ * Bit fields:
+ *  24:  1 = Channel 0 is idle
+ *
+ * FH49_MEM_RSSR_SHARED_CTRL_REG and FH49_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV
+ * contain default values that should not be altered by the driver.
+ */
+#define FH49_MEM_RSSR_LOWER_BOUND           (FH49_MEM_LOWER_BOUND + 0xC40)
+#define FH49_MEM_RSSR_UPPER_BOUND           (FH49_MEM_LOWER_BOUND + 0xD00)
+
+#define FH49_MEM_RSSR_SHARED_CTRL_REG       (FH49_MEM_RSSR_LOWER_BOUND)
+#define FH49_MEM_RSSR_RX_STATUS_REG     (FH49_MEM_RSSR_LOWER_BOUND + 0x004)
+#define FH49_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV\
+                                        (FH49_MEM_RSSR_LOWER_BOUND + 0x008)
+
+#define FH49_RSSR_CHNL0_RX_STATUS_CHNL_IDLE     (0x01000000)
+
+#define FH49_MEM_TFDIB_REG1_ADDR_BITSHIFT       28
+
+/* TFDB  Area - TFDs buffer table */
+#define FH49_MEM_TFDIB_DRAM_ADDR_LSB_MSK      (0xFFFFFFFF)
+#define FH49_TFDIB_LOWER_BOUND       (FH49_MEM_LOWER_BOUND + 0x900)
+#define FH49_TFDIB_UPPER_BOUND       (FH49_MEM_LOWER_BOUND + 0x958)
+#define FH49_TFDIB_CTRL0_REG(_chnl)  (FH49_TFDIB_LOWER_BOUND + 0x8 * (_chnl))
+#define FH49_TFDIB_CTRL1_REG(_chnl)  (FH49_TFDIB_LOWER_BOUND + 0x8 * (_chnl) + 0x4)
+
+/**
+ * Transmit DMA Channel Control/Status Registers (TCSR)
+ *
+ * 4965 has one configuration register for each of 8 Tx DMA/FIFO channels
+ * supported in hardware (don't confuse these with the 16 Tx queues in DRAM,
+ * which feed the DMA/FIFO channels); config regs are separated by 0x20 bytes.
+ *
+ * To use a Tx DMA channel, driver must initialize its
+ * FH49_TCSR_CHNL_TX_CONFIG_REG(chnl) with:
+ *
+ * FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE |
+ * FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE_VAL
+ *
+ * All other bits should be 0.
+ *
+ * Bit fields:
+ * 31-30: Tx DMA channel enable: '00' off/pause, '01' pause at end of frame,
+ *        '10' operate normally
+ * 29- 4: Reserved, set to "0"
+ *     3: Enable internal DMA requests (1, normal operation), disable (0)
+ *  2- 0: Reserved, set to "0"
+ */
+#define FH49_TCSR_LOWER_BOUND  (FH49_MEM_LOWER_BOUND + 0xD00)
+#define FH49_TCSR_UPPER_BOUND  (FH49_MEM_LOWER_BOUND + 0xE60)
+
+/* Find Control/Status reg for given Tx DMA/FIFO channel */
+#define FH49_TCSR_CHNL_NUM                            (7)
+#define FH50_TCSR_CHNL_NUM                            (8)
+
+/* TCSR: tx_config register values */
+#define FH49_TCSR_CHNL_TX_CONFIG_REG(_chnl)     \
+                (FH49_TCSR_LOWER_BOUND + 0x20 * (_chnl))
+#define FH49_TCSR_CHNL_TX_CREDIT_REG(_chnl)     \
+                (FH49_TCSR_LOWER_BOUND + 0x20 * (_chnl) + 0x4)
+#define FH49_TCSR_CHNL_TX_BUF_STS_REG(_chnl)    \
+                (FH49_TCSR_LOWER_BOUND + 0x20 * (_chnl) + 0x8)
+
+#define FH49_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_TXF                (0x00000000)
+#define FH49_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_DRV                (0x00000001)
+
+#define FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE  (0x00000000)
+#define FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE   (0x00000008)
+
+#define FH49_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_NOINT     (0x00000000)
+#define FH49_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD    (0x00100000)
+#define FH49_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_IFTFD     (0x00200000)
+
+#define FH49_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_NOINT      (0x00000000)
+#define FH49_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_ENDTFD     (0x00400000)
+#define FH49_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_IFTFD      (0x00800000)
+
+#define FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE      (0x00000000)
+#define FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE_EOF  (0x40000000)
+#define FH49_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE     (0x80000000)
+
+#define FH49_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_EMPTY    (0x00000000)
+#define FH49_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_WAIT     (0x00002000)
+#define FH49_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_VALID    (0x00000003)
+
+#define FH49_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM                (20)
+#define FH49_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_IDX                (12)
+
+/**
+ * Tx Shared Status Registers (TSSR)
+ *
+ * After stopping Tx DMA channel (writing 0 to
+ * FH49_TCSR_CHNL_TX_CONFIG_REG(chnl)), driver must poll
+ * FH49_TSSR_TX_STATUS_REG until selected Tx channel is idle
+ * (channel's buffers empty | no pending requests).
+ *
+ * Bit fields:
+ * 31-24:  1 = Channel buffers empty (channel 7:0)
+ * 23-16:  1 = No pending requests (channel 7:0)
+ */
+#define FH49_TSSR_LOWER_BOUND           (FH49_MEM_LOWER_BOUND + 0xEA0)
+#define FH49_TSSR_UPPER_BOUND           (FH49_MEM_LOWER_BOUND + 0xEC0)
+
+#define FH49_TSSR_TX_STATUS_REG         (FH49_TSSR_LOWER_BOUND + 0x010)
+
+/**
+ * Bit fields for TSSR(Tx Shared Status & Control) error status register:
+ * 31:  Indicates an address error when accessed to internal memory
+ *      uCode/driver must write "1" in order to clear this flag
+ * 30:  Indicates that Host did not send the expected number of dwords to FH
+ *      uCode/driver must write "1" in order to clear this flag
+ * 16-9:Each status bit is for one channel. Indicates that an (Error) ActDMA
+ *      command was received from the scheduler while the TRB was already full
+ *      with previous command
+ *      uCode/driver must write "1" in order to clear this flag
+ * 7-0: Each status bit indicates a channel's TxCredit error. When an error
+ *      bit is set, it indicates that the FH has received a full indication
+ *      from the RTC TxFIFO and the current value of the TxCredit counter was
+ *      not equal to zero. This mean that the credit mechanism was not
+ *      synchronized to the TxFIFO status
+ *      uCode/driver must write "1" in order to clear this flag
+ */
+#define FH49_TSSR_TX_ERROR_REG          (FH49_TSSR_LOWER_BOUND + 0x018)
+
+#define FH49_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(_chnl) ((1 << (_chnl)) << 16)
+
+/* Tx service channels */
+#define FH49_SRVC_CHNL          (9)
+#define FH49_SRVC_LOWER_BOUND   (FH49_MEM_LOWER_BOUND + 0x9C8)
+#define FH49_SRVC_UPPER_BOUND   (FH49_MEM_LOWER_BOUND + 0x9D0)
+#define FH49_SRVC_CHNL_SRAM_ADDR_REG(_chnl) \
+                (FH49_SRVC_LOWER_BOUND + ((_chnl) - 9) * 0x4)
+
+#define FH49_TX_CHICKEN_BITS_REG        (FH49_MEM_LOWER_BOUND + 0xE98)
+/* Instruct FH to increment the retry count of a packet when
+ * it is brought from the memory to TX-FIFO
+ */
+#define FH49_TX_CHICKEN_BITS_SCD_AUTO_RETRY_EN  (0x00000002)
+
+/* Keep Warm Size */
+#define IL_KW_SIZE 0x1000       /* 4k */
+
+#endif /* __il_4965_h__ */
diff --git a/drivers/net/wireless/iwlegacy/Kconfig b/drivers/net/wireless/iwlegacy/Kconfig
index aef65cd47661..05bd375cb845 100644
--- a/drivers/net/wireless/iwlegacy/Kconfig
+++ b/drivers/net/wireless/iwlegacy/Kconfig
@@ -1,4 +1,4 @@
-config IWLWIFI_LEGACY
+config IWLEGACY
         tristate
         select FW_LOADER
         select NEW_LEDS
@@ -7,13 +7,13 @@ config IWLWIFI_LEGACY
         select MAC80211_LEDS
 
 menu "Debugging Options"
-        depends on IWLWIFI_LEGACY
+        depends on IWLEGACY
 
-config IWLWIFI_LEGACY_DEBUG
-        bool "Enable full debugging output in 4965 and 3945 drivers"
-        depends on IWLWIFI_LEGACY
+config IWLEGACY_DEBUG
+        bool "Enable full debugging output in iwlegacy (iwl 3945/4965) drivers"
+        depends on IWLEGACY
         ---help---
-          This option will enable debug tracing output for the iwlwifilegacy
+          This option will enable debug tracing output for the iwlegacy
           drivers.
 
           This will result in the kernel module being ~100k larger.  You can
@@ -29,43 +29,26 @@ config IWLWIFI_LEGACY_DEBUG
                   % echo 0x43fff > /sys/class/net/wlan0/device/debug_level
 
           You can find the list of debug mask values in:
-                  drivers/net/wireless/iwlwifilegacy/iwl-debug.h
+                  drivers/net/wireless/iwlegacy/common.h
 
           If this is your first time using this driver, you should say Y here
           as the debug information can assist others in helping you resolve
           any problems you may encounter.
 
-config IWLWIFI_LEGACY_DEBUGFS
-        bool "4965 and 3945 debugfs support"
-        depends on IWLWIFI_LEGACY && MAC80211_DEBUGFS
+config IWLEGACY_DEBUGFS
+        bool "iwlegacy (iwl 3945/4965) debugfs support"
+        depends on IWLEGACY && MAC80211_DEBUGFS
         ---help---
-          Enable creation of debugfs files for the iwlwifilegacy drivers. This
+          Enable creation of debugfs files for the iwlegacy drivers. This
           is a low-impact option that allows getting insight into the
           driver's state at runtime.
 
-config IWLWIFI_LEGACY_DEVICE_TRACING
-        bool "iwlwifilegacy legacy device access tracing"
-        depends on IWLWIFI_LEGACY
-        depends on EVENT_TRACING
-        help
-          Say Y here to trace all commands, including TX frames and IO
-          accesses, sent to the device. If you say yes, iwlwifilegacy will
-          register with the ftrace framework for event tracing and dump
-          all this information to the ringbuffer, you may need to
-          increase the ringbuffer size. See the ftrace documentation
-          for more information.
-
-          When tracing is not enabled, this option still has some
-          (though rather small) overhead.
-
-          If unsure, say Y so we can help you better when problems
-          occur.
 endmenu
 
 config IWL4965
         tristate "Intel Wireless WiFi 4965AGN (iwl4965)"
         depends on PCI && MAC80211
-        select IWLWIFI_LEGACY
+        select IWLEGACY
         ---help---
           This option enables support for
 
@@ -93,7 +76,7 @@ config IWL4965
 config IWL3945
         tristate "Intel PRO/Wireless 3945ABG/BG Network Connection (iwl3945)"
         depends on PCI && MAC80211
-        select IWLWIFI_LEGACY
+        select IWLEGACY
         ---help---
           Select to build the driver supporting the:
 
diff --git a/drivers/net/wireless/iwlegacy/Makefile b/drivers/net/wireless/iwlegacy/Makefile
index d56aeb38c211..c985a01a0731 100644
--- a/drivers/net/wireless/iwlegacy/Makefile
+++ b/drivers/net/wireless/iwlegacy/Makefile
@@ -1,25 +1,17 @@
-obj-$(CONFIG_IWLWIFI_LEGACY)    += iwl-legacy.o
-iwl-legacy-objs                 := iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o
-iwl-legacy-objs                 += iwl-rx.o iwl-tx.o iwl-sta.o
-iwl-legacy-objs                 += iwl-scan.o iwl-led.o
-iwl-legacy-$(CONFIG_IWLWIFI_LEGACY_DEBUGFS) += iwl-debugfs.o
-iwl-legacy-$(CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING) += iwl-devtrace.o
+obj-$(CONFIG_IWLEGACY)  += iwlegacy.o
+iwlegacy-objs           := common.o
+iwlegacy-$(CONFIG_IWLEGACY_DEBUGFS) += debug.o
 
-iwl-legacy-objs += $(iwl-legacy-m)
-
-CFLAGS_iwl-devtrace.o := -I$(src)
+iwlegacy-objs += $(iwlegacy-m)
 
 # 4965
 obj-$(CONFIG_IWL4965)   += iwl4965.o
-iwl4965-objs            := iwl-4965.o iwl4965-base.o iwl-4965-rs.o iwl-4965-led.o
-iwl4965-objs            += iwl-4965-ucode.o iwl-4965-tx.o
-iwl4965-objs            += iwl-4965-lib.o iwl-4965-rx.o iwl-4965-calib.o
-iwl4965-objs            += iwl-4965-sta.o iwl-4965-eeprom.o
-iwl4965-$(CONFIG_IWLWIFI_LEGACY_DEBUGFS) += iwl-4965-debugfs.o
+iwl4965-objs            := 4965.o 4965-mac.o 4965-rs.o 4965-calib.o
+iwl4965-$(CONFIG_IWLEGACY_DEBUGFS) += 4965-debug.o
 
 # 3945
 obj-$(CONFIG_IWL3945)   += iwl3945.o
-iwl3945-objs            := iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl-3945-led.o
-iwl3945-$(CONFIG_IWLWIFI_LEGACY_DEBUGFS) += iwl-3945-debugfs.o
+iwl3945-objs            := 3945-mac.o 3945.o 3945-rs.o
+iwl3945-$(CONFIG_IWLEGACY_DEBUGFS) += 3945-debug.o
 
 ccflags-y += -D__CHECK_ENDIAN__
diff --git a/drivers/net/wireless/iwlegacy/iwl-commands.h b/drivers/net/wireless/iwlegacy/commands.h
index 89904054473f..25dd7d28d022 100644
--- a/drivers/net/wireless/iwlegacy/iwl-commands.h
+++ b/drivers/net/wireless/iwlegacy/commands.h
@@ -60,100 +60,96 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *****************************************************************************/
-/*
- * Please use this file (iwl-commands.h) only for uCode API definitions.
- * Please use iwl-xxxx-hw.h for hardware-related definitions.
- * Please use iwl-dev.h for driver implementation definitions.
- */
 
-#ifndef __iwl_legacy_commands_h__
-#define __iwl_legacy_commands_h__
+#ifndef __il_commands_h__
+#define __il_commands_h__
 
-struct iwl_priv;
+#include <linux/ieee80211.h>
 
-/* uCode version contains 4 values: Major/Minor/API/Serial */
-#define IWL_UCODE_MAJOR(ver)    (((ver) & 0xFF000000) >> 24)
-#define IWL_UCODE_MINOR(ver)    (((ver) & 0x00FF0000) >> 16)
-#define IWL_UCODE_API(ver)      (((ver) & 0x0000FF00) >> 8)
-#define IWL_UCODE_SERIAL(ver)   ((ver) & 0x000000FF)
+struct il_priv;
 
+/* uCode version contains 4 values: Major/Minor/API/Serial */
+#define IL_UCODE_MAJOR(ver)     (((ver) & 0xFF000000) >> 24)
+#define IL_UCODE_MINOR(ver)     (((ver) & 0x00FF0000) >> 16)
+#define IL_UCODE_API(ver)       (((ver) & 0x0000FF00) >> 8)
+#define IL_UCODE_SERIAL(ver)    ((ver) & 0x000000FF)
 
 /* Tx rates */
-#define IWL_CCK_RATES   4
-#define IWL_OFDM_RATES  8
-#define IWL_MAX_RATES   (IWL_CCK_RATES + IWL_OFDM_RATES)
+#define IL_CCK_RATES    4
+#define IL_OFDM_RATES   8
+#define IL_MAX_RATES    (IL_CCK_RATES + IL_OFDM_RATES)
 
 enum {
-        REPLY_ALIVE = 0x1,
-        REPLY_ERROR = 0x2,
+        N_ALIVE = 0x1,
+        N_ERROR = 0x2,
 
         /* RXON and QOS commands */
-        REPLY_RXON = 0x10,
-        REPLY_RXON_ASSOC = 0x11,
-        REPLY_QOS_PARAM = 0x13,
-        REPLY_RXON_TIMING = 0x14,
+        C_RXON = 0x10,
+        C_RXON_ASSOC = 0x11,
+        C_QOS_PARAM = 0x13,
+        C_RXON_TIMING = 0x14,
 
         /* Multi-Station support */
-        REPLY_ADD_STA = 0x18,
-        REPLY_REMOVE_STA = 0x19,
+        C_ADD_STA = 0x18,
+        C_REM_STA = 0x19,
 
         /* Security */
-        REPLY_WEPKEY = 0x20,
+        C_WEPKEY = 0x20,
 
         /* RX, TX, LEDs */
-        REPLY_3945_RX = 0x1b,           /* 3945 only */
-        REPLY_TX = 0x1c,
-        REPLY_RATE_SCALE = 0x47,        /* 3945 only */
-        REPLY_LEDS_CMD = 0x48,
-        REPLY_TX_LINK_QUALITY_CMD = 0x4e, /* for 4965 and up */
+        N_3945_RX = 0x1b,       /* 3945 only */
+        C_TX = 0x1c,
+        C_RATE_SCALE = 0x47,    /* 3945 only */
+        C_LEDS = 0x48,
+        C_TX_LINK_QUALITY_CMD = 0x4e,   /* for 4965 */
 
         /* 802.11h related */
-        REPLY_CHANNEL_SWITCH = 0x72,
-        CHANNEL_SWITCH_NOTIFICATION = 0x73,
-        REPLY_SPECTRUM_MEASUREMENT_CMD = 0x74,
-        SPECTRUM_MEASURE_NOTIFICATION = 0x75,
+        C_CHANNEL_SWITCH = 0x72,
+        N_CHANNEL_SWITCH = 0x73,
+        C_SPECTRUM_MEASUREMENT = 0x74,
+        N_SPECTRUM_MEASUREMENT = 0x75,
 
         /* Power Management */
-        POWER_TABLE_CMD = 0x77,
-        PM_SLEEP_NOTIFICATION = 0x7A,
-        PM_DEBUG_STATISTIC_NOTIFIC = 0x7B,
+        C_POWER_TBL = 0x77,
+        N_PM_SLEEP = 0x7A,
+        N_PM_DEBUG_STATS = 0x7B,
 
         /* Scan commands and notifications */
-        REPLY_SCAN_CMD = 0x80,
-        REPLY_SCAN_ABORT_CMD = 0x81,
-        SCAN_START_NOTIFICATION = 0x82,
-        SCAN_RESULTS_NOTIFICATION = 0x83,
-        SCAN_COMPLETE_NOTIFICATION = 0x84,
+        C_SCAN = 0x80,
+        C_SCAN_ABORT = 0x81,
+        N_SCAN_START = 0x82,
+        N_SCAN_RESULTS = 0x83,
+        N_SCAN_COMPLETE = 0x84,
 
         /* IBSS/AP commands */
-        BEACON_NOTIFICATION = 0x90,
-        REPLY_TX_BEACON = 0x91,
+        N_BEACON = 0x90,
+        C_TX_BEACON = 0x91,
 
         /* Miscellaneous commands */
-        REPLY_TX_PWR_TABLE_CMD = 0x97,
+        C_TX_PWR_TBL = 0x97,
 
         /* Bluetooth device coexistence config command */
-        REPLY_BT_CONFIG = 0x9b,
+        C_BT_CONFIG = 0x9b,
 
         /* Statistics */
-        REPLY_STATISTICS_CMD = 0x9c,
-        STATISTICS_NOTIFICATION = 0x9d,
+        C_STATS = 0x9c,
+        N_STATS = 0x9d,
 
         /* RF-KILL commands and notifications */
-        CARD_STATE_NOTIFICATION = 0xa1,
+        N_CARD_STATE = 0xa1,
 
         /* Missed beacons notification */
-        MISSED_BEACONS_NOTIFICATION = 0xa2,
+        N_MISSED_BEACONS = 0xa2,
 
-        REPLY_CT_KILL_CONFIG_CMD = 0xa4,
-        SENSITIVITY_CMD = 0xa8,
-        REPLY_PHY_CALIBRATION_CMD = 0xb0,
-        REPLY_RX_PHY_CMD = 0xc0,
-        REPLY_RX_MPDU_CMD = 0xc1,
-        REPLY_RX = 0xc3,
-        REPLY_COMPRESSED_BA = 0xc5,
+        C_CT_KILL_CONFIG = 0xa4,
+        C_SENSITIVITY = 0xa8,
+        C_PHY_CALIBRATION = 0xb0,
+        N_RX_PHY = 0xc0,
+        N_RX_MPDU = 0xc1,
+        N_RX = 0xc3,
+        N_COMPRESSED_BA = 0xc5,
 
-        REPLY_MAX = 0xff
+        IL_CN_MAX = 0xff
 };
 
 /******************************************************************************
@@ -163,25 +159,25 @@ enum {
  *
  *****************************************************************************/
 
-/* iwl_cmd_header flags value */
-#define IWL_CMD_FAILED_MSK 0x40
+/* il_cmd_header flags value */
+#define IL_CMD_FAILED_MSK 0x40
 
 #define SEQ_TO_QUEUE(s) (((s) >> 8) & 0x1f)
 #define QUEUE_TO_SEQ(q) (((q) & 0x1f) << 8)
-#define SEQ_TO_INDEX(s) ((s) & 0xff)
-#define INDEX_TO_SEQ(i) ((i) & 0xff)
+#define SEQ_TO_IDX(s)   ((s) & 0xff)
+#define IDX_TO_SEQ(i)   ((i) & 0xff)
 #define SEQ_HUGE_FRAME  cpu_to_le16(0x4000)
 #define SEQ_RX_FRAME    cpu_to_le16(0x8000)
 
 /**
- * struct iwl_cmd_header
+ * struct il_cmd_header
  *
  * This header format appears in the beginning of each command sent from the
  * driver, and each response/notification received from uCode.
  */
-struct iwl_cmd_header {
-        u8 cmd;         /* Command ID:  REPLY_RXON, etc. */
-        u8 flags;       /* 0:5 reserved, 6 abort, 7 internal */
+struct il_cmd_header {
+        u8 cmd;                 /* Command ID:  C_RXON, etc. */
+        u8 flags;               /* 0:5 reserved, 6 abort, 7 internal */
         /*
          * The driver sets up the sequence number to values of its choosing.
          * uCode does not use this value, but passes it back to the driver
@@ -192,29 +188,28 @@ struct iwl_cmd_header {
          * There is one exception:  uCode sets bit 15 when it originates
          * the response/notification, i.e. when the response/notification
          * is not a direct response to a command sent by the driver.  For
-         * example, uCode issues REPLY_3945_RX when it sends a received frame
+         * example, uCode issues N_3945_RX when it sends a received frame
          * to the driver; it is not a direct response to any driver command.
          *
          * The Linux driver uses the following format:
          *
-         *  0:7         tfd index - position within TX queue
-         *  8:12        TX queue id
-         *  13          reserved
-         *  14          huge - driver sets this to indicate command is in the
-         *              'huge' storage at the end of the command buffers
-         *  15          unsolicited RX or uCode-originated notification
-        */
+         *  0:7         tfd idx - position within TX queue
+         *  8:12        TX queue id
+         *  13          reserved
+         *  14          huge - driver sets this to indicate command is in the
+         *              'huge' storage at the end of the command buffers
+         *  15          unsolicited RX or uCode-originated notification
+         */
         __le16 sequence;
 
         /* command or response/notification data follows immediately */
         u8 data[0];
 } __packed;
 
-
 /**
- * struct iwl3945_tx_power
+ * struct il3945_tx_power
  *
- * Used in REPLY_TX_PWR_TABLE_CMD, REPLY_SCAN_CMD, REPLY_CHANNEL_SWITCH
+ * Used in C_TX_PWR_TBL, C_SCAN, C_CHANNEL_SWITCH
  *
  * Each entry contains two values:
  * 1)  DSP gain (or sometimes called DSP attenuation).  This is a fine-grained
@@ -223,21 +218,21 @@ struct iwl_cmd_header {
  * 2)  Radio gain.  This sets the analog gain of the radio Tx path.
  *     It is a coarser setting, and behaves in a logarithmic (dB) fashion.
  *
- * Driver obtains values from struct iwl3945_tx_power power_gain_table[][].
+ * Driver obtains values from struct il3945_tx_power power_gain_table[][].
  */
-struct iwl3945_tx_power {
+struct il3945_tx_power {
         u8 tx_gain;             /* gain for analog radio */
         u8 dsp_atten;           /* gain for DSP */
 } __packed;
 
 /**
- * struct iwl3945_power_per_rate
+ * struct il3945_power_per_rate
  *
- * Used in REPLY_TX_PWR_TABLE_CMD, REPLY_CHANNEL_SWITCH
+ * Used in C_TX_PWR_TBL, C_CHANNEL_SWITCH
  */
-struct iwl3945_power_per_rate {
+struct il3945_power_per_rate {
         u8 rate;                /* plcp */
-        struct iwl3945_tx_power tpc;
+        struct il3945_tx_power tpc;
         u8 reserved;
 } __packed;
 
@@ -245,10 +240,10 @@ struct iwl3945_power_per_rate {
  * iwl4965 rate_n_flags bit fields
  *
  * rate_n_flags format is used in following iwl4965 commands:
- *  REPLY_RX (response only)
- *  REPLY_RX_MPDU (response only)
- *  REPLY_TX (both command and response)
- *  REPLY_TX_LINK_QUALITY_CMD
+ *  N_RX (response only)
+ *  N_RX_MPDU (response only)
+ *  C_TX (both command and response)
+ *  C_TX_LINK_QUALITY_CMD
  *
  * High-throughput (HT) rate format for bits 7:0 (bit 8 must be "1"):
  *  2-0:  0)   6 Mbps
@@ -326,17 +321,17 @@ struct iwl3945_power_per_rate {
 #define RATE_MCS_ANT_ABC_MSK    (RATE_MCS_ANT_AB_MSK | RATE_MCS_ANT_C_MSK)
 #define RATE_ANT_NUM 3
 
-#define POWER_TABLE_NUM_ENTRIES                 33
-#define POWER_TABLE_NUM_HT_OFDM_ENTRIES         32
-#define POWER_TABLE_CCK_ENTRY                   32
+#define POWER_TBL_NUM_ENTRIES                   33
+#define POWER_TBL_NUM_HT_OFDM_ENTRIES           32
+#define POWER_TBL_CCK_ENTRY                     32
 
-#define IWL_PWR_NUM_HT_OFDM_ENTRIES             24
-#define IWL_PWR_CCK_ENTRIES                     2
+#define IL_PWR_NUM_HT_OFDM_ENTRIES              24
+#define IL_PWR_CCK_ENTRIES                      2
 
 /**
- * union iwl4965_tx_power_dual_stream
+ * union il4965_tx_power_dual_stream
  *
- * Host format used for REPLY_TX_PWR_TABLE_CMD, REPLY_CHANNEL_SWITCH
+ * Host format used for C_TX_PWR_TBL, C_CHANNEL_SWITCH
  * Use __le32 version (struct tx_power_dual_stream) when building command.
  *
  * Driver provides radio gain and DSP attenuation settings to device in pairs,
@@ -347,9 +342,9 @@ struct iwl3945_power_per_rate {
  * For MIMO rates, one value may be different from the other,
  * in order to balance the Tx output between the two transmitters.
  *
- * See more details in doc for TXPOWER in iwl-4965-hw.h.
+ * See more details in doc for TXPOWER in 4965.h.
  */
-union iwl4965_tx_power_dual_stream {
+union il4965_tx_power_dual_stream {
         struct {
                 u8 radio_tx_gain[2];
                 u8 dsp_predis_atten[2];
@@ -360,21 +355,21 @@ union iwl4965_tx_power_dual_stream {
 /**
  * struct tx_power_dual_stream
  *
- * Table entries in REPLY_TX_PWR_TABLE_CMD, REPLY_CHANNEL_SWITCH
+ * Table entries in C_TX_PWR_TBL, C_CHANNEL_SWITCH
  *
- * Same format as iwl_tx_power_dual_stream, but __le32
+ * Same format as il_tx_power_dual_stream, but __le32
  */
 struct tx_power_dual_stream {
         __le32 dw;
 } __packed;
 
 /**
- * struct iwl4965_tx_power_db
+ * struct il4965_tx_power_db
  *
- * Entire table within REPLY_TX_PWR_TABLE_CMD, REPLY_CHANNEL_SWITCH
+ * Entire table within C_TX_PWR_TBL, C_CHANNEL_SWITCH
  */
-struct iwl4965_tx_power_db {
-        struct tx_power_dual_stream power_tbl[POWER_TABLE_NUM_ENTRIES];
+struct il4965_tx_power_db {
+        struct tx_power_dual_stream power_tbl[POWER_TBL_NUM_ENTRIES];
 } __packed;
 
 /******************************************************************************
@@ -387,7 +382,7 @@ struct iwl4965_tx_power_db {
 #define INITIALIZE_SUBTYPE    (9)
 
 /*
- * ("Initialize") REPLY_ALIVE = 0x1 (response only, not a command)
+ * ("Initialize") N_ALIVE = 0x1 (response only, not a command)
  *
  * uCode issues this "initialize alive" notification once the initialization
  * uCode image has completed its work, and is ready to load the runtime image.
@@ -410,7 +405,7 @@ struct iwl4965_tx_power_db {
  * 3)  Tx gain compensation to balance 4965's 2 Tx chains for MIMO operation,
  *     for each of 5 frequency ranges.
  */
-struct iwl_init_alive_resp {
+struct il_init_alive_resp {
         u8 ucode_minor;
         u8 ucode_major;
         __le16 reserved1;
@@ -433,9 +428,8 @@ struct iwl_init_alive_resp {
                                  * 2 Tx chains */
 } __packed;
 
-
 /**
- * REPLY_ALIVE = 0x1 (response only, not a command)
+ * N_ALIVE = 0x1 (response only, not a command)
  *
  * uCode issues this "alive" notification once the runtime image is ready
  * to receive commands from the driver.  This is the *second* "alive"
@@ -454,7 +448,7 @@ struct iwl_init_alive_resp {
  *      __le32 log_size;     log capacity (in number of entries)
  *      __le32 type;         (1) timestamp with each entry, (0) no timestamp
  *      __le32 wraps;        # times uCode has wrapped to top of circular buffer
- *      __le32 write_index;  next circular buffer entry that uCode would fill
+ *      __le32 write_idx;  next circular buffer entry that uCode would fill
  *
  *     The header is followed by the circular buffer of log entries.  Entries
  *     with timestamps have the following format:
@@ -511,13 +505,13 @@ struct iwl_init_alive_resp {
  * The Linux driver can print both logs to the system log when a uCode error
  * occurs.
  */
-struct iwl_alive_resp {
+struct il_alive_resp {
         u8 ucode_minor;
         u8 ucode_major;
         __le16 reserved1;
         u8 sw_rev[8];
         u8 ver_type;
-        u8 ver_subtype;                 /* not "9" for runtime alive */
+        u8 ver_subtype;         /* not "9" for runtime alive */
         __le16 reserved2;
         __le32 log_event_table_ptr;     /* SRAM address for event log */
         __le32 error_event_table_ptr;   /* SRAM address for error log */
@@ -526,9 +520,9 @@ struct iwl_alive_resp {
 } __packed;
 
 /*
- * REPLY_ERROR = 0x2 (response only, not a command)
+ * N_ERROR = 0x2 (response only, not a command)
  */
-struct iwl_error_resp {
+struct il_error_resp {
         __le32 error_type;
         u8 cmd_id;
         u8 reserved1;
@@ -554,7 +548,6 @@ enum {
         RXON_DEV_TYPE_SNIFFER = 6,
 };
 
-
 #define RXON_RX_CHAIN_DRIVER_FORCE_MSK          cpu_to_le16(0x1 << 0)
 #define RXON_RX_CHAIN_DRIVER_FORCE_POS          (0)
 #define RXON_RX_CHAIN_VALID_MSK                 cpu_to_le16(0x7 << 1)
@@ -593,7 +586,6 @@ enum {
 * (according to ON_AIR deassertion) */
 #define RXON_FLG_TSF2HOST_MSK           cpu_to_le32(1 << 15)
 
-
 /* HT flags */
 #define RXON_FLG_CTRL_CHANNEL_LOC_POS           (22)
 #define RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK        cpu_to_le32(0x1 << 22)
@@ -640,7 +632,7 @@ enum {
 #define RXON_FILTER_BCON_AWARE_MSK      cpu_to_le32(1 << 6)
 
 /**
- * REPLY_RXON = 0x10 (command, has simple generic response)
+ * C_RXON = 0x10 (command, has simple generic response)
  *
  * RXON tunes the radio tuner to a service channel, and sets up a number
  * of parameters that are used primarily for Rx, but also for Tx operations.
@@ -653,11 +645,11 @@ enum {
  *        channel.
  *
  * NOTE:  All RXONs wipe clean the internal txpower table.  Driver must
- *        issue a new REPLY_TX_PWR_TABLE_CMD after each REPLY_RXON (0x10),
+ *        issue a new C_TX_PWR_TBL after each C_RXON (0x10),
  *        regardless of whether RXON_FILTER_ASSOC_MSK is set.
  */
 
-struct iwl3945_rxon_cmd {
+struct il3945_rxon_cmd {
         u8 node_addr[6];
         __le16 reserved1;
         u8 bssid_addr[6];
@@ -676,7 +668,7 @@ struct iwl3945_rxon_cmd {
         __le16 reserved5;
 } __packed;
 
-struct iwl4965_rxon_cmd {
+struct il4965_rxon_cmd {
         u8 node_addr[6];
         __le16 reserved1;
         u8 bssid_addr[6];
@@ -699,7 +691,7 @@ struct iwl4965_rxon_cmd {
 /* Create a common rxon cmd which will be typecast into the 3945 or 4965
  * specific rxon cmd, depending on where it is called from.
  */
-struct iwl_legacy_rxon_cmd {
+struct il_rxon_cmd {
         u8 node_addr[6];
         __le16 reserved1;
         u8 bssid_addr[6];
@@ -721,11 +713,10 @@ struct iwl_legacy_rxon_cmd {
         u8 reserved5;
 } __packed;
 
-
 /*
- * REPLY_RXON_ASSOC = 0x11 (command, has simple generic response)
+ * C_RXON_ASSOC = 0x11 (command, has simple generic response)
  */
-struct iwl3945_rxon_assoc_cmd {
+struct il3945_rxon_assoc_cmd {
         __le32 flags;
         __le32 filter_flags;
         u8 ofdm_basic_rates;
@@ -733,7 +724,7 @@ struct iwl3945_rxon_assoc_cmd {
         __le16 reserved;
 } __packed;
 
-struct iwl4965_rxon_assoc_cmd {
+struct il4965_rxon_assoc_cmd {
         __le32 flags;
         __le32 filter_flags;
         u8 ofdm_basic_rates;
@@ -744,17 +735,17 @@ struct iwl4965_rxon_assoc_cmd {
         __le16 reserved;
 } __packed;
 
-#define IWL_CONN_MAX_LISTEN_INTERVAL    10
-#define IWL_MAX_UCODE_BEACON_INTERVAL   4 /* 4096 */
-#define IWL39_MAX_UCODE_BEACON_INTERVAL 1 /* 1024 */
+#define IL_CONN_MAX_LISTEN_INTERVAL     10
+#define IL_MAX_UCODE_BEACON_INTERVAL    4       /* 4096 */
+#define IL39_MAX_UCODE_BEACON_INTERVAL  1       /* 1024 */
 
 /*
- * REPLY_RXON_TIMING = 0x14 (command, has simple generic response)
+ * C_RXON_TIMING = 0x14 (command, has simple generic response)
  */
-struct iwl_rxon_time_cmd {
+struct il_rxon_time_cmd {
         __le64 timestamp;
         __le16 beacon_interval;
-        __le16 atim_window;
+        __le16 atim_win;
         __le32 beacon_init_val;
         __le16 listen_interval;
         u8 dtim_period;
@@ -762,32 +753,32 @@ struct iwl_rxon_time_cmd {
 } __packed;
 
 /*
- * REPLY_CHANNEL_SWITCH = 0x72 (command, has simple generic response)
+ * C_CHANNEL_SWITCH = 0x72 (command, has simple generic response)
  */
-struct iwl3945_channel_switch_cmd {
+struct il3945_channel_switch_cmd {
         u8 band;
         u8 expect_beacon;
         __le16 channel;
         __le32 rxon_flags;
         __le32 rxon_filter_flags;
         __le32 switch_time;
-        struct iwl3945_power_per_rate power[IWL_MAX_RATES];
+        struct il3945_power_per_rate power[IL_MAX_RATES];
 } __packed;
 
-struct iwl4965_channel_switch_cmd {
+struct il4965_channel_switch_cmd {
         u8 band;
         u8 expect_beacon;
         __le16 channel;
         __le32 rxon_flags;
         __le32 rxon_filter_flags;
         __le32 switch_time;
-        struct iwl4965_tx_power_db tx_power;
+        struct il4965_tx_power_db tx_power;
 } __packed;
 
 /*
- * CHANNEL_SWITCH_NOTIFICATION = 0x73 (notification only, not a command)
+ * N_CHANNEL_SWITCH = 0x73 (notification only, not a command)
  */
-struct iwl_csa_notification {
+struct il_csa_notification {
         __le16 band;
         __le16 channel;
         __le32 status;          /* 0 - OK, 1 - fail */
@@ -800,22 +791,22 @@ struct iwl_csa_notification {
  *****************************************************************************/
 
 /**
- * struct iwl_ac_qos -- QOS timing params for REPLY_QOS_PARAM
- * One for each of 4 EDCA access categories in struct iwl_qosparam_cmd
+ * struct il_ac_qos -- QOS timing params for C_QOS_PARAM
+ * One for each of 4 EDCA access categories in struct il_qosparam_cmd
  *
- * @cw_min: Contention window, start value in numbers of slots.
+ * @cw_min: Contention win, start value in numbers of slots.
  *          Should be a power-of-2, minus 1.  Device's default is 0x0f.
- * @cw_max: Contention window, max value in numbers of slots.
+ * @cw_max: Contention win, max value in numbers of slots.
  *          Should be a power-of-2, minus 1.  Device's default is 0x3f.
  * @aifsn:  Number of slots in Arbitration Interframe Space (before
  *          performing random backoff timing prior to Tx).  Device default 1.
  * @edca_txop:  Length of Tx opportunity, in uSecs.  Device default is 0.
  *
- * Device will automatically increase contention window by (2*CW) + 1 for each
+ * Device will automatically increase contention win by (2*CW) + 1 for each
  * transmission retry.  Device uses cw_max as a bit mask, ANDed with new CW
  * value, to cap the CW value.
  */
-struct iwl_ac_qos {
+struct il_ac_qos {
         __le16 cw_min;
         __le16 cw_max;
         u8 aifsn;
@@ -832,14 +823,14 @@ struct iwl_ac_qos {
 #define AC_NUM                4
 
 /*
- * REPLY_QOS_PARAM = 0x13 (command, has simple generic response)
+ * C_QOS_PARAM = 0x13 (command, has simple generic response)
  *
  * This command sets up timings for each of the 4 prioritized EDCA Tx FIFOs
  * 0: Background, 1: Best Effort, 2: Video, 3: Voice.
  */
-struct iwl_qosparam_cmd {
+struct il_qosparam_cmd {
         __le32 qos_flags;
-        struct iwl_ac_qos ac[AC_NUM];
+        struct il_ac_qos ac[AC_NUM];
 } __packed;
 
 /******************************************************************************
@@ -852,15 +843,15 @@ struct iwl_qosparam_cmd {
  */
 
 /* Special, dedicated locations within device's station table */
-#define IWL_AP_ID               0
-#define IWL_STA_ID              2
-#define IWL3945_BROADCAST_ID    24
-#define IWL3945_STATION_COUNT   25
-#define IWL4965_BROADCAST_ID    31
-#define IWL4965_STATION_COUNT   32
+#define IL_AP_ID                0
+#define IL_STA_ID               2
+#define IL3945_BROADCAST_ID     24
+#define IL3945_STATION_COUNT    25
+#define IL4965_BROADCAST_ID     31
+#define IL4965_STATION_COUNT    32
 
-#define IWL_STATION_COUNT       32      /* MAX(3945,4965)*/
-#define IWL_INVALID_STATION     255
+#define IL_STATION_COUNT        32      /* MAX(3945,4965) */
+#define IL_INVALID_STATION      255
 
 #define STA_FLG_TX_RATE_MSK             cpu_to_le32(1 << 2)
 #define STA_FLG_PWR_SAVE_MSK            cpu_to_le32(1 << 8)
@@ -901,11 +892,11 @@ struct iwl_qosparam_cmd {
 #define STA_MODIFY_DELBA_TID_MSK        0x10
 #define STA_MODIFY_SLEEP_TX_COUNT_MSK   0x20
 
-/* Receiver address (actually, Rx station's index into station table),
+/* Receiver address (actually, Rx station's idx into station table),
  * combined with Traffic ID (QOS priority), in format used by Tx Scheduler */
 #define BUILD_RAxTID(sta_id, tid)       (((sta_id) << 4) + (tid))
 
-struct iwl4965_keyinfo {
+struct il4965_keyinfo {
         __le16 key_flags;
         u8 tkip_rx_tsc_byte2;   /* TSC[2] for key mix ph1 detection */
         u8 reserved1;
@@ -918,12 +909,12 @@ struct iwl4965_keyinfo {
 /**
  * struct sta_id_modify
  * @addr[ETH_ALEN]: station's MAC address
- * @sta_id: index of station in uCode's station table
+ * @sta_id: idx of station in uCode's station table
  * @modify_mask: STA_MODIFY_*, 1: modify, 0: don't change
  *
- * Driver selects unused table index when adding new station,
- * or the index to a pre-existing station entry when modifying that station.
- * Some indexes have special purposes (IWL_AP_ID, index 0, is for AP).
+ * Driver selects unused table idx when adding new station,
+ * or the idx to a pre-existing station entry when modifying that station.
+ * Some idxes have special purposes (IL_AP_ID, idx 0, is for AP).
  *
  * modify_mask flags select which parameters to modify vs. leave alone.
  */
@@ -936,15 +927,15 @@ struct sta_id_modify {
 } __packed;
 
 /*
- * REPLY_ADD_STA = 0x18 (command)
+ * C_ADD_STA = 0x18 (command)
  *
  * The device contains an internal table of per-station information,
  * with info on security keys, aggregation parameters, and Tx rates for
  * initial Tx attempt and any retries (4965 devices uses
- * REPLY_TX_LINK_QUALITY_CMD,
- * 3945 uses REPLY_RATE_SCALE to set up rate tables).
+ * C_TX_LINK_QUALITY_CMD,
+ * 3945 uses C_RATE_SCALE to set up rate tables).
  *
- * REPLY_ADD_STA sets up the table entry for one station, either creating
+ * C_ADD_STA sets up the table entry for one station, either creating
  * a new entry, or modifying a pre-existing one.
  *
  * NOTE:  RXON command (without "associated" bit set) wipes the station table
@@ -954,20 +945,20 @@ struct sta_id_modify {
  *        their own txpower/rate setup data).
  *
  *        When getting started on a new channel, driver must set up the
- *        IWL_BROADCAST_ID entry (last entry in the table).  For a client
+ *        IL_BROADCAST_ID entry (last entry in the table).  For a client
  *        station in a BSS, once an AP is selected, driver sets up the AP STA
- *        in the IWL_AP_ID entry (1st entry in the table).  BROADCAST and AP
+ *        in the IL_AP_ID entry (1st entry in the table).  BROADCAST and AP
  *        are all that are needed for a BSS client station.  If the device is
  *        used as AP, or in an IBSS network, driver must set up station table
- *        entries for all STAs in network, starting with index IWL_STA_ID.
+ *        entries for all STAs in network, starting with idx IL_STA_ID.
  */
 
-struct iwl3945_addsta_cmd {
+struct il3945_addsta_cmd {
         u8 mode;                /* 1: modify existing, 0: add new station */
         u8 reserved[3];
         struct sta_id_modify sta;
-        struct iwl4965_keyinfo key;
-        __le32 station_flags;           /* STA_FLG_* */
+        struct il4965_keyinfo key;
+        __le32 station_flags;   /* STA_FLG_* */
         __le32 station_flags_msk;       /* STA_FLG_* */
 
         /* bit field to disable (1) or enable (0) Tx for Traffic ID (TID)
@@ -990,12 +981,12 @@ struct iwl3945_addsta_cmd {
         __le16 add_immediate_ba_ssn;
 } __packed;
 
-struct iwl4965_addsta_cmd {
+struct il4965_addsta_cmd {
         u8 mode;                /* 1: modify existing, 0: add new station */
         u8 reserved[3];
         struct sta_id_modify sta;
-        struct iwl4965_keyinfo key;
-        __le32 station_flags;           /* STA_FLG_* */
+        struct il4965_keyinfo key;
+        __le32 station_flags;   /* STA_FLG_* */
         __le32 station_flags_msk;       /* STA_FLG_* */
 
         /* bit field to disable (1) or enable (0) Tx for Traffic ID (TID)
@@ -1003,7 +994,7 @@ struct iwl4965_addsta_cmd {
          * Set modify_mask bit STA_MODIFY_TID_DISABLE_TX to use this field. */
         __le16 tid_disable_tx;
 
-        __le16  reserved1;
+        __le16 reserved1;
 
         /* TID for which to add block-ack support.
          * Set modify_mask bit STA_MODIFY_ADDBA_TID_MSK to use this field. */
@@ -1028,12 +1019,12 @@ struct iwl4965_addsta_cmd {
 } __packed;
 
 /* Wrapper struct for 3945 and 4965 addsta_cmd structures */
-struct iwl_legacy_addsta_cmd {
+struct il_addsta_cmd {
         u8 mode;                /* 1: modify existing, 0: add new station */
         u8 reserved[3];
         struct sta_id_modify sta;
-        struct iwl4965_keyinfo key;
-        __le32 station_flags;           /* STA_FLG_* */
+        struct il4965_keyinfo key;
+        __le32 station_flags;   /* STA_FLG_* */
         __le32 station_flags_msk;       /* STA_FLG_* */
 
         /* bit field to disable (1) or enable (0) Tx for Traffic ID (TID)
@@ -1041,7 +1032,7 @@ struct iwl_legacy_addsta_cmd {
          * Set modify_mask bit STA_MODIFY_TID_DISABLE_TX to use this field. */
         __le16 tid_disable_tx;
 
-        __le16  rate_n_flags;           /* 3945 only */
+        __le16 rate_n_flags;    /* 3945 only */
 
         /* TID for which to add block-ack support.
          * Set modify_mask bit STA_MODIFY_ADDBA_TID_MSK to use this field. */
@@ -1065,51 +1056,50 @@ struct iwl_legacy_addsta_cmd {
         __le16 reserved2;
 } __packed;
 
-
 #define ADD_STA_SUCCESS_MSK             0x1
-#define ADD_STA_NO_ROOM_IN_TABLE        0x2
+#define ADD_STA_NO_ROOM_IN_TBL  0x2
 #define ADD_STA_NO_BLOCK_ACK_RESOURCE   0x4
 #define ADD_STA_MODIFY_NON_EXIST_STA    0x8
 /*
- * REPLY_ADD_STA = 0x18 (response)
+ * C_ADD_STA = 0x18 (response)
  */
-struct iwl_add_sta_resp {
-        u8 status;      /* ADD_STA_* */
+struct il_add_sta_resp {
+        u8 status;              /* ADD_STA_* */
 } __packed;
 
 #define REM_STA_SUCCESS_MSK              0x1
 /*
- *  REPLY_REM_STA = 0x19 (response)
+ *  C_REM_STA = 0x19 (response)
  */
-struct iwl_rem_sta_resp {
+struct il_rem_sta_resp {
         u8 status;
 } __packed;
 
 /*
- *  REPLY_REM_STA = 0x19 (command)
+ *  C_REM_STA = 0x19 (command)
  */
-struct iwl_rem_sta_cmd {
-        u8 num_sta;     /* number of removed stations */
+struct il_rem_sta_cmd {
+        u8 num_sta;             /* number of removed stations */
         u8 reserved[3];
-        u8 addr[ETH_ALEN]; /* MAC addr of the first station */
+        u8 addr[ETH_ALEN];      /* MAC addr of the first station */
         u8 reserved2[2];
 } __packed;
 
-#define IWL_TX_FIFO_BK_MSK              cpu_to_le32(BIT(0))
-#define IWL_TX_FIFO_BE_MSK              cpu_to_le32(BIT(1))
-#define IWL_TX_FIFO_VI_MSK              cpu_to_le32(BIT(2))
-#define IWL_TX_FIFO_VO_MSK              cpu_to_le32(BIT(3))
-#define IWL_AGG_TX_QUEUE_MSK            cpu_to_le32(0xffc00)
+#define IL_TX_FIFO_BK_MSK               cpu_to_le32(BIT(0))
+#define IL_TX_FIFO_BE_MSK               cpu_to_le32(BIT(1))
+#define IL_TX_FIFO_VI_MSK               cpu_to_le32(BIT(2))
+#define IL_TX_FIFO_VO_MSK               cpu_to_le32(BIT(3))
+#define IL_AGG_TX_QUEUE_MSK             cpu_to_le32(0xffc00)
 
-#define IWL_DROP_SINGLE         0
-#define IWL_DROP_SELECTED       1
-#define IWL_DROP_ALL            2
+#define IL_DROP_SINGLE          0
+#define IL_DROP_SELECTED        1
+#define IL_DROP_ALL             2
 
 /*
  * REPLY_WEP_KEY = 0x20
  */
-struct iwl_wep_key {
-        u8 key_index;
+struct il_wep_key {
+        u8 key_idx;
         u8 key_offset;
         u8 reserved1[2];
         u8 key_size;
@@ -1117,12 +1107,12 @@ struct iwl_wep_key {
         u8 key[16];
 } __packed;
 
-struct iwl_wep_cmd {
+struct il_wep_cmd {
         u8 num_keys;
         u8 global_key_type;
         u8 flags;
         u8 reserved;
-        struct iwl_wep_key key[0];
+        struct il_wep_key key[0];
 } __packed;
 
 #define WEP_KEY_WEP_TYPE 1
@@ -1168,8 +1158,7 @@ struct iwl_wep_cmd {
 #define RX_MPDU_RES_STATUS_TTAK_OK      (1 << 7)
 #define RX_MPDU_RES_STATUS_DEC_DONE_MSK (0x800)
 
-
-struct iwl3945_rx_frame_stats {
+struct il3945_rx_frame_stats {
         u8 phy_count;
         u8 id;
         u8 rssi;
@@ -1179,7 +1168,7 @@ struct iwl3945_rx_frame_stats {
         u8 payload[0];
 } __packed;
 
-struct iwl3945_rx_frame_hdr {
+struct il3945_rx_frame_hdr {
         __le16 channel;
         __le16 phy_flags;
         u8 reserved1;
@@ -1188,73 +1177,71 @@ struct iwl3945_rx_frame_hdr {
         u8 payload[0];
 } __packed;
 
-struct iwl3945_rx_frame_end {
+struct il3945_rx_frame_end {
         __le32 status;
         __le64 timestamp;
         __le32 beacon_timestamp;
 } __packed;
 
 /*
- * REPLY_3945_RX = 0x1b (response only, not a command)
+ * N_3945_RX = 0x1b (response only, not a command)
  *
  * NOTE:  DO NOT dereference from casts to this structure
  * It is provided only for calculating minimum data set size.
  * The actual offsets of the hdr and end are dynamic based on
  * stats.phy_count
  */
-struct iwl3945_rx_frame {
-        struct iwl3945_rx_frame_stats stats;
-        struct iwl3945_rx_frame_hdr hdr;
-        struct iwl3945_rx_frame_end end;
+struct il3945_rx_frame {
+        struct il3945_rx_frame_stats stats;
+        struct il3945_rx_frame_hdr hdr;
+        struct il3945_rx_frame_end end;
 } __packed;
 
-#define IWL39_RX_FRAME_SIZE     (4 + sizeof(struct iwl3945_rx_frame))
+#define IL39_RX_FRAME_SIZE      (4 + sizeof(struct il3945_rx_frame))
 
 /* Fixed (non-configurable) rx data from phy */
 
-#define IWL49_RX_RES_PHY_CNT 14
-#define IWL49_RX_PHY_FLAGS_ANTENNAE_OFFSET      (4)
-#define IWL49_RX_PHY_FLAGS_ANTENNAE_MASK        (0x70)
-#define IWL49_AGC_DB_MASK                       (0x3f80)        /* MASK(7,13) */
-#define IWL49_AGC_DB_POS                        (7)
-struct iwl4965_rx_non_cfg_phy {
+#define IL49_RX_RES_PHY_CNT 14
+#define IL49_RX_PHY_FLAGS_ANTENNAE_OFFSET       (4)
+#define IL49_RX_PHY_FLAGS_ANTENNAE_MASK (0x70)
+#define IL49_AGC_DB_MASK                        (0x3f80)        /* MASK(7,13) */
+#define IL49_AGC_DB_POS                 (7)
+struct il4965_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];
 } __packed;
 
-
 /*
- * REPLY_RX = 0xc3 (response only, not a command)
+ * N_RX = 0xc3 (response only, not a command)
  * Used only for legacy (non 11n) frames.
  */
-struct iwl_rx_phy_res {
-        u8 non_cfg_phy_cnt;     /* non configurable DSP phy data byte count */
+struct il_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 */
+        __le32 beacon_time_stamp;       /* beacon at on-air rise */
         __le16 phy_flags;       /* general phy flags: band, modulation, ... */
         __le16 channel;         /* channel number */
-        u8 non_cfg_phy_buf[32]; /* for various implementations of non_cfg_phy */
+        u8 non_cfg_phy_buf[32]; /* for various implementations of non_cfg_phy */
         __le32 rate_n_flags;    /* RATE_MCS_* */
         __le16 byte_count;      /* frame's byte-count */
         __le16 frame_time;      /* frame's time on the air */
 } __packed;
 
-struct iwl_rx_mpdu_res_start {
+struct il_rx_mpdu_res_start {
         __le16 byte_count;
         __le16 reserved;
 } __packed;
 
-
 /******************************************************************************
  * (5)
  * Tx Commands & Responses:
  *
- * Driver must place each REPLY_TX command into one of the prioritized Tx
+ * Driver must place each C_TX command into one of the prioritized Tx
  * queues in host DRAM, shared between driver and device (see comments for
  * SCD registers and Tx/Rx Queues).  When the device's Tx scheduler and uCode
  * are preparing to transmit, the device pulls the Tx command over the PCI
@@ -1264,18 +1251,18 @@ struct iwl_rx_mpdu_res_start {
  * uCode handles all timing and protocol related to control frames
  * (RTS/CTS/ACK), based on flags in the Tx command.  uCode and Tx scheduler
  * handle reception of block-acks; uCode updates the host driver via
- * REPLY_COMPRESSED_BA.
+ * N_COMPRESSED_BA.
  *
  * uCode handles retrying Tx when an ACK is expected but not received.
  * This includes trying lower data rates than the one requested in the Tx
- * command, as set up by the REPLY_RATE_SCALE (for 3945) or
- * REPLY_TX_LINK_QUALITY_CMD (4965).
+ * command, as set up by the C_RATE_SCALE (for 3945) or
+ * C_TX_LINK_QUALITY_CMD (4965).
  *
- * Driver sets up transmit power for various rates via REPLY_TX_PWR_TABLE_CMD.
+ * Driver sets up transmit power for various rates via C_TX_PWR_TBL.
  * This command must be executed after every RXON command, before Tx can occur.
  *****************************************************************************/
 
-/* REPLY_TX Tx flags field */
+/* C_TX Tx flags field */
 
 /*
  * 1: Use Request-To-Send protocol before this frame.
@@ -1296,8 +1283,8 @@ struct iwl_rx_mpdu_res_start {
 #define TX_CMD_FLG_ACK_MSK cpu_to_le32(1 << 3)
 
 /* For 4965 devices:
- * 1: Use rate scale table (see REPLY_TX_LINK_QUALITY_CMD).
- *    Tx command's initial_rate_index indicates first rate to try;
+ * 1: Use rate scale table (see C_TX_LINK_QUALITY_CMD).
+ *    Tx command's initial_rate_idx indicates first rate to try;
  *    uCode walks through table for additional Tx attempts.
  * 0: Use Tx rate/MCS from Tx command's rate_n_flags field.
  *    This rate will be used for all Tx attempts; it will not be scaled. */
@@ -1322,7 +1309,7 @@ struct iwl_rx_mpdu_res_start {
 /* 1: uCode overrides sequence control field in MAC header.
  * 0: Driver provides sequence control field in MAC header.
  * Set this for management frames, non-QOS data frames, non-unicast frames,
- * and also in Tx command embedded in REPLY_SCAN_CMD for active scans. */
+ * and also in Tx command embedded in C_SCAN for active scans. */
 #define TX_CMD_FLG_SEQ_CTL_MSK cpu_to_le32(1 << 13)
 
 /* 1: This frame is non-last MPDU; more fragments are coming.
@@ -1349,7 +1336,6 @@ struct iwl_rx_mpdu_res_start {
 /* HCCA-AP - disable duration overwriting. */
 #define TX_CMD_FLG_DUR_MSK cpu_to_le32(1 << 25)
 
-
 /*
  * TX command security control
  */
@@ -1369,10 +1355,10 @@ struct iwl_rx_mpdu_res_start {
 #define TKIP_ICV_LEN 4
 
 /*
- * REPLY_TX = 0x1c (command)
+ * C_TX = 0x1c (command)
  */
 
-struct iwl3945_tx_cmd {
+struct il3945_tx_cmd {
         /*
          * MPDU byte count:
          * MAC header (24/26/30/32 bytes) + 2 bytes pad if 26/30 header size,
@@ -1434,9 +1420,9 @@ struct iwl3945_tx_cmd {
 } __packed;
 
 /*
- * REPLY_TX = 0x1c (response)
+ * C_TX = 0x1c (response)
  */
-struct iwl3945_tx_resp {
+struct il3945_tx_resp {
         u8 failure_rts;
         u8 failure_frame;
         u8 bt_kill_count;
@@ -1445,19 +1431,18 @@ struct iwl3945_tx_resp {
         __le32 status;          /* TX status */
 } __packed;
 
-
 /*
  * 4965 uCode updates these Tx attempt count values in host DRAM.
  * Used for managing Tx retries when expecting block-acks.
  * Driver should set these fields to 0.
  */
-struct iwl_dram_scratch {
+struct il_dram_scratch {
         u8 try_cnt;             /* Tx attempts */
         u8 bt_kill_cnt;         /* Tx attempts blocked by Bluetooth device */
         __le16 reserved;
 } __packed;
 
-struct iwl_tx_cmd {
+struct il_tx_cmd {
         /*
          * MPDU byte count:
          * MAC header (24/26/30/32 bytes) + 2 bytes pad if 26/30 header size,
@@ -1481,7 +1466,7 @@ struct iwl_tx_cmd {
 
         /* uCode may modify this field of the Tx command (in host DRAM!).
          * Driver must also set dram_lsb_ptr and dram_msb_ptr in this cmd. */
-        struct iwl_dram_scratch scratch;
+        struct il_dram_scratch scratch;
 
         /* Rate for *all* Tx attempts, if TX_CMD_FLG_STA_RATE_MSK is cleared. */
         __le32 rate_n_flags;    /* RATE_MCS_* */
@@ -1493,13 +1478,13 @@ struct iwl_tx_cmd {
         u8 sec_ctl;             /* TX_CMD_SEC_* */
 
         /*
-         * Index into rate table (see REPLY_TX_LINK_QUALITY_CMD) for initial
+         * Index into rate table (see C_TX_LINK_QUALITY_CMD) for initial
          * Tx attempt, if TX_CMD_FLG_STA_RATE_MSK is set.  Normally "0" for
          * data frames, this field may be used to selectively reduce initial
          * rate (via non-0 value) for special frames (e.g. management), while
          * still supporting rate scaling for all frames.
          */
-        u8 initial_rate_index;
+        u8 initial_rate_idx;
         u8 reserved;
         u8 key[16];
         __le16 next_frame_flags;
@@ -1628,12 +1613,12 @@ enum {
 };
 
 enum {
-        TX_STATUS_MSK = 0x000000ff,             /* bits 0:7 */
+        TX_STATUS_MSK = 0x000000ff,     /* bits 0:7 */
         TX_STATUS_DELAY_MSK = 0x00000040,
         TX_STATUS_ABORT_MSK = 0x00000080,
         TX_PACKET_MODE_MSK = 0x0000ff00,        /* bits 8:15 */
         TX_FIFO_NUMBER_MSK = 0x00070000,        /* bits 16:18 */
-        TX_RESERVED = 0x00780000,               /* bits 19:22 */
+        TX_RESERVED = 0x00780000,       /* bits 19:22 */
         TX_POWER_PA_DETECT_MSK = 0x7f800000,    /* bits 23:30 */
         TX_ABORT_REQUIRED_MSK = 0x80000000,     /* bits 31:31 */
 };
@@ -1671,7 +1656,7 @@ enum {
 #define AGG_TX_STATE_SEQ_NUM_MSK 0xffff0000
 
 /*
- * REPLY_TX = 0x1c (response)
+ * C_TX = 0x1c (response)
  *
  * This response may be in one of two slightly different formats, indicated
  * by the frame_count field:
@@ -1697,7 +1682,7 @@ struct agg_tx_status {
         __le16 sequence;
 } __packed;
 
-struct iwl4965_tx_resp {
+struct il4965_tx_resp {
         u8 frame_count;         /* 1 no aggregation, >1 aggregation */
         u8 bt_kill_count;       /* # blocked by bluetooth (unused for agg) */
         u8 failure_rts;         /* # failures due to unsuccessful RTS */
@@ -1730,16 +1715,16 @@ struct iwl4965_tx_resp {
          */
         union {
                 __le32 status;
-                struct agg_tx_status agg_status[0]; /* for each agg frame */
+                struct agg_tx_status agg_status[0];     /* for each agg frame */
         } u;
 } __packed;
 
 /*
- * REPLY_COMPRESSED_BA = 0xc5 (response only, not a command)
+ * N_COMPRESSED_BA = 0xc5 (response only, not a command)
  *
  * Reports Block-Acknowledge from recipient station
  */
-struct iwl_compressed_ba_resp {
+struct il_compressed_ba_resp {
         __le32 sta_addr_lo32;
         __le16 sta_addr_hi16;
         __le16 reserved;
@@ -1754,30 +1739,29 @@ struct iwl_compressed_ba_resp {
 } __packed;
 
 /*
- * REPLY_TX_PWR_TABLE_CMD = 0x97 (command, has simple generic response)
+ * C_TX_PWR_TBL = 0x97 (command, has simple generic response)
  *
- * See details under "TXPOWER" in iwl-4965-hw.h.
+ * See details under "TXPOWER" in 4965.h.
  */
 
-struct iwl3945_txpowertable_cmd {
+struct il3945_txpowertable_cmd {
         u8 band;                /* 0: 5 GHz, 1: 2.4 GHz */
         u8 reserved;
         __le16 channel;
-        struct iwl3945_power_per_rate power[IWL_MAX_RATES];
+        struct il3945_power_per_rate power[IL_MAX_RATES];
 } __packed;
 
-struct iwl4965_txpowertable_cmd {
+struct il4965_txpowertable_cmd {
         u8 band;                /* 0: 5 GHz, 1: 2.4 GHz */
         u8 reserved;
         __le16 channel;
-        struct iwl4965_tx_power_db tx_power;
+        struct il4965_tx_power_db tx_power;
 } __packed;
 
-
 /**
- * struct iwl3945_rate_scaling_cmd - Rate Scaling Command & Response
+ * struct il3945_rate_scaling_cmd - Rate Scaling Command & Response
  *
- * REPLY_RATE_SCALE = 0x47 (command, has simple generic response)
+ * C_RATE_SCALE = 0x47 (command, has simple generic response)
  *
  * NOTE: The table of rates passed to the uCode via the
  * RATE_SCALE command sets up the corresponding order of
@@ -1786,22 +1770,21 @@ struct iwl4965_txpowertable_cmd {
  *
  * For example, if you set 9MB (PLCP 0x0f) as the first
  * rate in the rate table, the bit mask for that rate
- * when passed through ofdm_basic_rates on the REPLY_RXON
+ * when passed through ofdm_basic_rates on the C_RXON
  * command would be bit 0 (1 << 0)
  */
-struct iwl3945_rate_scaling_info {
+struct il3945_rate_scaling_info {
         __le16 rate_n_flags;
         u8 try_cnt;
-        u8 next_rate_index;
+        u8 next_rate_idx;
 } __packed;
 
-struct iwl3945_rate_scaling_cmd {
+struct il3945_rate_scaling_cmd {
         u8 table_id;
         u8 reserved[3];
-        struct iwl3945_rate_scaling_info table[IWL_MAX_RATES];
+        struct il3945_rate_scaling_info table[IL_MAX_RATES];
 } __packed;
 
-
 /*RS_NEW_API: only TLC_RTS remains and moved to bit 0 */
 #define  LINK_QUAL_FLAGS_SET_STA_TLC_RTS_MSK    (1 << 0)
 
@@ -1816,28 +1799,27 @@ struct iwl3945_rate_scaling_cmd {
 #define  LINK_QUAL_ANT_B_MSK (1 << 1)
 #define  LINK_QUAL_ANT_MSK   (LINK_QUAL_ANT_A_MSK|LINK_QUAL_ANT_B_MSK)
 
-
 /**
- * struct iwl_link_qual_general_params
+ * struct il_link_qual_general_params
  *
- * Used in REPLY_TX_LINK_QUALITY_CMD
+ * Used in C_TX_LINK_QUALITY_CMD
  */
-struct iwl_link_qual_general_params {
+struct il_link_qual_general_params {
         u8 flags;
 
-        /* No entries at or above this (driver chosen) index contain MIMO */
+        /* No entries at or above this (driver chosen) idx contain MIMO */
         u8 mimo_delimiter;
 
         /* Best single antenna to use for single stream (legacy, SISO). */
         u8 single_stream_ant_msk;       /* LINK_QUAL_ANT_* */
 
         /* Best antennas to use for MIMO (unused for 4965, assumes both). */
-        u8 dual_stream_ant_msk;         /* LINK_QUAL_ANT_* */
+        u8 dual_stream_ant_msk; /* LINK_QUAL_ANT_* */
 
         /*
          * If driver needs to use different initial rates for different
          * EDCA QOS access categories (as implemented by tx fifos 0-3),
-         * this table will set that up, by indicating the indexes in the
+         * this table will set that up, by indicating the idxes in the
          * rs_table[LINK_QUAL_MAX_RETRY_NUM] rate table at which to start.
          * Otherwise, driver should set all entries to 0.
          *
@@ -1845,10 +1827,10 @@ struct iwl_link_qual_general_params {
          * 0 = Background, 1 = Best Effort (normal), 2 = Video, 3 = Voice
          * TX FIFOs above 3 use same value (typically 0) as TX FIFO 3.
          */
-        u8 start_rate_index[LINK_QUAL_AC_NUM];
+        u8 start_rate_idx[LINK_QUAL_AC_NUM];
 } __packed;
 
-#define LINK_QUAL_AGG_TIME_LIMIT_DEF    (4000) /* 4 milliseconds */
+#define LINK_QUAL_AGG_TIME_LIMIT_DEF    (4000)  /* 4 milliseconds */
 #define LINK_QUAL_AGG_TIME_LIMIT_MAX    (8000)
 #define LINK_QUAL_AGG_TIME_LIMIT_MIN    (100)
 
@@ -1861,11 +1843,11 @@ struct iwl_link_qual_general_params {
 #define LINK_QUAL_AGG_FRAME_LIMIT_MIN   (0)
 
 /**
- * struct iwl_link_qual_agg_params
+ * struct il_link_qual_agg_params
  *
- * Used in REPLY_TX_LINK_QUALITY_CMD
+ * Used in C_TX_LINK_QUALITY_CMD
  */
-struct iwl_link_qual_agg_params {
+struct il_link_qual_agg_params {
 
         /*
          *Maximum number of uSec in aggregation.
@@ -1892,9 +1874,9 @@ struct iwl_link_qual_agg_params {
 } __packed;
 
 /*
- * REPLY_TX_LINK_QUALITY_CMD = 0x4e (command, has simple generic response)
+ * C_TX_LINK_QUALITY_CMD = 0x4e (command, has simple generic response)
  *
- * For 4965 devices only; 3945 uses REPLY_RATE_SCALE.
+ * For 4965 devices only; 3945 uses C_RATE_SCALE.
  *
  * Each station in the 4965 device's internal station table has its own table
  * of 16
@@ -1903,13 +1885,13 @@ struct iwl_link_qual_agg_params {
  * one station.
  *
  * NOTE:  Station must already be in 4965 device's station table.
- *        Use REPLY_ADD_STA.
+ *        Use C_ADD_STA.
  *
  * The rate scaling procedures described below work well.  Of course, other
  * procedures are possible, and may work better for particular environments.
  *
  *
- * FILLING THE RATE TABLE
+ * FILLING THE RATE TBL
  *
  * Given a particular initial rate and mode, as determined by the rate
  * scaling algorithm described below, the Linux driver uses the following
@@ -1948,13 +1930,13 @@ struct iwl_link_qual_agg_params {
  * speculative mode as the new current active mode.
  *
  * Each history set contains, separately for each possible rate, data for a
- * sliding window of the 62 most recent tx attempts at that rate.  The data
+ * sliding win of the 62 most recent tx attempts at that rate.  The data
  * includes a shifting bitmap of success(1)/failure(0), and sums of successful
  * and attempted frames, from which the driver can additionally calculate a
  * success ratio (success / attempted) and number of failures
- * (attempted - success), and control the size of the window (attempted).
+ * (attempted - success), and control the size of the win (attempted).
  * The driver uses the bit map to remove successes from the success sum, as
- * the oldest tx attempts fall out of the window.
+ * the oldest tx attempts fall out of the win.
  *
  * When the 4965 device makes multiple tx attempts for a given frame, each
  * attempt might be at a different rate, and have different modulation
@@ -1966,7 +1948,7 @@ struct iwl_link_qual_agg_params {
  *
  * When using block-ack (aggregation), all frames are transmitted at the same
  * rate, since there is no per-attempt acknowledgment from the destination
- * station.  The Tx response struct iwl_tx_resp indicates the Tx rate in
+ * station.  The Tx response struct il_tx_resp indicates the Tx rate in
  * rate_n_flags field.  After receiving a block-ack, the driver can update
  * history for the entire block all at once.
  *
@@ -2016,8 +1998,8 @@ struct iwl_link_qual_agg_params {
  *         good performance; higher rate is sure to have poorer success.
  *
  * 6)  Re-evaluate the rate after each tx frame.  If working with block-
- *     acknowledge, history and statistics may be calculated for the entire
- *     block (including prior history that fits within the history windows),
+ *     acknowledge, history and stats may be calculated for the entire
+ *     block (including prior history that fits within the history wins),
  *     before re-evaluation.
  *
  * FINDING BEST STARTING MODULATION MODE:
@@ -2079,22 +2061,22 @@ struct iwl_link_qual_agg_params {
  * legacy), and then repeat the search process.
  *
  */
-struct iwl_link_quality_cmd {
+struct il_link_quality_cmd {
 
         /* Index of destination/recipient station in uCode's station table */
         u8 sta_id;
         u8 reserved1;
         __le16 control;         /* not used */
-        struct iwl_link_qual_general_params general_params;
-        struct iwl_link_qual_agg_params agg_params;
+        struct il_link_qual_general_params general_params;
+        struct il_link_qual_agg_params agg_params;
 
         /*
-         * Rate info; when using rate-scaling, Tx command's initial_rate_index
-         * specifies 1st Tx rate attempted, via index into this table.
+         * Rate info; when using rate-scaling, Tx command's initial_rate_idx
+         * specifies 1st Tx rate attempted, via idx into this table.
          * 4965 devices works its way through table when retrying Tx.
          */
         struct {
-                __le32 rate_n_flags;    /* RATE_MCS_*, IWL_RATE_* */
+                __le32 rate_n_flags;    /* RATE_MCS_*, RATE_* */
         } rs_table[LINK_QUAL_MAX_RETRY_NUM];
         __le32 reserved2;
 } __packed;
@@ -2117,13 +2099,13 @@ struct iwl_link_quality_cmd {
 #define BT_MAX_KILL_DEF (0x5)
 
 /*
- * REPLY_BT_CONFIG = 0x9b (command, has simple generic response)
+ * C_BT_CONFIG = 0x9b (command, has simple generic response)
  *
  * 3945 and 4965 devices support hardware handshake with Bluetooth device on
  * same platform.  Bluetooth device alerts wireless device when it will Tx;
  * wireless device can delay or kill its own Tx to accommodate.
  */
-struct iwl_bt_cmd {
+struct il_bt_cmd {
         u8 flags;
         u8 lead_time;
         u8 max_kill;
@@ -2132,7 +2114,6 @@ struct iwl_bt_cmd {
         __le32 kill_cts_mask;
 } __packed;
 
-
 /******************************************************************************
  * (6)
  * Spectrum Management (802.11h) Commands, Responses, Notifications:
@@ -2150,18 +2131,18 @@ struct iwl_bt_cmd {
                                  RXON_FILTER_ASSOC_MSK           | \
                                  RXON_FILTER_BCON_AWARE_MSK)
 
-struct iwl_measure_channel {
+struct il_measure_channel {
         __le32 duration;        /* measurement duration in extended beacon
                                  * format */
         u8 channel;             /* channel to measure */
-        u8 type;                /* see enum iwl_measure_type */
+        u8 type;                /* see enum il_measure_type */
         __le16 reserved;
 } __packed;
 
 /*
- * REPLY_SPECTRUM_MEASUREMENT_CMD = 0x74 (command)
+ * C_SPECTRUM_MEASUREMENT = 0x74 (command)
  */
-struct iwl_spectrum_cmd {
+struct il_spectrum_cmd {
         __le16 len;             /* number of bytes starting from token */
         u8 token;               /* token id */
         u8 id;                  /* measurement id -- 0 or 1 */
@@ -2174,13 +2155,13 @@ struct iwl_spectrum_cmd {
         __le32 filter_flags;    /* rxon filter flags */
         __le16 channel_count;   /* minimum 1, maximum 10 */
         __le16 reserved3;
-        struct iwl_measure_channel channels[10];
+        struct il_measure_channel channels[10];
 } __packed;
 
 /*
- * REPLY_SPECTRUM_MEASUREMENT_CMD = 0x74 (response)
+ * C_SPECTRUM_MEASUREMENT = 0x74 (response)
  */
-struct iwl_spectrum_resp {
+struct il_spectrum_resp {
         u8 token;
         u8 id;                  /* id of the prior command replaced, or 0xff */
         __le16 status;          /* 0 - command will be handled
@@ -2188,57 +2169,57 @@ struct iwl_spectrum_resp {
                                  *     measurement) */
 } __packed;
 
-enum iwl_measurement_state {
-        IWL_MEASUREMENT_START = 0,
-        IWL_MEASUREMENT_STOP = 1,
+enum il_measurement_state {
+        IL_MEASUREMENT_START = 0,
+        IL_MEASUREMENT_STOP = 1,
 };
 
-enum iwl_measurement_status {
-        IWL_MEASUREMENT_OK = 0,
-        IWL_MEASUREMENT_CONCURRENT = 1,
-        IWL_MEASUREMENT_CSA_CONFLICT = 2,
-        IWL_MEASUREMENT_TGH_CONFLICT = 3,
+enum il_measurement_status {
+        IL_MEASUREMENT_OK = 0,
+        IL_MEASUREMENT_CONCURRENT = 1,
+        IL_MEASUREMENT_CSA_CONFLICT = 2,
+        IL_MEASUREMENT_TGH_CONFLICT = 3,
         /* 4-5 reserved */
-        IWL_MEASUREMENT_STOPPED = 6,
-        IWL_MEASUREMENT_TIMEOUT = 7,
-        IWL_MEASUREMENT_PERIODIC_FAILED = 8,
+        IL_MEASUREMENT_STOPPED = 6,
+        IL_MEASUREMENT_TIMEOUT = 7,
+        IL_MEASUREMENT_PERIODIC_FAILED = 8,
 };
 
 #define NUM_ELEMENTS_IN_HISTOGRAM 8
 
-struct iwl_measurement_histogram {
+struct il_measurement_histogram {
         __le32 ofdm[NUM_ELEMENTS_IN_HISTOGRAM]; /* in 0.8usec counts */
         __le32 cck[NUM_ELEMENTS_IN_HISTOGRAM];  /* in 1usec counts */
 } __packed;
 
 /* clear channel availability counters */
-struct iwl_measurement_cca_counters {
+struct il_measurement_cca_counters {
         __le32 ofdm;
         __le32 cck;
 } __packed;
 
-enum iwl_measure_type {
-        IWL_MEASURE_BASIC = (1 << 0),
-        IWL_MEASURE_CHANNEL_LOAD = (1 << 1),
-        IWL_MEASURE_HISTOGRAM_RPI = (1 << 2),
-        IWL_MEASURE_HISTOGRAM_NOISE = (1 << 3),
-        IWL_MEASURE_FRAME = (1 << 4),
+enum il_measure_type {
+        IL_MEASURE_BASIC = (1 << 0),
+        IL_MEASURE_CHANNEL_LOAD = (1 << 1),
+        IL_MEASURE_HISTOGRAM_RPI = (1 << 2),
+        IL_MEASURE_HISTOGRAM_NOISE = (1 << 3),
+        IL_MEASURE_FRAME = (1 << 4),
         /* bits 5:6 are reserved */
-        IWL_MEASURE_IDLE = (1 << 7),
+        IL_MEASURE_IDLE = (1 << 7),
 };
 
 /*
- * SPECTRUM_MEASURE_NOTIFICATION = 0x75 (notification only, not a command)
+ * N_SPECTRUM_MEASUREMENT = 0x75 (notification only, not a command)
  */
-struct iwl_spectrum_notification {
+struct il_spectrum_notification {
         u8 id;                  /* measurement id -- 0 or 1 */
         u8 token;
-        u8 channel_index;       /* index in measurement channel list */
+        u8 channel_idx;         /* idx in measurement channel list */
         u8 state;               /* 0 - start, 1 - stop */
         __le32 start_time;      /* lower 32-bits of TSF */
         u8 band;                /* 0 - 5.2GHz, 1 - 2.4GHz */
         u8 channel;
-        u8 type;                /* see enum iwl_measurement_type */
+        u8 type;                /* see enum il_measurement_type */
         u8 reserved1;
         /* NOTE:  cca_ofdm, cca_cck, basic_type, and histogram are only only
          * valid if applicable for measurement type requested. */
@@ -2248,9 +2229,9 @@ struct iwl_spectrum_notification {
         u8 basic_type;          /* 0 - bss, 1 - ofdm preamble, 2 -
                                  * unidentified */
         u8 reserved2[3];
-        struct iwl_measurement_histogram histogram;
+        struct il_measurement_histogram histogram;
         __le32 stop_time;       /* lower 32-bits of TSF */
-        __le32 status;          /* see iwl_measurement_status */
+        __le32 status;          /* see il_measurement_status */
 } __packed;
 
 /******************************************************************************
@@ -2260,10 +2241,10 @@ struct iwl_spectrum_notification {
  *****************************************************************************/
 
 /**
- * struct iwl_powertable_cmd - Power Table Command
+ * struct il_powertable_cmd - Power Table Command
  * @flags: See below:
  *
- * POWER_TABLE_CMD = 0x77 (command, has simple generic response)
+ * C_POWER_TBL = 0x77 (command, has simple generic response)
  *
  * PM allow:
  *   bit 0 - '0' Driver not allow power management
@@ -2290,38 +2271,38 @@ struct iwl_spectrum_notification {
  *              '10' force xtal sleep
  *              '11' Illegal set
  *
- * NOTE: if sleep_interval[SLEEP_INTRVL_TABLE_SIZE-1] > DTIM period then
+ * NOTE: if sleep_interval[SLEEP_INTRVL_TBL_SIZE-1] > DTIM period then
  * ucode assume sleep over DTIM is allowed and we don't need to wake up
  * for every DTIM.
  */
-#define IWL_POWER_VEC_SIZE 5
+#define IL_POWER_VEC_SIZE 5
 
-#define IWL_POWER_DRIVER_ALLOW_SLEEP_MSK        cpu_to_le16(BIT(0))
-#define IWL_POWER_PCI_PM_MSK                    cpu_to_le16(BIT(3))
+#define IL_POWER_DRIVER_ALLOW_SLEEP_MSK cpu_to_le16(BIT(0))
+#define IL_POWER_PCI_PM_MSK                     cpu_to_le16(BIT(3))
 
-struct iwl3945_powertable_cmd {
+struct il3945_powertable_cmd {
         __le16 flags;
         u8 reserved[2];
         __le32 rx_data_timeout;
         __le32 tx_data_timeout;
-        __le32 sleep_interval[IWL_POWER_VEC_SIZE];
+        __le32 sleep_interval[IL_POWER_VEC_SIZE];
 } __packed;
 
-struct iwl_powertable_cmd {
+struct il_powertable_cmd {
         __le16 flags;
-        u8 keep_alive_seconds;          /* 3945 reserved */
-        u8 debug_flags;                 /* 3945 reserved */
+        u8 keep_alive_seconds;  /* 3945 reserved */
+        u8 debug_flags;         /* 3945 reserved */
         __le32 rx_data_timeout;
         __le32 tx_data_timeout;
-        __le32 sleep_interval[IWL_POWER_VEC_SIZE];
+        __le32 sleep_interval[IL_POWER_VEC_SIZE];
         __le32 keep_alive_beacons;
 } __packed;
 
 /*
- * PM_SLEEP_NOTIFICATION = 0x7A (notification only, not a command)
+ * N_PM_SLEEP = 0x7A (notification only, not a command)
  * all devices identical.
  */
-struct iwl_sleep_notification {
+struct il_sleep_notification {
         u8 pm_sleep_mode;
         u8 pm_wakeup_src;
         __le16 reserved;
@@ -2332,23 +2313,23 @@ struct iwl_sleep_notification {
 
 /* Sleep states.  all devices identical. */
 enum {
-        IWL_PM_NO_SLEEP = 0,
-        IWL_PM_SLP_MAC = 1,
-        IWL_PM_SLP_FULL_MAC_UNASSOCIATE = 2,
-        IWL_PM_SLP_FULL_MAC_CARD_STATE = 3,
-        IWL_PM_SLP_PHY = 4,
-        IWL_PM_SLP_REPENT = 5,
-        IWL_PM_WAKEUP_BY_TIMER = 6,
-        IWL_PM_WAKEUP_BY_DRIVER = 7,
-        IWL_PM_WAKEUP_BY_RFKILL = 8,
+        IL_PM_NO_SLEEP = 0,
+        IL_PM_SLP_MAC = 1,
+        IL_PM_SLP_FULL_MAC_UNASSOCIATE = 2,
+        IL_PM_SLP_FULL_MAC_CARD_STATE = 3,
+        IL_PM_SLP_PHY = 4,
+        IL_PM_SLP_REPENT = 5,
+        IL_PM_WAKEUP_BY_TIMER = 6,
+        IL_PM_WAKEUP_BY_DRIVER = 7,
+        IL_PM_WAKEUP_BY_RFKILL = 8,
         /* 3 reserved */
-        IWL_PM_NUM_OF_MODES = 12,
+        IL_PM_NUM_OF_MODES = 12,
 };
 
 /*
- * CARD_STATE_NOTIFICATION = 0xa1 (notification only, not a command)
+ * N_CARD_STATE = 0xa1 (notification only, not a command)
  */
-struct iwl_card_state_notif {
+struct il_card_state_notif {
         __le32 flags;
 } __packed;
 
@@ -2357,11 +2338,11 @@ struct iwl_card_state_notif {
 #define CT_CARD_DISABLED   0x04
 #define RXON_CARD_DISABLED 0x10
 
-struct iwl_ct_kill_config {
-        __le32   reserved;
-        __le32   critical_temperature_M;
-        __le32   critical_temperature_R;
-}  __packed;
+struct il_ct_kill_config {
+        __le32 reserved;
+        __le32 critical_temperature_M;
+        __le32 critical_temperature_R;
+} __packed;
 
 /******************************************************************************
  * (8)
@@ -2373,7 +2354,7 @@ struct iwl_ct_kill_config {
 #define SCAN_CHANNEL_TYPE_ACTIVE  cpu_to_le32(1)
 
 /**
- * struct iwl_scan_channel - entry in REPLY_SCAN_CMD channel table
+ * struct il_scan_channel - entry in C_SCAN channel table
  *
  * One for each channel in the scan list.
  * Each channel can independently select:
@@ -2383,7 +2364,7 @@ struct iwl_ct_kill_config {
  *     quiet_plcp_th, good_CRC_th)
  *
  * To avoid uCode errors, make sure the following are true (see comments
- * under struct iwl_scan_cmd about max_out_time and quiet_time):
+ * under struct il_scan_cmd about max_out_time and quiet_time):
  * 1)  If using passive_dwell (i.e. passive_dwell != 0):
  *     active_dwell <= passive_dwell (< max_out_time if max_out_time != 0)
  * 2)  quiet_time <= active_dwell
@@ -2391,7 +2372,7 @@ struct iwl_ct_kill_config {
  *     passive_dwell < max_out_time
  *     active_dwell < max_out_time
  */
-struct iwl3945_scan_channel {
+struct il3945_scan_channel {
         /*
          * type is defined as:
          * 0:0 1 = active, 0 = passive
@@ -2400,16 +2381,16 @@ struct iwl3945_scan_channel {
          * 5:7 reserved
          */
         u8 type;
-        u8 channel;     /* band is selected by iwl3945_scan_cmd "flags" field */
-        struct iwl3945_tx_power tpc;
+        u8 channel;             /* band is selected by il3945_scan_cmd "flags" field */
+        struct il3945_tx_power tpc;
         __le16 active_dwell;    /* in 1024-uSec TU (time units), typ 5-50 */
         __le16 passive_dwell;   /* in 1024-uSec TU (time units), typ 20-500 */
 } __packed;
 
 /* set number of direct probes u8 type */
-#define IWL39_SCAN_PROBE_MASK(n) ((BIT(n) | (BIT(n) - BIT(1))))
+#define IL39_SCAN_PROBE_MASK(n) ((BIT(n) | (BIT(n) - BIT(1))))
 
-struct iwl_scan_channel {
+struct il_scan_channel {
         /*
          * type is defined as:
          * 0:0 1 = active, 0 = passive
@@ -2418,7 +2399,7 @@ struct iwl_scan_channel {
          * 21:31 reserved
          */
         __le32 type;
-        __le16 channel; /* band is selected by iwl_scan_cmd "flags" field */
+        __le16 channel;         /* band is selected by il_scan_cmd "flags" field */
         u8 tx_gain;             /* gain for analog radio */
         u8 dsp_atten;           /* gain for DSP */
         __le16 active_dwell;    /* in 1024-uSec TU (time units), typ 5-50 */
@@ -2426,17 +2407,17 @@ struct iwl_scan_channel {
 } __packed;
 
 /* set number of direct probes __le32 type */
-#define IWL_SCAN_PROBE_MASK(n)  cpu_to_le32((BIT(n) | (BIT(n) - BIT(1))))
+#define IL_SCAN_PROBE_MASK(n)   cpu_to_le32((BIT(n) | (BIT(n) - BIT(1))))
 
 /**
- * struct iwl_ssid_ie - directed scan network information element
+ * struct il_ssid_ie - directed scan network information element
  *
- * Up to 20 of these may appear in REPLY_SCAN_CMD (Note: Only 4 are in
- * 3945 SCAN api), selected by "type" bit field in struct iwl_scan_channel;
+ * Up to 20 of these may appear in C_SCAN (Note: Only 4 are in
+ * 3945 SCAN api), selected by "type" bit field in struct il_scan_channel;
  * each channel may select different ssids from among the 20 (4) entries.
  * SSID IEs get transmitted in reverse order of entry.
  */
-struct iwl_ssid_ie {
+struct il_ssid_ie {
         u8 id;
         u8 len;
         u8 ssid[32];
@@ -2445,14 +2426,14 @@ struct iwl_ssid_ie {
 #define PROBE_OPTION_MAX_3945           4
 #define PROBE_OPTION_MAX                20
 #define TX_CMD_LIFE_TIME_INFINITE       cpu_to_le32(0xFFFFFFFF)
-#define IWL_GOOD_CRC_TH_DISABLED        0
-#define IWL_GOOD_CRC_TH_DEFAULT         cpu_to_le16(1)
-#define IWL_GOOD_CRC_TH_NEVER           cpu_to_le16(0xffff)
-#define IWL_MAX_SCAN_SIZE 1024
-#define IWL_MAX_CMD_SIZE 4096
+#define IL_GOOD_CRC_TH_DISABLED 0
+#define IL_GOOD_CRC_TH_DEFAULT          cpu_to_le16(1)
+#define IL_GOOD_CRC_TH_NEVER            cpu_to_le16(0xffff)
+#define IL_MAX_SCAN_SIZE 1024
+#define IL_MAX_CMD_SIZE 4096
 
 /*
- * REPLY_SCAN_CMD = 0x80 (command)
+ * C_SCAN = 0x80 (command)
  *
  * The hardware scan command is very powerful; the driver can set it up to
  * maintain (relatively) normal network traffic while doing a scan in the
@@ -2501,10 +2482,10 @@ struct iwl_ssid_ie {
  * Driver must use separate scan commands for 2.4 vs. 5 GHz bands.
  *
  * To avoid uCode errors, see timing restrictions described under
- * struct iwl_scan_channel.
+ * struct il_scan_channel.
  */
 
-struct iwl3945_scan_cmd {
+struct il3945_scan_cmd {
         __le16 len;
         u8 reserved0;
         u8 channel_count;       /* # channels in channel list */
@@ -2525,10 +2506,10 @@ struct iwl3945_scan_cmd {
 
         /* For active scans (set to all-0s for passive scans).
          * Does not include payload.  Must specify Tx rate; no rate scaling. */
-        struct iwl3945_tx_cmd tx_cmd;
+        struct il3945_tx_cmd tx_cmd;
 
         /* For directed active scans (set to all-0s otherwise) */
-        struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX_3945];
+        struct il_ssid_ie direct_scan[PROBE_OPTION_MAX_3945];
 
         /*
          * Probe request frame, followed by channel list.
@@ -2538,17 +2519,17 @@ struct iwl3945_scan_cmd {
          * Number of channels in list is specified by channel_count.
          * Each channel in list is of type:
          *
-         * struct iwl3945_scan_channel channels[0];
+         * struct il3945_scan_channel channels[0];
          *
          * NOTE:  Only one band of channels can be scanned per pass.  You
          * must not mix 2.4GHz channels and 5.2GHz channels, and you must wait
-         * for one scan to complete (i.e. receive SCAN_COMPLETE_NOTIFICATION)
+         * for one scan to complete (i.e. receive N_SCAN_COMPLETE)
          * before requesting another scan.
          */
         u8 data[0];
 } __packed;
 
-struct iwl_scan_cmd {
+struct il_scan_cmd {
         __le16 len;
         u8 reserved0;
         u8 channel_count;       /* # channels in channel list */
@@ -2569,10 +2550,10 @@ struct iwl_scan_cmd {
 
         /* For active scans (set to all-0s for passive scans).
          * Does not include payload.  Must specify Tx rate; no rate scaling. */
-        struct iwl_tx_cmd tx_cmd;
+        struct il_tx_cmd tx_cmd;
 
         /* For directed active scans (set to all-0s otherwise) */
-        struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];
+        struct il_ssid_ie direct_scan[PROBE_OPTION_MAX];
 
         /*
          * Probe request frame, followed by channel list.
@@ -2582,11 +2563,11 @@ struct iwl_scan_cmd {
          * Number of channels in list is specified by channel_count.
          * Each channel in list is of type:
          *
-         * struct iwl_scan_channel channels[0];
+         * struct il_scan_channel channels[0];
          *
          * NOTE:  Only one band of channels can be scanned per pass.  You
          * must not mix 2.4GHz channels and 5.2GHz channels, and you must wait
-         * for one scan to complete (i.e. receive SCAN_COMPLETE_NOTIFICATION)
+         * for one scan to complete (i.e. receive N_SCAN_COMPLETE)
          * before requesting another scan.
          */
         u8 data[0];
@@ -2598,16 +2579,16 @@ struct iwl_scan_cmd {
 #define ABORT_STATUS            0x2
 
 /*
- * REPLY_SCAN_CMD = 0x80 (response)
+ * C_SCAN = 0x80 (response)
  */
-struct iwl_scanreq_notification {
+struct il_scanreq_notification {
         __le32 status;          /* 1: okay, 2: cannot fulfill request */
 } __packed;
 
 /*
- * SCAN_START_NOTIFICATION = 0x82 (notification only, not a command)
+ * N_SCAN_START = 0x82 (notification only, not a command)
  */
-struct iwl_scanstart_notification {
+struct il_scanstart_notification {
         __le32 tsf_low;
         __le32 tsf_high;
         __le32 beacon_timer;
@@ -2620,30 +2601,30 @@ struct iwl_scanstart_notification {
 #define  SCAN_OWNER_STATUS 0x1
 #define  MEASURE_OWNER_STATUS 0x2
 
-#define IWL_PROBE_STATUS_OK             0
-#define IWL_PROBE_STATUS_TX_FAILED      BIT(0)
+#define IL_PROBE_STATUS_OK              0
+#define IL_PROBE_STATUS_TX_FAILED       BIT(0)
 /* error statuses combined with TX_FAILED */
-#define IWL_PROBE_STATUS_FAIL_TTL       BIT(1)
-#define IWL_PROBE_STATUS_FAIL_BT        BIT(2)
+#define IL_PROBE_STATUS_FAIL_TTL        BIT(1)
+#define IL_PROBE_STATUS_FAIL_BT BIT(2)
 
-#define NUMBER_OF_STATISTICS 1  /* first __le32 is good CRC */
+#define NUMBER_OF_STATS 1       /* first __le32 is good CRC */
 /*
- * SCAN_RESULTS_NOTIFICATION = 0x83 (notification only, not a command)
+ * N_SCAN_RESULTS = 0x83 (notification only, not a command)
  */
-struct iwl_scanresults_notification {
+struct il_scanresults_notification {
         u8 channel;
         u8 band;
         u8 probe_status;
-        u8 num_probe_not_sent; /* not enough time to send */
+        u8 num_probe_not_sent;  /* not enough time to send */
         __le32 tsf_low;
         __le32 tsf_high;
-        __le32 statistics[NUMBER_OF_STATISTICS];
+        __le32 stats[NUMBER_OF_STATS];
 } __packed;
 
 /*
- * SCAN_COMPLETE_NOTIFICATION = 0x84 (notification only, not a command)
+ * N_SCAN_COMPLETE = 0x84 (notification only, not a command)
  */
-struct iwl_scancomplete_notification {
+struct il_scancomplete_notification {
         u8 scanned_channels;
         u8 status;
         u8 last_channel;
@@ -2651,50 +2632,49 @@ struct iwl_scancomplete_notification {
         __le32 tsf_high;
 } __packed;
 
-
 /******************************************************************************
  * (9)
  * IBSS/AP Commands and Notifications:
  *
  *****************************************************************************/
 
-enum iwl_ibss_manager {
-        IWL_NOT_IBSS_MANAGER = 0,
-        IWL_IBSS_MANAGER = 1,
+enum il_ibss_manager {
+        IL_NOT_IBSS_MANAGER = 0,
+        IL_IBSS_MANAGER = 1,
 };
 
 /*
- * BEACON_NOTIFICATION = 0x90 (notification only, not a command)
+ * N_BEACON = 0x90 (notification only, not a command)
  */
 
-struct iwl3945_beacon_notif {
-        struct iwl3945_tx_resp beacon_notify_hdr;
+struct il3945_beacon_notif {
+        struct il3945_tx_resp beacon_notify_hdr;
         __le32 low_tsf;
         __le32 high_tsf;
         __le32 ibss_mgr_status;
 } __packed;
 
-struct iwl4965_beacon_notif {
-        struct iwl4965_tx_resp beacon_notify_hdr;
+struct il4965_beacon_notif {
+        struct il4965_tx_resp beacon_notify_hdr;
         __le32 low_tsf;
         __le32 high_tsf;
         __le32 ibss_mgr_status;
 } __packed;
 
 /*
- * REPLY_TX_BEACON = 0x91 (command, has simple generic response)
+ * C_TX_BEACON= 0x91 (command, has simple generic response)
  */
 
-struct iwl3945_tx_beacon_cmd {
-        struct iwl3945_tx_cmd tx;
+struct il3945_tx_beacon_cmd {
+        struct il3945_tx_cmd tx;
         __le16 tim_idx;
         u8 tim_size;
         u8 reserved1;
         struct ieee80211_hdr frame[0];  /* beacon frame */
 } __packed;
 
-struct iwl_tx_beacon_cmd {
-        struct iwl_tx_cmd tx;
+struct il_tx_beacon_cmd {
+        struct il_tx_cmd tx;
         __le16 tim_idx;
         u8 tim_size;
         u8 reserved1;
@@ -2707,7 +2687,7 @@ struct iwl_tx_beacon_cmd {
  *
  *****************************************************************************/
 
-#define IWL_TEMP_CONVERT 260
+#define IL_TEMP_CONVERT 260
 
 #define SUP_RATE_11A_MAX_NUM_CHANNELS  8
 #define SUP_RATE_11B_MAX_NUM_CHANNELS  4
@@ -2727,9 +2707,9 @@ struct rate_histogram {
         } failed;
 } __packed;
 
-/* statistics command response */
+/* stats command response */
 
-struct iwl39_statistics_rx_phy {
+struct iwl39_stats_rx_phy {
         __le32 ina_cnt;
         __le32 fina_cnt;
         __le32 plcp_err;
@@ -2747,7 +2727,7 @@ struct iwl39_statistics_rx_phy {
         __le32 sent_cts_cnt;
 } __packed;
 
-struct iwl39_statistics_rx_non_phy {
+struct iwl39_stats_rx_non_phy {
         __le32 bogus_cts;       /* CTS received when not expecting CTS */
         __le32 bogus_ack;       /* ACK received when not expecting ACK */
         __le32 non_bssid_frames;        /* number of frames with BSSID that
@@ -2758,13 +2738,13 @@ struct iwl39_statistics_rx_non_phy {
                                          * our serving channel */
 } __packed;
 
-struct iwl39_statistics_rx {
-        struct iwl39_statistics_rx_phy ofdm;
-        struct iwl39_statistics_rx_phy cck;
-        struct iwl39_statistics_rx_non_phy general;
+struct iwl39_stats_rx {
+        struct iwl39_stats_rx_phy ofdm;
+        struct iwl39_stats_rx_phy cck;
+        struct iwl39_stats_rx_non_phy general;
 } __packed;
 
-struct iwl39_statistics_tx {
+struct iwl39_stats_tx {
         __le32 preamble_cnt;
         __le32 rx_detected_cnt;
         __le32 bt_prio_defer_cnt;
@@ -2776,31 +2756,31 @@ struct iwl39_statistics_tx {
         __le32 actual_ack_cnt;
 } __packed;
 
-struct statistics_dbg {
+struct stats_dbg {
         __le32 burst_check;
         __le32 burst_count;
         __le32 wait_for_silence_timeout_cnt;
         __le32 reserved[3];
 } __packed;
 
-struct iwl39_statistics_div {
+struct iwl39_stats_div {
         __le32 tx_on_a;
         __le32 tx_on_b;
         __le32 exec_time;
         __le32 probe_time;
 } __packed;
 
-struct iwl39_statistics_general {
+struct iwl39_stats_general {
         __le32 temperature;
-        struct statistics_dbg dbg;
+        struct stats_dbg dbg;
         __le32 sleep_time;
         __le32 slots_out;
         __le32 slots_idle;
         __le32 ttl_timestamp;
-        struct iwl39_statistics_div div;
+        struct iwl39_stats_div div;
 } __packed;
 
-struct statistics_rx_phy {
+struct stats_rx_phy {
         __le32 ina_cnt;
         __le32 fina_cnt;
         __le32 plcp_err;
@@ -2823,7 +2803,7 @@ struct statistics_rx_phy {
         __le32 reserved3;
 } __packed;
 
-struct statistics_rx_ht_phy {
+struct stats_rx_ht_phy {
         __le32 plcp_err;
         __le32 overrun_err;
         __le32 early_overrun_err;
@@ -2838,7 +2818,7 @@ struct statistics_rx_ht_phy {
 
 #define INTERFERENCE_DATA_AVAILABLE      cpu_to_le32(1)
 
-struct statistics_rx_non_phy {
+struct stats_rx_non_phy {
         __le32 bogus_cts;       /* CTS received when not expecting CTS */
         __le32 bogus_ack;       /* ACK received when not expecting ACK */
         __le32 non_bssid_frames;        /* number of frames with BSSID that
@@ -2852,15 +2832,15 @@ struct statistics_rx_non_phy {
         __le32 num_missed_bcon; /* number of missed beacons */
         __le32 adc_rx_saturation_time;  /* count in 0.8us units the time the
                                          * ADC was in saturation */
-        __le32 ina_detection_search_time;/* total time (in 0.8us) searched
-                                          * for INA */
+        __le32 ina_detection_search_time;       /* total time (in 0.8us) searched
+                                                 * for INA */
         __le32 beacon_silence_rssi_a;   /* RSSI silence after beacon frame */
         __le32 beacon_silence_rssi_b;   /* RSSI silence after beacon frame */
         __le32 beacon_silence_rssi_c;   /* RSSI silence after beacon frame */
         __le32 interference_data_flag;  /* flag for interference data
                                          * availability. 1 when data is
                                          * available. */
-        __le32 channel_load;            /* counts RX Enable time in uSec */
+        __le32 channel_load;    /* counts RX Enable time in uSec */
         __le32 dsp_false_alarms;        /* DSP false alarm (both OFDM
                                          * and CCK) counter */
         __le32 beacon_rssi_a;
@@ -2871,28 +2851,28 @@ struct statistics_rx_non_phy {
         __le32 beacon_energy_c;
 } __packed;
 
-struct statistics_rx {
-        struct statistics_rx_phy ofdm;
-        struct statistics_rx_phy cck;
-        struct statistics_rx_non_phy general;
-        struct statistics_rx_ht_phy ofdm_ht;
+struct stats_rx {
+        struct stats_rx_phy ofdm;
+        struct stats_rx_phy cck;
+        struct stats_rx_non_phy general;
+        struct stats_rx_ht_phy ofdm_ht;
 } __packed;
 
 /**
- * struct statistics_tx_power - current tx power
+ * struct stats_tx_power - current tx power
  *
  * @ant_a: current tx power on chain a in 1/2 dB step
  * @ant_b: current tx power on chain b in 1/2 dB step
  * @ant_c: current tx power on chain c in 1/2 dB step
  */
-struct statistics_tx_power {
+struct stats_tx_power {
         u8 ant_a;
         u8 ant_b;
         u8 ant_c;
         u8 reserved;
 } __packed;
 
-struct statistics_tx_non_phy_agg {
+struct stats_tx_non_phy_agg {
         __le32 ba_timeout;
         __le32 ba_reschedule_frames;
         __le32 scd_query_agg_frame_cnt;
@@ -2905,7 +2885,7 @@ struct statistics_tx_non_phy_agg {
         __le32 rx_ba_rsp_cnt;
 } __packed;
 
-struct statistics_tx {
+struct stats_tx {
         __le32 preamble_cnt;
         __le32 rx_detected_cnt;
         __le32 bt_prio_defer_cnt;
@@ -2920,13 +2900,12 @@ struct statistics_tx {
         __le32 burst_abort_missing_next_frame_cnt;
         __le32 cts_timeout_collision;
         __le32 ack_or_ba_timeout_collision;
-        struct statistics_tx_non_phy_agg agg;
+        struct stats_tx_non_phy_agg agg;
 
         __le32 reserved1;
 } __packed;
 
-
-struct statistics_div {
+struct stats_div {
         __le32 tx_on_a;
         __le32 tx_on_b;
         __le32 exec_time;
@@ -2935,14 +2914,14 @@ struct statistics_div {
         __le32 reserved2;
 } __packed;
 
-struct statistics_general_common {
-        __le32 temperature;   /* radio temperature */
-        struct statistics_dbg dbg;
+struct stats_general_common {
+        __le32 temperature;     /* radio temperature */
+        struct stats_dbg dbg;
         __le32 sleep_time;
         __le32 slots_out;
         __le32 slots_idle;
         __le32 ttl_timestamp;
-        struct statistics_div div;
+        struct stats_div div;
         __le32 rx_enable_counter;
         /*
          * num_of_sos_states:
@@ -2952,73 +2931,73 @@ struct statistics_general_common {
         __le32 num_of_sos_states;
 } __packed;
 
-struct statistics_general {
-        struct statistics_general_common common;
+struct stats_general {
+        struct stats_general_common common;
         __le32 reserved2;
         __le32 reserved3;
 } __packed;
 
-#define UCODE_STATISTICS_CLEAR_MSK              (0x1 << 0)
-#define UCODE_STATISTICS_FREQUENCY_MSK          (0x1 << 1)
-#define UCODE_STATISTICS_NARROW_BAND_MSK        (0x1 << 2)
+#define UCODE_STATS_CLEAR_MSK           (0x1 << 0)
+#define UCODE_STATS_FREQUENCY_MSK               (0x1 << 1)
+#define UCODE_STATS_NARROW_BAND_MSK     (0x1 << 2)
 
 /*
- * REPLY_STATISTICS_CMD = 0x9c,
+ * C_STATS = 0x9c,
  * all devices identical.
  *
- * This command triggers an immediate response containing uCode statistics.
- * The response is in the same format as STATISTICS_NOTIFICATION 0x9d, below.
+ * This command triggers an immediate response containing uCode stats.
+ * The response is in the same format as N_STATS 0x9d, below.
  *
  * If the CLEAR_STATS configuration flag is set, uCode will clear its
- * internal copy of the statistics (counters) after issuing the response.
- * This flag does not affect STATISTICS_NOTIFICATIONs after beacons (see below).
+ * internal copy of the stats (counters) after issuing the response.
+ * This flag does not affect N_STATSs after beacons (see below).
  *
  * If the DISABLE_NOTIF configuration flag is set, uCode will not issue
- * STATISTICS_NOTIFICATIONs after received beacons (see below).  This flag
- * does not affect the response to the REPLY_STATISTICS_CMD 0x9c itself.
+ * N_STATSs after received beacons (see below).  This flag
+ * does not affect the response to the C_STATS 0x9c itself.
  */
-#define IWL_STATS_CONF_CLEAR_STATS cpu_to_le32(0x1)     /* see above */
-#define IWL_STATS_CONF_DISABLE_NOTIF cpu_to_le32(0x2)/* see above */
-struct iwl_statistics_cmd {
-        __le32 configuration_flags;     /* IWL_STATS_CONF_* */
+#define IL_STATS_CONF_CLEAR_STATS cpu_to_le32(0x1)      /* see above */
+#define IL_STATS_CONF_DISABLE_NOTIF cpu_to_le32(0x2)    /* see above */
+struct il_stats_cmd {
+        __le32 configuration_flags;     /* IL_STATS_CONF_* */
 } __packed;
 
 /*
- * STATISTICS_NOTIFICATION = 0x9d (notification only, not a command)
+ * N_STATS = 0x9d (notification only, not a command)
  *
  * By default, uCode issues this notification after receiving a beacon
  * while associated.  To disable this behavior, set DISABLE_NOTIF flag in the
- * REPLY_STATISTICS_CMD 0x9c, above.
+ * C_STATS 0x9c, above.
  *
  * Statistics counters continue to increment beacon after beacon, but are
- * cleared when changing channels or when driver issues REPLY_STATISTICS_CMD
+ * cleared when changing channels or when driver issues C_STATS
  * 0x9c with CLEAR_STATS bit set (see above).
  *
- * uCode also issues this notification during scans.  uCode clears statistics
- * appropriately so that each notification contains statistics for only the
+ * uCode also issues this notification during scans.  uCode clears stats
+ * appropriately so that each notification contains stats for only the
  * one channel that has just been scanned.
  */
-#define STATISTICS_REPLY_FLG_BAND_24G_MSK         cpu_to_le32(0x2)
-#define STATISTICS_REPLY_FLG_HT40_MODE_MSK        cpu_to_le32(0x8)
+#define STATS_REPLY_FLG_BAND_24G_MSK         cpu_to_le32(0x2)
+#define STATS_REPLY_FLG_HT40_MODE_MSK        cpu_to_le32(0x8)
 
-struct iwl3945_notif_statistics {
+struct il3945_notif_stats {
         __le32 flag;
-        struct iwl39_statistics_rx rx;
-        struct iwl39_statistics_tx tx;
-        struct iwl39_statistics_general general;
+        struct iwl39_stats_rx rx;
+        struct iwl39_stats_tx tx;
+        struct iwl39_stats_general general;
 } __packed;
 
-struct iwl_notif_statistics {
+struct il_notif_stats {
         __le32 flag;
-        struct statistics_rx rx;
-        struct statistics_tx tx;
-        struct statistics_general general;
+        struct stats_rx rx;
+        struct stats_tx tx;
+        struct stats_general general;
 } __packed;
 
 /*
- * MISSED_BEACONS_NOTIFICATION = 0xa2 (notification only, not a command)
+ * N_MISSED_BEACONS = 0xa2 (notification only, not a command)
  *
- * uCode send MISSED_BEACONS_NOTIFICATION to driver when detect beacon missed
+ * uCode send N_MISSED_BEACONS to driver when detect beacon missed
  * in regardless of how many missed beacons, which mean when driver receive the
  * notification, inside the command, it can find all the beacons information
  * which include number of total missed beacons, number of consecutive missed
@@ -3035,18 +3014,17 @@ struct iwl_notif_statistics {
  *
  */
 
-#define IWL_MISSED_BEACON_THRESHOLD_MIN (1)
-#define IWL_MISSED_BEACON_THRESHOLD_DEF (5)
-#define IWL_MISSED_BEACON_THRESHOLD_MAX IWL_MISSED_BEACON_THRESHOLD_DEF
+#define IL_MISSED_BEACON_THRESHOLD_MIN  (1)
+#define IL_MISSED_BEACON_THRESHOLD_DEF  (5)
+#define IL_MISSED_BEACON_THRESHOLD_MAX  IL_MISSED_BEACON_THRESHOLD_DEF
 
-struct iwl_missed_beacon_notif {
+struct il_missed_beacon_notif {
         __le32 consecutive_missed_beacons;
         __le32 total_missed_becons;
         __le32 num_expected_beacons;
         __le32 num_recvd_beacons;
 } __packed;
 
-
 /******************************************************************************
  * (11)
  * Rx Calibration Commands:
@@ -3062,7 +3040,7 @@ struct iwl_missed_beacon_notif {
  *****************************************************************************/
 
 /**
- * SENSITIVITY_CMD = 0xa8 (command, has simple generic response)
+ * C_SENSITIVITY = 0xa8 (command, has simple generic response)
  *
  * This command sets up the Rx signal detector for a sensitivity level that
  * is high enough to lock onto all signals within the associated network,
@@ -3076,12 +3054,12 @@ struct iwl_missed_beacon_notif {
  * time listening, not transmitting).  Driver must adjust sensitivity so that
  * the ratio of actual false alarms to actual Rx time falls within this range.
  *
- * While associated, uCode delivers STATISTICS_NOTIFICATIONs after each
+ * While associated, uCode delivers N_STATSs after each
  * received beacon.  These provide information to the driver to analyze the
- * sensitivity.  Don't analyze statistics that come in from scanning, or any
- * other non-associated-network source.  Pertinent statistics include:
+ * sensitivity.  Don't analyze stats that come in from scanning, or any
+ * other non-associated-network source.  Pertinent stats include:
  *
- * From "general" statistics (struct statistics_rx_non_phy):
+ * From "general" stats (struct stats_rx_non_phy):
  *
  * (beacon_energy_[abc] & 0x0FF00) >> 8 (unsigned, higher value is lower level)
  *   Measure of energy of desired signal.  Used for establishing a level
@@ -3094,7 +3072,7 @@ struct iwl_missed_beacon_notif {
  *   uSecs of actual Rx time during beacon period (varies according to
  *   how much time was spent transmitting).
  *
- * From "cck" and "ofdm" statistics (struct statistics_rx_phy), separately:
+ * From "cck" and "ofdm" stats (struct stats_rx_phy), separately:
  *
  * false_alarm_cnt
  *   Signal locks abandoned early (before phy-level header).
@@ -3111,15 +3089,15 @@ struct iwl_missed_beacon_notif {
  *
  * Total number of false alarms = false_alarms + plcp_errs
  *
- * For OFDM, adjust the following table entries in struct iwl_sensitivity_cmd
+ * For OFDM, adjust the following table entries in struct il_sensitivity_cmd
  * (notice that the start points for OFDM are at or close to settings for
  * maximum sensitivity):
  *
  *                                             START  /  MIN  /  MAX
- *   HD_AUTO_CORR32_X1_TH_ADD_MIN_INDEX          90   /   85  /  120
- *   HD_AUTO_CORR32_X1_TH_ADD_MIN_MRC_INDEX     170   /  170  /  210
- *   HD_AUTO_CORR32_X4_TH_ADD_MIN_INDEX         105   /  105  /  140
- *   HD_AUTO_CORR32_X4_TH_ADD_MIN_MRC_INDEX     220   /  220  /  270
+ *   HD_AUTO_CORR32_X1_TH_ADD_MIN_IDX          90   /   85  /  120
+ *   HD_AUTO_CORR32_X1_TH_ADD_MIN_MRC_IDX     170   /  170  /  210
+ *   HD_AUTO_CORR32_X4_TH_ADD_MIN_IDX         105   /  105  /  140
+ *   HD_AUTO_CORR32_X4_TH_ADD_MIN_MRC_IDX     220   /  220  /  270
  *
  *   If actual rate of OFDM false alarms (+ plcp_errors) is too high
  *   (greater than 50 for each 204.8 msecs listening), reduce sensitivity
@@ -3152,30 +3130,30 @@ struct iwl_missed_beacon_notif {
  *        Reset this to 0 at the first beacon period that falls within the
  *        "good" range (5 to 50 false alarms per 204.8 milliseconds rx).
  *
- * Then, adjust the following CCK table entries in struct iwl_sensitivity_cmd
+ * Then, adjust the following CCK table entries in struct il_sensitivity_cmd
  * (notice that the start points for CCK are at maximum sensitivity):
  *
  *                                             START  /  MIN  /  MAX
- *   HD_AUTO_CORR40_X4_TH_ADD_MIN_INDEX         125   /  125  /  200
- *   HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_INDEX     200   /  200  /  400
- *   HD_MIN_ENERGY_CCK_DET_INDEX                100   /    0  /  100
+ *   HD_AUTO_CORR40_X4_TH_ADD_MIN_IDX         125   /  125  /  200
+ *   HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_IDX     200   /  200  /  400
+ *   HD_MIN_ENERGY_CCK_DET_IDX                100   /    0  /  100
  *
  *   If actual rate of CCK false alarms (+ plcp_errors) is too high
  *   (greater than 50 for each 204.8 msecs listening), method for reducing
  *   sensitivity is:
  *
- *   1)  *Add* 3 to value in HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_INDEX,
+ *   1)  *Add* 3 to value in HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_IDX,
  *       up to max 400.
  *
- *   2)  If current value in HD_AUTO_CORR40_X4_TH_ADD_MIN_INDEX is < 160,
+ *   2)  If current value in HD_AUTO_CORR40_X4_TH_ADD_MIN_IDX is < 160,
  *       sensitivity has been reduced a significant amount; bring it up to
  *       a moderate 161.  Otherwise, *add* 3, up to max 200.
  *
- *   3)  a)  If current value in HD_AUTO_CORR40_X4_TH_ADD_MIN_INDEX is > 160,
+ *   3)  a)  If current value in HD_AUTO_CORR40_X4_TH_ADD_MIN_IDX is > 160,
  *       sensitivity has been reduced only a moderate or small amount;
- *       *subtract* 2 from value in HD_MIN_ENERGY_CCK_DET_INDEX,
+ *       *subtract* 2 from value in HD_MIN_ENERGY_CCK_DET_IDX,
  *       down to min 0.  Otherwise (if gain has been significantly reduced),
- *       don't change the HD_MIN_ENERGY_CCK_DET_INDEX value.
+ *       don't change the HD_MIN_ENERGY_CCK_DET_IDX value.
  *
  *       b)  Save a snapshot of the "silence reference".
  *
@@ -3191,13 +3169,13 @@ struct iwl_missed_beacon_notif {
  *
  *   Method for increasing sensitivity:
  *
- *   1)  *Subtract* 3 from value in HD_AUTO_CORR40_X4_TH_ADD_MIN_INDEX,
+ *   1)  *Subtract* 3 from value in HD_AUTO_CORR40_X4_TH_ADD_MIN_IDX,
  *       down to min 125.
  *
- *   2)  *Subtract* 3 from value in HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_INDEX,
+ *   2)  *Subtract* 3 from value in HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_IDX,
  *       down to min 200.
  *
- *   3)  *Add* 2 to value in HD_MIN_ENERGY_CCK_DET_INDEX, up to max 100.
+ *   3)  *Add* 2 to value in HD_MIN_ENERGY_CCK_DET_IDX, up to max 100.
  *
  *   If actual rate of CCK false alarms (+ plcp_errors) is within good range
  *   (between 5 and 50 for each 204.8 msecs listening):
@@ -3206,57 +3184,56 @@ struct iwl_missed_beacon_notif {
  *
  *   2)  If previous beacon had too many CCK false alarms (+ plcp_errors),
  *       give some extra margin to energy threshold by *subtracting* 8
- *       from value in HD_MIN_ENERGY_CCK_DET_INDEX.
+ *       from value in HD_MIN_ENERGY_CCK_DET_IDX.
  *
  *   For all cases (too few, too many, good range), make sure that the CCK
  *   detection threshold (energy) is below the energy level for robust
  *   detection over the past 10 beacon periods, the "Max cck energy".
  *   Lower values mean higher energy; this means making sure that the value
- *   in HD_MIN_ENERGY_CCK_DET_INDEX is at or *above* "Max cck energy".
+ *   in HD_MIN_ENERGY_CCK_DET_IDX is at or *above* "Max cck energy".
  *
  */
 
 /*
- * Table entries in SENSITIVITY_CMD (struct iwl_sensitivity_cmd)
- */
-#define HD_TABLE_SIZE  (11)     /* number of entries */
-#define HD_MIN_ENERGY_CCK_DET_INDEX                 (0) /* table indexes */
-#define HD_MIN_ENERGY_OFDM_DET_INDEX                (1)
-#define HD_AUTO_CORR32_X1_TH_ADD_MIN_INDEX          (2)
-#define HD_AUTO_CORR32_X1_TH_ADD_MIN_MRC_INDEX      (3)
-#define HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_INDEX      (4)
-#define HD_AUTO_CORR32_X4_TH_ADD_MIN_INDEX          (5)
-#define HD_AUTO_CORR32_X4_TH_ADD_MIN_MRC_INDEX      (6)
-#define HD_BARKER_CORR_TH_ADD_MIN_INDEX             (7)
-#define HD_BARKER_CORR_TH_ADD_MIN_MRC_INDEX         (8)
-#define HD_AUTO_CORR40_X4_TH_ADD_MIN_INDEX          (9)
-#define HD_OFDM_ENERGY_TH_IN_INDEX                  (10)
-
-/* Control field in struct iwl_sensitivity_cmd */
-#define SENSITIVITY_CMD_CONTROL_DEFAULT_TABLE   cpu_to_le16(0)
-#define SENSITIVITY_CMD_CONTROL_WORK_TABLE      cpu_to_le16(1)
+ * Table entries in C_SENSITIVITY (struct il_sensitivity_cmd)
+ */
+#define HD_TBL_SIZE  (11)       /* number of entries */
+#define HD_MIN_ENERGY_CCK_DET_IDX                 (0)   /* table idxes */
+#define HD_MIN_ENERGY_OFDM_DET_IDX                (1)
+#define HD_AUTO_CORR32_X1_TH_ADD_MIN_IDX          (2)
+#define HD_AUTO_CORR32_X1_TH_ADD_MIN_MRC_IDX      (3)
+#define HD_AUTO_CORR40_X4_TH_ADD_MIN_MRC_IDX      (4)
+#define HD_AUTO_CORR32_X4_TH_ADD_MIN_IDX          (5)
+#define HD_AUTO_CORR32_X4_TH_ADD_MIN_MRC_IDX      (6)
+#define HD_BARKER_CORR_TH_ADD_MIN_IDX             (7)
+#define HD_BARKER_CORR_TH_ADD_MIN_MRC_IDX         (8)
+#define HD_AUTO_CORR40_X4_TH_ADD_MIN_IDX          (9)
+#define HD_OFDM_ENERGY_TH_IN_IDX                  (10)
+
+/* Control field in struct il_sensitivity_cmd */
+#define C_SENSITIVITY_CONTROL_DEFAULT_TBL       cpu_to_le16(0)
+#define C_SENSITIVITY_CONTROL_WORK_TBL  cpu_to_le16(1)
 
 /**
- * struct iwl_sensitivity_cmd
+ * struct il_sensitivity_cmd
  * @control:  (1) updates working table, (0) updates default table
- * @table:  energy threshold values, use HD_* as index into table
+ * @table:  energy threshold values, use HD_* as idx into table
  *
  * Always use "1" in "control" to update uCode's working table and DSP.
  */
-struct iwl_sensitivity_cmd {
-        __le16 control;                 /* always use "1" */
-        __le16 table[HD_TABLE_SIZE];    /* use HD_* as index */
+struct il_sensitivity_cmd {
+        __le16 control;         /* always use "1" */
+        __le16 table[HD_TBL_SIZE];      /* use HD_* as idx */
 } __packed;
 
-
 /**
- * REPLY_PHY_CALIBRATION_CMD = 0xb0 (command, has simple generic response)
+ * C_PHY_CALIBRATION = 0xb0 (command, has simple generic response)
  *
  * This command sets the relative gains of 4965 device's 3 radio receiver chains.
  *
  * After the first association, driver should accumulate signal and noise
- * statistics from the STATISTICS_NOTIFICATIONs that follow the first 20
- * beacons from the associated network (don't collect statistics that come
+ * stats from the N_STATSs that follow the first 20
+ * beacons from the associated network (don't collect stats that come
  * in from scanning, or any other non-network source).
  *
  * DISCONNECTED ANTENNA:
@@ -3264,7 +3241,7 @@ struct iwl_sensitivity_cmd {
  * Driver should determine which antennas are actually connected, by comparing
  * average beacon signal levels for the 3 Rx chains.  Accumulate (add) the
  * following values over 20 beacons, one accumulator for each of the chains
- * a/b/c, from struct statistics_rx_non_phy:
+ * a/b/c, from struct stats_rx_non_phy:
  *
  * beacon_rssi_[abc] & 0x0FF (unsigned, units in dB)
  *
@@ -3283,7 +3260,7 @@ struct iwl_sensitivity_cmd {
  * to antennas, see above) for gain, by comparing the average signal levels
  * detected during the silence after each beacon (background noise).
  * Accumulate (add) the following values over 20 beacons, one accumulator for
- * each of the chains a/b/c, from struct statistics_rx_non_phy:
+ * each of the chains a/b/c, from struct stats_rx_non_phy:
  *
  * beacon_silence_rssi_[abc] & 0x0FF (unsigned, units in dB)
  *
@@ -3294,7 +3271,7 @@ struct iwl_sensitivity_cmd {
  * (accum_noise[i] - accum_noise[reference]) / 30
  *
  * The "30" adjusts the dB in the 20 accumulated samples to units of 1.5 dB.
- * For use in diff_gain_[abc] fields of struct iwl_calibration_cmd, the
+ * For use in diff_gain_[abc] fields of struct il_calibration_cmd, the
  * driver should limit the difference results to a range of 0-3 (0-4.5 dB),
  * and set bit 2 to indicate "reduce gain".  The value for the reference
  * (weakest) chain should be "0".
@@ -3306,24 +3283,24 @@ struct iwl_sensitivity_cmd {
 
 /* Phy calibration command for series */
 /* The default calibrate table size if not specified by firmware */
-#define IWL_DEFAULT_STANDARD_PHY_CALIBRATE_TBL_SIZE     18
+#define IL_DEFAULT_STANDARD_PHY_CALIBRATE_TBL_SIZE      18
 enum {
-        IWL_PHY_CALIBRATE_DIFF_GAIN_CMD         = 7,
-        IWL_MAX_STANDARD_PHY_CALIBRATE_TBL_SIZE = 19,
+        IL_PHY_CALIBRATE_DIFF_GAIN_CMD = 7,
+        IL_MAX_STANDARD_PHY_CALIBRATE_TBL_SIZE = 19,
 };
 
-#define IWL_MAX_PHY_CALIBRATE_TBL_SIZE          (253)
+#define IL_MAX_PHY_CALIBRATE_TBL_SIZE           (253)
 
-struct iwl_calib_hdr {
+struct il_calib_hdr {
         u8 op_code;
         u8 first_group;
         u8 groups_num;
         u8 data_valid;
 } __packed;
 
-/* IWL_PHY_CALIBRATE_DIFF_GAIN_CMD (7) */
-struct iwl_calib_diff_gain_cmd {
-        struct iwl_calib_hdr hdr;
+/* IL_PHY_CALIBRATE_DIFF_GAIN_CMD (7) */
+struct il_calib_diff_gain_cmd {
+        struct il_calib_hdr hdr;
         s8 diff_gain_a;         /* see above */
         s8 diff_gain_b;
         s8 diff_gain_c;
@@ -3338,12 +3315,12 @@ struct iwl_calib_diff_gain_cmd {
 
 /*
  * LEDs Command & Response
- * REPLY_LEDS_CMD = 0x48 (command, has simple generic response)
+ * C_LEDS = 0x48 (command, has simple generic response)
  *
  * For each of 3 possible LEDs (Activity/Link/Tech, selected by "id" field),
  * this command turns it on or off, or sets up a periodic blinking cycle.
  */
-struct iwl_led_cmd {
+struct il_led_cmd {
         __le32 interval;        /* "interval" in uSec */
         u8 id;                  /* 1: Activity, 2: Link, 3: Tech */
         u8 off;                 /* # intervals off while blinking;
@@ -3353,14 +3330,15 @@ struct iwl_led_cmd {
         u8 reserved;
 } __packed;
 
-
 /******************************************************************************
  * (13)
  * Union of all expected notifications/responses:
  *
  *****************************************************************************/
 
-struct iwl_rx_packet {
+#define IL_RX_FRAME_SIZE_MSK    0x00003fff
+
+struct il_rx_pkt {
         /*
          * The first 4 bytes of the RX frame header contain both the RX frame
          * size and some flags.
@@ -3372,27 +3350,27 @@ struct iwl_rx_packet {
          * 13-00: RX frame size
          */
         __le32 len_n_flags;
-        struct iwl_cmd_header hdr;
+        struct il_cmd_header hdr;
         union {
-                struct iwl3945_rx_frame rx_frame;
-                struct iwl3945_tx_resp tx_resp;
-                struct iwl3945_beacon_notif beacon_status;
-
-                struct iwl_alive_resp alive_frame;
-                struct iwl_spectrum_notification spectrum_notif;
-                struct iwl_csa_notification csa_notif;
-                struct iwl_error_resp err_resp;
-                struct iwl_card_state_notif card_state_notif;
-                struct iwl_add_sta_resp add_sta;
-                struct iwl_rem_sta_resp rem_sta;
-                struct iwl_sleep_notification sleep_notif;
-                struct iwl_spectrum_resp spectrum;
-                struct iwl_notif_statistics stats;
-                struct iwl_compressed_ba_resp compressed_ba;
-                struct iwl_missed_beacon_notif missed_beacon;
+                struct il3945_rx_frame rx_frame;
+                struct il3945_tx_resp tx_resp;
+                struct il3945_beacon_notif beacon_status;
+
+                struct il_alive_resp alive_frame;
+                struct il_spectrum_notification spectrum_notif;
+                struct il_csa_notification csa_notif;
+                struct il_error_resp err_resp;
+                struct il_card_state_notif card_state_notif;
+                struct il_add_sta_resp add_sta;
+                struct il_rem_sta_resp rem_sta;
+                struct il_sleep_notification sleep_notif;
+                struct il_spectrum_resp spectrum;
+                struct il_notif_stats stats;
+                struct il_compressed_ba_resp compressed_ba;
+                struct il_missed_beacon_notif missed_beacon;
                 __le32 status;
                 u8 raw[0];
         } u;
 } __packed;
 
-#endif                          /* __iwl_legacy_commands_h__ */
+#endif /* __il_commands_h__ */
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
new file mode 100644
index 000000000000..881ba043770a
--- /dev/null
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -0,0 +1,5706 @@
+/******************************************************************************
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2011 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:
+ *  Intel Linux Wireless <ilw@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/etherdevice.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/types.h>
+#include <linux/lockdep.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+#include <net/mac80211.h>
+
+#include "common.h"
+
+const char *
+il_get_cmd_string(u8 cmd)
+{
+        switch (cmd) {
+                IL_CMD(N_ALIVE);
+                IL_CMD(N_ERROR);
+                IL_CMD(C_RXON);
+                IL_CMD(C_RXON_ASSOC);
+                IL_CMD(C_QOS_PARAM);
+                IL_CMD(C_RXON_TIMING);
+                IL_CMD(C_ADD_STA);
+                IL_CMD(C_REM_STA);
+                IL_CMD(C_WEPKEY);
+                IL_CMD(N_3945_RX);
+                IL_CMD(C_TX);
+                IL_CMD(C_RATE_SCALE);
+                IL_CMD(C_LEDS);
+                IL_CMD(C_TX_LINK_QUALITY_CMD);
+                IL_CMD(C_CHANNEL_SWITCH);
+                IL_CMD(N_CHANNEL_SWITCH);
+                IL_CMD(C_SPECTRUM_MEASUREMENT);
+                IL_CMD(N_SPECTRUM_MEASUREMENT);
+                IL_CMD(C_POWER_TBL);
+                IL_CMD(N_PM_SLEEP);
+                IL_CMD(N_PM_DEBUG_STATS);
+                IL_CMD(C_SCAN);
+                IL_CMD(C_SCAN_ABORT);
+                IL_CMD(N_SCAN_START);
+                IL_CMD(N_SCAN_RESULTS);
+                IL_CMD(N_SCAN_COMPLETE);
+                IL_CMD(N_BEACON);
+                IL_CMD(C_TX_BEACON);
+                IL_CMD(C_TX_PWR_TBL);
+                IL_CMD(C_BT_CONFIG);
+                IL_CMD(C_STATS);
+                IL_CMD(N_STATS);
+                IL_CMD(N_CARD_STATE);
+                IL_CMD(N_MISSED_BEACONS);
+                IL_CMD(C_CT_KILL_CONFIG);
+                IL_CMD(C_SENSITIVITY);
+                IL_CMD(C_PHY_CALIBRATION);
+                IL_CMD(N_RX_PHY);
+                IL_CMD(N_RX_MPDU);
+                IL_CMD(N_RX);
+                IL_CMD(N_COMPRESSED_BA);
+        default:
+                return "UNKNOWN";
+
+        }
+}
+EXPORT_SYMBOL(il_get_cmd_string);
+
+#define HOST_COMPLETE_TIMEOUT (HZ / 2)
+
+static void
+il_generic_cmd_callback(struct il_priv *il, struct il_device_cmd *cmd,
+                        struct il_rx_pkt *pkt)
+{
+        if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {
+                IL_ERR("Bad return from %s (0x%08X)\n",
+                       il_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
+                return;
+        }
+#ifdef CONFIG_IWLEGACY_DEBUG
+        switch (cmd->hdr.cmd) {
+        case C_TX_LINK_QUALITY_CMD:
+        case C_SENSITIVITY:
+                D_HC_DUMP("back from %s (0x%08X)\n",
+                          il_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
+                break;
+        default:
+                D_HC("back from %s (0x%08X)\n", il_get_cmd_string(cmd->hdr.cmd),
+                     pkt->hdr.flags);
+        }
+#endif
+}
+
+static int
+il_send_cmd_async(struct il_priv *il, struct il_host_cmd *cmd)
+{
+        int ret;
+
+        BUG_ON(!(cmd->flags & CMD_ASYNC));
+
+        /* An asynchronous command can not expect an SKB to be set. */
+        BUG_ON(cmd->flags & CMD_WANT_SKB);
+
+        /* Assign a generic callback if one is not provided */
+        if (!cmd->callback)
+                cmd->callback = il_generic_cmd_callback;
+
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                return -EBUSY;
+
+        ret = il_enqueue_hcmd(il, cmd);
+        if (ret < 0) {
+                IL_ERR("Error sending %s: enqueue_hcmd failed: %d\n",
+                       il_get_cmd_string(cmd->id), ret);
+                return ret;
+        }
+        return 0;
+}
+
+int
+il_send_cmd_sync(struct il_priv *il, struct il_host_cmd *cmd)
+{
+        int cmd_idx;
+        int ret;
+
+        lockdep_assert_held(&il->mutex);
+
+        BUG_ON(cmd->flags & CMD_ASYNC);
+
+        /* A synchronous command can not have a callback set. */
+        BUG_ON(cmd->callback);
+
+        D_INFO("Attempting to send sync command %s\n",
+               il_get_cmd_string(cmd->id));
+
+        set_bit(S_HCMD_ACTIVE, &il->status);
+        D_INFO("Setting HCMD_ACTIVE for command %s\n",
+               il_get_cmd_string(cmd->id));
+
+        cmd_idx = il_enqueue_hcmd(il, cmd);
+        if (cmd_idx < 0) {
+                ret = cmd_idx;
+                IL_ERR("Error sending %s: enqueue_hcmd failed: %d\n",
+                       il_get_cmd_string(cmd->id), ret);
+                goto out;
+        }
+
+        ret = wait_event_timeout(il->wait_command_queue,
+                                 !test_bit(S_HCMD_ACTIVE, &il->status),
+                                 HOST_COMPLETE_TIMEOUT);
+        if (!ret) {
+                if (test_bit(S_HCMD_ACTIVE, &il->status)) {
+                        IL_ERR("Error sending %s: time out after %dms.\n",
+                               il_get_cmd_string(cmd->id),
+                               jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
+
+                        clear_bit(S_HCMD_ACTIVE, &il->status);
+                        D_INFO("Clearing HCMD_ACTIVE for command %s\n",
+                               il_get_cmd_string(cmd->id));
+                        ret = -ETIMEDOUT;
+                        goto cancel;
+                }
+        }
+
+        if (test_bit(S_RF_KILL_HW, &il->status)) {
+                IL_ERR("Command %s aborted: RF KILL Switch\n",
+                       il_get_cmd_string(cmd->id));
+                ret = -ECANCELED;
+                goto fail;
+        }
+        if (test_bit(S_FW_ERROR, &il->status)) {
+                IL_ERR("Command %s failed: FW Error\n",
+                       il_get_cmd_string(cmd->id));
+                ret = -EIO;
+                goto fail;
+        }
+        if ((cmd->flags & CMD_WANT_SKB) && !cmd->reply_page) {
+                IL_ERR("Error: Response NULL in '%s'\n",
+                       il_get_cmd_string(cmd->id));
+                ret = -EIO;
+                goto cancel;
+        }
+
+        ret = 0;
+        goto out;
+
+cancel:
+        if (cmd->flags & CMD_WANT_SKB) {
+                /*
+                 * 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).
+                 */
+                il->txq[il->cmd_queue].meta[cmd_idx].flags &= ~CMD_WANT_SKB;
+        }
+fail:
+        if (cmd->reply_page) {
+                il_free_pages(il, cmd->reply_page);
+                cmd->reply_page = 0;
+        }
+out:
+        return ret;
+}
+EXPORT_SYMBOL(il_send_cmd_sync);
+
+int
+il_send_cmd(struct il_priv *il, struct il_host_cmd *cmd)
+{
+        if (cmd->flags & CMD_ASYNC)
+                return il_send_cmd_async(il, cmd);
+
+        return il_send_cmd_sync(il, cmd);
+}
+EXPORT_SYMBOL(il_send_cmd);
+
+int
+il_send_cmd_pdu(struct il_priv *il, u8 id, u16 len, const void *data)
+{
+        struct il_host_cmd cmd = {
+                .id = id,
+                .len = len,
+                .data = data,
+        };
+
+        return il_send_cmd_sync(il, &cmd);
+}
+EXPORT_SYMBOL(il_send_cmd_pdu);
+
+int
+il_send_cmd_pdu_async(struct il_priv *il, u8 id, u16 len, const void *data,
+                      void (*callback) (struct il_priv *il,
+                                        struct il_device_cmd *cmd,
+                                        struct il_rx_pkt *pkt))
+{
+        struct il_host_cmd cmd = {
+                .id = id,
+                .len = len,
+                .data = data,
+        };
+
+        cmd.flags |= CMD_ASYNC;
+        cmd.callback = callback;
+
+        return il_send_cmd_async(il, &cmd);
+}
+EXPORT_SYMBOL(il_send_cmd_pdu_async);
+
+/* default: IL_LED_BLINK(0) using blinking idx table */
+static int led_mode;
+module_param(led_mode, int, S_IRUGO);
+MODULE_PARM_DESC(led_mode,
+                 "0=system default, " "1=On(RF On)/Off(RF Off), 2=blinking");
+
+/* Throughput           OFF time(ms)    ON time (ms)
+ *      >300                    25              25
+ *      >200 to 300             40              40
+ *      >100 to 200             55              55
+ *      >70 to 100              65              65
+ *      >50 to 70               75              75
+ *      >20 to 50               85              85
+ *      >10 to 20               95              95
+ *      >5 to 10                110             110
+ *      >1 to 5                 130             130
+ *      >0 to 1                 167             167
+ *      <=0                                     SOLID ON
+ */
+static const struct ieee80211_tpt_blink il_blink[] = {
+        {.throughput = 0,               .blink_time = 334},
+        {.throughput = 1 * 1024 - 1,    .blink_time = 260},
+        {.throughput = 5 * 1024 - 1,    .blink_time = 220},
+        {.throughput = 10 * 1024 - 1,   .blink_time = 190},
+        {.throughput = 20 * 1024 - 1,   .blink_time = 170},
+        {.throughput = 50 * 1024 - 1,   .blink_time = 150},
+        {.throughput = 70 * 1024 - 1,   .blink_time = 130},
+        {.throughput = 100 * 1024 - 1,  .blink_time = 110},
+        {.throughput = 200 * 1024 - 1,  .blink_time = 80},
+        {.throughput = 300 * 1024 - 1,  .blink_time = 50},
+};
+
+/*
+ * Adjust led blink rate to compensate on a MAC Clock difference on every HW
+ * Led blink rate analysis showed an average deviation of 0% on 3945,
+ * 5% on 4965 HW.
+ * Need to compensate on the led on/off time per HW according to the deviation
+ * to achieve the desired led frequency
+ * The calculation is: (100-averageDeviation)/100 * blinkTime
+ * For code efficiency the calculation will be:
+ *     compensation = (100 - averageDeviation) * 64 / 100
+ *     NewBlinkTime = (compensation * BlinkTime) / 64
+ */
+static inline u8
+il_blink_compensation(struct il_priv *il, u8 time, u16 compensation)
+{
+        if (!compensation) {
+                IL_ERR("undefined blink compensation: "
+                       "use pre-defined blinking time\n");
+                return time;
+        }
+
+        return (u8) ((time * compensation) >> 6);
+}
+
+/* Set led pattern command */
+static int
+il_led_cmd(struct il_priv *il, unsigned long on, unsigned long off)
+{
+        struct il_led_cmd led_cmd = {
+                .id = IL_LED_LINK,
+                .interval = IL_DEF_LED_INTRVL
+        };
+        int ret;
+
+        if (!test_bit(S_READY, &il->status))
+                return -EBUSY;
+
+        if (il->blink_on == on && il->blink_off == off)
+                return 0;
+
+        if (off == 0) {
+                /* led is SOLID_ON */
+                on = IL_LED_SOLID;
+        }
+
+        D_LED("Led blink time compensation=%u\n",
+              il->cfg->base_params->led_compensation);
+        led_cmd.on =
+            il_blink_compensation(il, on,
+                                  il->cfg->base_params->led_compensation);
+        led_cmd.off =
+            il_blink_compensation(il, off,
+                                  il->cfg->base_params->led_compensation);
+
+        ret = il->cfg->ops->led->cmd(il, &led_cmd);
+        if (!ret) {
+                il->blink_on = on;
+                il->blink_off = off;
+        }
+        return ret;
+}
+
+static void
+il_led_brightness_set(struct led_classdev *led_cdev,
+                      enum led_brightness brightness)
+{
+        struct il_priv *il = container_of(led_cdev, struct il_priv, led);
+        unsigned long on = 0;
+
+        if (brightness > 0)
+                on = IL_LED_SOLID;
+
+        il_led_cmd(il, on, 0);
+}
+
+static int
+il_led_blink_set(struct led_classdev *led_cdev, unsigned long *delay_on,
+                 unsigned long *delay_off)
+{
+        struct il_priv *il = container_of(led_cdev, struct il_priv, led);
+
+        return il_led_cmd(il, *delay_on, *delay_off);
+}
+
+void
+il_leds_init(struct il_priv *il)
+{
+        int mode = led_mode;
+        int ret;
+
+        if (mode == IL_LED_DEFAULT)
+                mode = il->cfg->led_mode;
+
+        il->led.name =
+            kasprintf(GFP_KERNEL, "%s-led", wiphy_name(il->hw->wiphy));
+        il->led.brightness_set = il_led_brightness_set;
+        il->led.blink_set = il_led_blink_set;
+        il->led.max_brightness = 1;
+
+        switch (mode) {
+        case IL_LED_DEFAULT:
+                WARN_ON(1);
+                break;
+        case IL_LED_BLINK:
+                il->led.default_trigger =
+                    ieee80211_create_tpt_led_trigger(il->hw,
+                                                     IEEE80211_TPT_LEDTRIG_FL_CONNECTED,
+                                                     il_blink,
+                                                     ARRAY_SIZE(il_blink));
+                break;
+        case IL_LED_RF_STATE:
+                il->led.default_trigger = ieee80211_get_radio_led_name(il->hw);
+                break;
+        }
+
+        ret = led_classdev_register(&il->pci_dev->dev, &il->led);
+        if (ret) {
+                kfree(il->led.name);
+                return;
+        }
+
+        il->led_registered = true;
+}
+EXPORT_SYMBOL(il_leds_init);
+
+void
+il_leds_exit(struct il_priv *il)
+{
+        if (!il->led_registered)
+                return;
+
+        led_classdev_unregister(&il->led);
+        kfree(il->led.name);
+}
+EXPORT_SYMBOL(il_leds_exit);
+
+/************************** EEPROM BANDS ****************************
+ *
+ * The il_eeprom_band definitions below provide the mapping from the
+ * EEPROM contents to the specific channel number supported for each
+ * band.
+ *
+ * For example, il_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 il->channel_info_24/52 and il->channel_map_24/52
+ *
+ * channel_map_24/52 provides the idx 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 il_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 il_eeprom_band_2[] = {  /* 4915-5080MHz */
+        183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16
+};
+
+static const u8 il_eeprom_band_3[] = {  /* 5170-5320MHz */
+        34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64
+};
+
+static const u8 il_eeprom_band_4[] = {  /* 5500-5700MHz */
+        100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140
+};
+
+static const u8 il_eeprom_band_5[] = {  /* 5725-5825MHz */
+        145, 149, 153, 157, 161, 165
+};
+
+static const u8 il_eeprom_band_6[] = {  /* 2.4 ht40 channel */
+        1, 2, 3, 4, 5, 6, 7
+};
+
+static const u8 il_eeprom_band_7[] = {  /* 5.2 ht40 channel */
+        36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157
+};
+
+/******************************************************************************
+ *
+ * EEPROM related functions
+ *
+******************************************************************************/
+
+static int
+il_eeprom_verify_signature(struct il_priv *il)
+{
+        u32 gp = _il_rd(il, CSR_EEPROM_GP) & CSR_EEPROM_GP_VALID_MSK;
+        int ret = 0;
+
+        D_EEPROM("EEPROM signature=0x%08x\n", gp);
+        switch (gp) {
+        case CSR_EEPROM_GP_GOOD_SIG_EEP_LESS_THAN_4K:
+        case CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K:
+                break;
+        default:
+                IL_ERR("bad EEPROM signature," "EEPROM_GP=0x%08x\n", gp);
+                ret = -ENOENT;
+                break;
+        }
+        return ret;
+}
+
+const u8 *
+il_eeprom_query_addr(const struct il_priv *il, size_t offset)
+{
+        BUG_ON(offset >= il->cfg->base_params->eeprom_size);
+        return &il->eeprom[offset];
+}
+EXPORT_SYMBOL(il_eeprom_query_addr);
+
+u16
+il_eeprom_query16(const struct il_priv *il, size_t offset)
+{
+        if (!il->eeprom)
+                return 0;
+        return (u16) il->eeprom[offset] | ((u16) il->eeprom[offset + 1] << 8);
+}
+EXPORT_SYMBOL(il_eeprom_query16);
+
+/**
+ * il_eeprom_init - read EEPROM contents
+ *
+ * Load the EEPROM contents from adapter into il->eeprom
+ *
+ * NOTE:  This routine uses the non-debug IO access functions.
+ */
+int
+il_eeprom_init(struct il_priv *il)
+{
+        __le16 *e;
+        u32 gp = _il_rd(il, CSR_EEPROM_GP);
+        int sz;
+        int ret;
+        u16 addr;
+
+        /* allocate eeprom */
+        sz = il->cfg->base_params->eeprom_size;
+        D_EEPROM("NVM size = %d\n", sz);
+        il->eeprom = kzalloc(sz, GFP_KERNEL);
+        if (!il->eeprom) {
+                ret = -ENOMEM;
+                goto alloc_err;
+        }
+        e = (__le16 *) il->eeprom;
+
+        il->cfg->ops->lib->apm_ops.init(il);
+
+        ret = il_eeprom_verify_signature(il);
+        if (ret < 0) {
+                IL_ERR("EEPROM not found, EEPROM_GP=0x%08x\n", gp);
+                ret = -ENOENT;
+                goto err;
+        }
+
+        /* Make sure driver (instead of uCode) is allowed to read EEPROM */
+        ret = il->cfg->ops->lib->eeprom_ops.acquire_semaphore(il);
+        if (ret < 0) {
+                IL_ERR("Failed to acquire EEPROM semaphore.\n");
+                ret = -ENOENT;
+                goto err;
+        }
+
+        /* eeprom is an array of 16bit values */
+        for (addr = 0; addr < sz; addr += sizeof(u16)) {
+                u32 r;
+
+                _il_wr(il, CSR_EEPROM_REG,
+                       CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
+
+                ret =
+                    _il_poll_bit(il, CSR_EEPROM_REG,
+                                 CSR_EEPROM_REG_READ_VALID_MSK,
+                                 CSR_EEPROM_REG_READ_VALID_MSK,
+                                 IL_EEPROM_ACCESS_TIMEOUT);
+                if (ret < 0) {
+                        IL_ERR("Time out reading EEPROM[%d]\n", addr);
+                        goto done;
+                }
+                r = _il_rd(il, CSR_EEPROM_REG);
+                e[addr / 2] = cpu_to_le16(r >> 16);
+        }
+
+        D_EEPROM("NVM Type: %s, version: 0x%x\n", "EEPROM",
+                 il_eeprom_query16(il, EEPROM_VERSION));
+
+        ret = 0;
+done:
+        il->cfg->ops->lib->eeprom_ops.release_semaphore(il);
+
+err:
+        if (ret)
+                il_eeprom_free(il);
+        /* Reset chip to save power until we load uCode during "up". */
+        il_apm_stop(il);
+alloc_err:
+        return ret;
+}
+EXPORT_SYMBOL(il_eeprom_init);
+
+void
+il_eeprom_free(struct il_priv *il)
+{
+        kfree(il->eeprom);
+        il->eeprom = NULL;
+}
+EXPORT_SYMBOL(il_eeprom_free);
+
+static void
+il_init_band_reference(const struct il_priv *il, int eep_band,
+                       int *eeprom_ch_count,
+                       const struct il_eeprom_channel **eeprom_ch_info,
+                       const u8 **eeprom_ch_idx)
+{
+        u32 offset =
+            il->cfg->ops->lib->eeprom_ops.regulatory_bands[eep_band - 1];
+        switch (eep_band) {
+        case 1:         /* 2.4GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_1);
+                *eeprom_ch_info =
+                    (struct il_eeprom_channel *)il_eeprom_query_addr(il,
+                                                                     offset);
+                *eeprom_ch_idx = il_eeprom_band_1;
+                break;
+        case 2:         /* 4.9GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_2);
+                *eeprom_ch_info =
+                    (struct il_eeprom_channel *)il_eeprom_query_addr(il,
+                                                                     offset);
+                *eeprom_ch_idx = il_eeprom_band_2;
+                break;
+        case 3:         /* 5.2GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_3);
+                *eeprom_ch_info =
+                    (struct il_eeprom_channel *)il_eeprom_query_addr(il,
+                                                                     offset);
+                *eeprom_ch_idx = il_eeprom_band_3;
+                break;
+        case 4:         /* 5.5GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_4);
+                *eeprom_ch_info =
+                    (struct il_eeprom_channel *)il_eeprom_query_addr(il,
+                                                                     offset);
+                *eeprom_ch_idx = il_eeprom_band_4;
+                break;
+        case 5:         /* 5.7GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_5);
+                *eeprom_ch_info =
+                    (struct il_eeprom_channel *)il_eeprom_query_addr(il,
+                                                                     offset);
+                *eeprom_ch_idx = il_eeprom_band_5;
+                break;
+        case 6:         /* 2.4GHz ht40 channels */
+                *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_6);
+                *eeprom_ch_info =
+                    (struct il_eeprom_channel *)il_eeprom_query_addr(il,
+                                                                     offset);
+                *eeprom_ch_idx = il_eeprom_band_6;
+                break;
+        case 7:         /* 5 GHz ht40 channels */
+                *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_7);
+                *eeprom_ch_info =
+                    (struct il_eeprom_channel *)il_eeprom_query_addr(il,
+                                                                     offset);
+                *eeprom_ch_idx = il_eeprom_band_7;
+                break;
+        default:
+                BUG();
+        }
+}
+
+#define CHECK_AND_PRINT(x) ((eeprom_ch->flags & EEPROM_CHANNEL_##x) \
+                            ? # x " " : "")
+/**
+ * il_mod_ht40_chan_info - Copy ht40 channel info into driver's il.
+ *
+ * Does not set up a command, or touch hardware.
+ */
+static int
+il_mod_ht40_chan_info(struct il_priv *il, enum ieee80211_band band, u16 channel,
+                      const struct il_eeprom_channel *eeprom_ch,
+                      u8 clear_ht40_extension_channel)
+{
+        struct il_channel_info *ch_info;
+
+        ch_info =
+            (struct il_channel_info *)il_get_channel_info(il, band, channel);
+
+        if (!il_is_channel_valid(ch_info))
+                return -1;
+
+        D_EEPROM("HT40 Ch. %d [%sGHz] %s%s%s%s%s(0x%02x %ddBm):"
+                 " Ad-Hoc %ssupported\n", ch_info->channel,
+                 il_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(DFS), eeprom_ch->flags,
+                 eeprom_ch->max_power_avg,
+                 ((eeprom_ch->flags & EEPROM_CHANNEL_IBSS) &&
+                  !(eeprom_ch->flags & EEPROM_CHANNEL_RADAR)) ? "" : "not ");
+
+        ch_info->ht40_eeprom = *eeprom_ch;
+        ch_info->ht40_max_power_avg = eeprom_ch->max_power_avg;
+        ch_info->ht40_flags = eeprom_ch->flags;
+        if (eeprom_ch->flags & EEPROM_CHANNEL_VALID)
+                ch_info->ht40_extension_channel &=
+                    ~clear_ht40_extension_channel;
+
+        return 0;
+}
+
+#define CHECK_AND_PRINT_I(x) ((eeprom_ch_info[ch].flags & EEPROM_CHANNEL_##x) \
+                            ? # x " " : "")
+
+/**
+ * il_init_channel_map - Set up driver's info for all possible channels
+ */
+int
+il_init_channel_map(struct il_priv *il)
+{
+        int eeprom_ch_count = 0;
+        const u8 *eeprom_ch_idx = NULL;
+        const struct il_eeprom_channel *eeprom_ch_info = NULL;
+        int band, ch;
+        struct il_channel_info *ch_info;
+
+        if (il->channel_count) {
+                D_EEPROM("Channel map already initialized.\n");
+                return 0;
+        }
+
+        D_EEPROM("Initializing regulatory info from EEPROM\n");
+
+        il->channel_count =
+            ARRAY_SIZE(il_eeprom_band_1) + ARRAY_SIZE(il_eeprom_band_2) +
+            ARRAY_SIZE(il_eeprom_band_3) + ARRAY_SIZE(il_eeprom_band_4) +
+            ARRAY_SIZE(il_eeprom_band_5);
+
+        D_EEPROM("Parsing data for %d channels.\n", il->channel_count);
+
+        il->channel_info =
+            kzalloc(sizeof(struct il_channel_info) * il->channel_count,
+                    GFP_KERNEL);
+        if (!il->channel_info) {
+                IL_ERR("Could not allocate channel_info\n");
+                il->channel_count = 0;
+                return -ENOMEM;
+        }
+
+        ch_info = il->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++) {
+
+                il_init_band_reference(il, band, &eeprom_ch_count,
+                                       &eeprom_ch_info, &eeprom_ch_idx);
+
+                /* Loop through each band adding each of the channels */
+                for (ch = 0; ch < eeprom_ch_count; ch++) {
+                        ch_info->channel = eeprom_ch_idx[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;
+                        /* First write that ht40 is not enabled, and then enable
+                         * one by one */
+                        ch_info->ht40_extension_channel =
+                            IEEE80211_CHAN_NO_HT40;
+
+                        if (!(il_is_channel_valid(ch_info))) {
+                                D_EEPROM("Ch. %d Flags %x [%sGHz] - "
+                                         "No traffic\n", ch_info->channel,
+                                         ch_info->flags,
+                                         il_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;
+
+                        D_EEPROM("Ch. %d [%sGHz] " "%s%s%s%s%s%s(0x%02x %ddBm):"
+                                 " Ad-Hoc %ssupported\n", ch_info->channel,
+                                 il_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(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 ");
+
+                        ch_info++;
+                }
+        }
+
+        /* Check if we do have HT40 channels */
+        if (il->cfg->ops->lib->eeprom_ops.regulatory_bands[5] ==
+            EEPROM_REGULATORY_BAND_NO_HT40 &&
+            il->cfg->ops->lib->eeprom_ops.regulatory_bands[6] ==
+            EEPROM_REGULATORY_BAND_NO_HT40)
+                return 0;
+
+        /* Two additional EEPROM bands for 2.4 and 5 GHz HT40 channels */
+        for (band = 6; band <= 7; band++) {
+                enum ieee80211_band ieeeband;
+
+                il_init_band_reference(il, band, &eeprom_ch_count,
+                                       &eeprom_ch_info, &eeprom_ch_idx);
+
+                /* 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++) {
+                        /* Set up driver's info for lower half */
+                        il_mod_ht40_chan_info(il, ieeeband, eeprom_ch_idx[ch],
+                                              &eeprom_ch_info[ch],
+                                              IEEE80211_CHAN_NO_HT40PLUS);
+
+                        /* Set up driver's info for upper half */
+                        il_mod_ht40_chan_info(il, ieeeband,
+                                              eeprom_ch_idx[ch] + 4,
+                                              &eeprom_ch_info[ch],
+                                              IEEE80211_CHAN_NO_HT40MINUS);
+                }
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(il_init_channel_map);
+
+/*
+ * il_free_channel_map - undo allocations in il_init_channel_map
+ */
+void
+il_free_channel_map(struct il_priv *il)
+{
+        kfree(il->channel_info);
+        il->channel_count = 0;
+}
+EXPORT_SYMBOL(il_free_channel_map);
+
+/**
+ * il_get_channel_info - Find driver's ilate channel info
+ *
+ * Based on band and channel number.
+ */
+const struct il_channel_info *
+il_get_channel_info(const struct il_priv *il, enum ieee80211_band band,
+                    u16 channel)
+{
+        int i;
+
+        switch (band) {
+        case IEEE80211_BAND_5GHZ:
+                for (i = 14; i < il->channel_count; i++) {
+                        if (il->channel_info[i].channel == channel)
+                                return &il->channel_info[i];
+                }
+                break;
+        case IEEE80211_BAND_2GHZ:
+                if (channel >= 1 && channel <= 14)
+                        return &il->channel_info[channel - 1];
+                break;
+        default:
+                BUG();
+        }
+
+        return NULL;
+}
+EXPORT_SYMBOL(il_get_channel_info);
+
+/*
+ * Setting power level allows the card to go to sleep when not busy.
+ *
+ * We calculate a sleep command based on the required latency, which
+ * we get from mac80211. In order to handle thermal throttling, we can
+ * also use pre-defined power levels.
+ */
+
+/*
+ * This defines the old power levels. They are still used by default
+ * (level 1) and for thermal throttle (levels 3 through 5)
+ */
+
+struct il_power_vec_entry {
+        struct il_powertable_cmd cmd;
+        u8 no_dtim;             /* number of skip dtim */
+};
+
+static void
+il_power_sleep_cam_cmd(struct il_priv *il, struct il_powertable_cmd *cmd)
+{
+        memset(cmd, 0, sizeof(*cmd));
+
+        if (il->power_data.pci_pm)
+                cmd->flags |= IL_POWER_PCI_PM_MSK;
+
+        D_POWER("Sleep command for CAM\n");
+}
+
+static int
+il_set_power(struct il_priv *il, struct il_powertable_cmd *cmd)
+{
+        D_POWER("Sending power/sleep command\n");
+        D_POWER("Flags value = 0x%08X\n", cmd->flags);
+        D_POWER("Tx timeout = %u\n", le32_to_cpu(cmd->tx_data_timeout));
+        D_POWER("Rx timeout = %u\n", le32_to_cpu(cmd->rx_data_timeout));
+        D_POWER("Sleep interval vector = { %d , %d , %d , %d , %d }\n",
+                le32_to_cpu(cmd->sleep_interval[0]),
+                le32_to_cpu(cmd->sleep_interval[1]),
+                le32_to_cpu(cmd->sleep_interval[2]),
+                le32_to_cpu(cmd->sleep_interval[3]),
+                le32_to_cpu(cmd->sleep_interval[4]));
+
+        return il_send_cmd_pdu(il, C_POWER_TBL,
+                               sizeof(struct il_powertable_cmd), cmd);
+}
+
+int
+il_power_set_mode(struct il_priv *il, struct il_powertable_cmd *cmd, bool force)
+{
+        int ret;
+        bool update_chains;
+
+        lockdep_assert_held(&il->mutex);
+
+        /* Don't update the RX chain when chain noise calibration is running */
+        update_chains = il->chain_noise_data.state == IL_CHAIN_NOISE_DONE ||
+            il->chain_noise_data.state == IL_CHAIN_NOISE_ALIVE;
+
+        if (!memcmp(&il->power_data.sleep_cmd, cmd, sizeof(*cmd)) && !force)
+                return 0;
+
+        if (!il_is_ready_rf(il))
+                return -EIO;
+
+        /* scan complete use sleep_power_next, need to be updated */
+        memcpy(&il->power_data.sleep_cmd_next, cmd, sizeof(*cmd));
+        if (test_bit(S_SCANNING, &il->status) && !force) {
+                D_INFO("Defer power set mode while scanning\n");
+                return 0;
+        }
+
+        if (cmd->flags & IL_POWER_DRIVER_ALLOW_SLEEP_MSK)
+                set_bit(S_POWER_PMI, &il->status);
+
+        ret = il_set_power(il, cmd);
+        if (!ret) {
+                if (!(cmd->flags & IL_POWER_DRIVER_ALLOW_SLEEP_MSK))
+                        clear_bit(S_POWER_PMI, &il->status);
+
+                if (il->cfg->ops->lib->update_chain_flags && update_chains)
+                        il->cfg->ops->lib->update_chain_flags(il);
+                else if (il->cfg->ops->lib->update_chain_flags)
+                        D_POWER("Cannot update the power, chain noise "
+                                "calibration running: %d\n",
+                                il->chain_noise_data.state);
+
+                memcpy(&il->power_data.sleep_cmd, cmd, sizeof(*cmd));
+        } else
+                IL_ERR("set power fail, ret = %d", ret);
+
+        return ret;
+}
+
+int
+il_power_update_mode(struct il_priv *il, bool force)
+{
+        struct il_powertable_cmd cmd;
+
+        il_power_sleep_cam_cmd(il, &cmd);
+        return il_power_set_mode(il, &cmd, force);
+}
+EXPORT_SYMBOL(il_power_update_mode);
+
+/* initialize to default */
+void
+il_power_initialize(struct il_priv *il)
+{
+        u16 lctl = il_pcie_link_ctl(il);
+
+        il->power_data.pci_pm = !(lctl & PCI_CFG_LINK_CTRL_VAL_L0S_EN);
+
+        il->power_data.debug_sleep_level_override = -1;
+
+        memset(&il->power_data.sleep_cmd, 0, sizeof(il->power_data.sleep_cmd));
+}
+EXPORT_SYMBOL(il_power_initialize);
+
+/* 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.  */
+#define IL_ACTIVE_DWELL_TIME_24    (30) /* all times in msec */
+#define IL_ACTIVE_DWELL_TIME_52    (20)
+
+#define IL_ACTIVE_DWELL_FACTOR_24GHZ (3)
+#define IL_ACTIVE_DWELL_FACTOR_52GHZ (2)
+
+/* For passive scan, listen PASSIVE_DWELL_TIME (msec) on each channel.
+ * Must be set longer than active dwell time.
+ * For the most reliable scan, set > AP beacon interval (typically 100msec). */
+#define IL_PASSIVE_DWELL_TIME_24   (20) /* all times in msec */
+#define IL_PASSIVE_DWELL_TIME_52   (10)
+#define IL_PASSIVE_DWELL_BASE      (100)
+#define IL_CHANNEL_TUNE_TIME       5
+
+static int
+il_send_scan_abort(struct il_priv *il)
+{
+        int ret;
+        struct il_rx_pkt *pkt;
+        struct il_host_cmd cmd = {
+                .id = C_SCAN_ABORT,
+                .flags = CMD_WANT_SKB,
+        };
+
+        /* Exit instantly with error when device is not ready
+         * to receive scan abort command or it does not perform
+         * hardware scan currently */
+        if (!test_bit(S_READY, &il->status) ||
+            !test_bit(S_GEO_CONFIGURED, &il->status) ||
+            !test_bit(S_SCAN_HW, &il->status) ||
+            test_bit(S_FW_ERROR, &il->status) ||
+            test_bit(S_EXIT_PENDING, &il->status))
+                return -EIO;
+
+        ret = il_send_cmd_sync(il, &cmd);
+        if (ret)
+                return ret;
+
+        pkt = (struct il_rx_pkt *)cmd.reply_page;
+        if (pkt->u.status != CAN_ABORT_STATUS) {
+                /* The scan abort will return 1 for success or
+                 * 2 for "failure".  A failure condition can be
+                 * due to simply not being in an active scan which
+                 * can occur if we send the scan abort before we
+                 * the microcode has notified us that a scan is
+                 * completed. */
+                D_SCAN("SCAN_ABORT ret %d.\n", pkt->u.status);
+                ret = -EIO;
+        }
+
+        il_free_pages(il, cmd.reply_page);
+        return ret;
+}
+
+static void
+il_complete_scan(struct il_priv *il, bool aborted)
+{
+        /* check if scan was requested from mac80211 */
+        if (il->scan_request) {
+                D_SCAN("Complete scan in mac80211\n");
+                ieee80211_scan_completed(il->hw, aborted);
+        }
+
+        il->scan_vif = NULL;
+        il->scan_request = NULL;
+}
+
+void
+il_force_scan_end(struct il_priv *il)
+{
+        lockdep_assert_held(&il->mutex);
+
+        if (!test_bit(S_SCANNING, &il->status)) {
+                D_SCAN("Forcing scan end while not scanning\n");
+                return;
+        }
+
+        D_SCAN("Forcing scan end\n");
+        clear_bit(S_SCANNING, &il->status);
+        clear_bit(S_SCAN_HW, &il->status);
+        clear_bit(S_SCAN_ABORTING, &il->status);
+        il_complete_scan(il, true);
+}
+
+static void
+il_do_scan_abort(struct il_priv *il)
+{
+        int ret;
+
+        lockdep_assert_held(&il->mutex);
+
+        if (!test_bit(S_SCANNING, &il->status)) {
+                D_SCAN("Not performing scan to abort\n");
+                return;
+        }
+
+        if (test_and_set_bit(S_SCAN_ABORTING, &il->status)) {
+                D_SCAN("Scan abort in progress\n");
+                return;
+        }
+
+        ret = il_send_scan_abort(il);
+        if (ret) {
+                D_SCAN("Send scan abort failed %d\n", ret);
+                il_force_scan_end(il);
+        } else
+                D_SCAN("Successfully send scan abort\n");
+}
+
+/**
+ * il_scan_cancel - Cancel any currently executing HW scan
+ */
+int
+il_scan_cancel(struct il_priv *il)
+{
+        D_SCAN("Queuing abort scan\n");
+        queue_work(il->workqueue, &il->abort_scan);
+        return 0;
+}
+EXPORT_SYMBOL(il_scan_cancel);
+
+/**
+ * il_scan_cancel_timeout - Cancel any currently executing HW scan
+ * @ms: amount of time to wait (in milliseconds) for scan to abort
+ *
+ */
+int
+il_scan_cancel_timeout(struct il_priv *il, unsigned long ms)
+{
+        unsigned long timeout = jiffies + msecs_to_jiffies(ms);
+
+        lockdep_assert_held(&il->mutex);
+
+        D_SCAN("Scan cancel timeout\n");
+
+        il_do_scan_abort(il);
+
+        while (time_before_eq(jiffies, timeout)) {
+                if (!test_bit(S_SCAN_HW, &il->status))
+                        break;
+                msleep(20);
+        }
+
+        return test_bit(S_SCAN_HW, &il->status);
+}
+EXPORT_SYMBOL(il_scan_cancel_timeout);
+
+/* Service response to C_SCAN (0x80) */
+static void
+il_hdl_scan(struct il_priv *il, struct il_rx_buf *rxb)
+{
+#ifdef CONFIG_IWLEGACY_DEBUG
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct il_scanreq_notification *notif =
+            (struct il_scanreq_notification *)pkt->u.raw;
+
+        D_SCAN("Scan request status = 0x%x\n", notif->status);
+#endif
+}
+
+/* Service N_SCAN_START (0x82) */
+static void
+il_hdl_scan_start(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct il_scanstart_notification *notif =
+            (struct il_scanstart_notification *)pkt->u.raw;
+        il->scan_start_tsf = le32_to_cpu(notif->tsf_low);
+        D_SCAN("Scan start: " "%d [802.11%s] "
+               "(TSF: 0x%08X:%08X) - %d (beacon timer %u)\n", notif->channel,
+               notif->band ? "bg" : "a", le32_to_cpu(notif->tsf_high),
+               le32_to_cpu(notif->tsf_low), notif->status, notif->beacon_timer);
+}
+
+/* Service N_SCAN_RESULTS (0x83) */
+static void
+il_hdl_scan_results(struct il_priv *il, struct il_rx_buf *rxb)
+{
+#ifdef CONFIG_IWLEGACY_DEBUG
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct il_scanresults_notification *notif =
+            (struct il_scanresults_notification *)pkt->u.raw;
+
+        D_SCAN("Scan ch.res: " "%d [802.11%s] " "(TSF: 0x%08X:%08X) - %d "
+               "elapsed=%lu usec\n", notif->channel, notif->band ? "bg" : "a",
+               le32_to_cpu(notif->tsf_high), le32_to_cpu(notif->tsf_low),
+               le32_to_cpu(notif->stats[0]),
+               le32_to_cpu(notif->tsf_low) - il->scan_start_tsf);
+#endif
+}
+
+/* Service N_SCAN_COMPLETE (0x84) */
+static void
+il_hdl_scan_complete(struct il_priv *il, struct il_rx_buf *rxb)
+{
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct il_scancomplete_notification *scan_notif = (void *)pkt->u.raw;
+#endif
+
+        D_SCAN("Scan complete: %d channels (TSF 0x%08X:%08X) - %d\n",
+               scan_notif->scanned_channels, scan_notif->tsf_low,
+               scan_notif->tsf_high, scan_notif->status);
+
+        /* The HW is no longer scanning */
+        clear_bit(S_SCAN_HW, &il->status);
+
+        D_SCAN("Scan on %sGHz took %dms\n",
+               (il->scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2",
+               jiffies_to_msecs(jiffies - il->scan_start));
+
+        queue_work(il->workqueue, &il->scan_completed);
+}
+
+void
+il_setup_rx_scan_handlers(struct il_priv *il)
+{
+        /* scan handlers */
+        il->handlers[C_SCAN] = il_hdl_scan;
+        il->handlers[N_SCAN_START] = il_hdl_scan_start;
+        il->handlers[N_SCAN_RESULTS] = il_hdl_scan_results;
+        il->handlers[N_SCAN_COMPLETE] = il_hdl_scan_complete;
+}
+EXPORT_SYMBOL(il_setup_rx_scan_handlers);
+
+inline u16
+il_get_active_dwell_time(struct il_priv *il, enum ieee80211_band band,
+                         u8 n_probes)
+{
+        if (band == IEEE80211_BAND_5GHZ)
+                return IL_ACTIVE_DWELL_TIME_52 +
+                    IL_ACTIVE_DWELL_FACTOR_52GHZ * (n_probes + 1);
+        else
+                return IL_ACTIVE_DWELL_TIME_24 +
+                    IL_ACTIVE_DWELL_FACTOR_24GHZ * (n_probes + 1);
+}
+EXPORT_SYMBOL(il_get_active_dwell_time);
+
+u16
+il_get_passive_dwell_time(struct il_priv *il, enum ieee80211_band band,
+                          struct ieee80211_vif *vif)
+{
+        struct il_rxon_context *ctx = &il->ctx;
+        u16 value;
+
+        u16 passive =
+            (band ==
+             IEEE80211_BAND_2GHZ) ? IL_PASSIVE_DWELL_BASE +
+            IL_PASSIVE_DWELL_TIME_24 : IL_PASSIVE_DWELL_BASE +
+            IL_PASSIVE_DWELL_TIME_52;
+
+        if (il_is_any_associated(il)) {
+                /*
+                 * If we're associated, we clamp the maximum passive
+                 * dwell time to be 98% of the smallest beacon interval
+                 * (minus 2 * channel tune time)
+                 */
+                value = ctx->vif ? ctx->vif->bss_conf.beacon_int : 0;
+                if (value > IL_PASSIVE_DWELL_BASE || !value)
+                        value = IL_PASSIVE_DWELL_BASE;
+                value = (value * 98) / 100 - IL_CHANNEL_TUNE_TIME * 2;
+                passive = min(value, passive);
+        }
+
+        return passive;
+}
+EXPORT_SYMBOL(il_get_passive_dwell_time);
+
+void
+il_init_scan_params(struct il_priv *il)
+{
+        u8 ant_idx = fls(il->hw_params.valid_tx_ant) - 1;
+        if (!il->scan_tx_ant[IEEE80211_BAND_5GHZ])
+                il->scan_tx_ant[IEEE80211_BAND_5GHZ] = ant_idx;
+        if (!il->scan_tx_ant[IEEE80211_BAND_2GHZ])
+                il->scan_tx_ant[IEEE80211_BAND_2GHZ] = ant_idx;
+}
+EXPORT_SYMBOL(il_init_scan_params);
+
+static int
+il_scan_initiate(struct il_priv *il, struct ieee80211_vif *vif)
+{
+        int ret;
+
+        lockdep_assert_held(&il->mutex);
+
+        if (WARN_ON(!il->cfg->ops->utils->request_scan))
+                return -EOPNOTSUPP;
+
+        cancel_delayed_work(&il->scan_check);
+
+        if (!il_is_ready_rf(il)) {
+                IL_WARN("Request scan called when driver not ready.\n");
+                return -EIO;
+        }
+
+        if (test_bit(S_SCAN_HW, &il->status)) {
+                D_SCAN("Multiple concurrent scan requests in parallel.\n");
+                return -EBUSY;
+        }
+
+        if (test_bit(S_SCAN_ABORTING, &il->status)) {
+                D_SCAN("Scan request while abort pending.\n");
+                return -EBUSY;
+        }
+
+        D_SCAN("Starting scan...\n");
+
+        set_bit(S_SCANNING, &il->status);
+        il->scan_start = jiffies;
+
+        ret = il->cfg->ops->utils->request_scan(il, vif);
+        if (ret) {
+                clear_bit(S_SCANNING, &il->status);
+                return ret;
+        }
+
+        queue_delayed_work(il->workqueue, &il->scan_check,
+                           IL_SCAN_CHECK_WATCHDOG);
+
+        return 0;
+}
+
+int
+il_mac_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+               struct cfg80211_scan_request *req)
+{
+        struct il_priv *il = hw->priv;
+        int ret;
+
+        D_MAC80211("enter\n");
+
+        if (req->n_channels == 0)
+                return -EINVAL;
+
+        mutex_lock(&il->mutex);
+
+        if (test_bit(S_SCANNING, &il->status)) {
+                D_SCAN("Scan already in progress.\n");
+                ret = -EAGAIN;
+                goto out_unlock;
+        }
+
+        /* mac80211 will only ask for one band at a time */
+        il->scan_request = req;
+        il->scan_vif = vif;
+        il->scan_band = req->channels[0]->band;
+
+        ret = il_scan_initiate(il, vif);
+
+        D_MAC80211("leave\n");
+
+out_unlock:
+        mutex_unlock(&il->mutex);
+
+        return ret;
+}
+EXPORT_SYMBOL(il_mac_hw_scan);
+
+static void
+il_bg_scan_check(struct work_struct *data)
+{
+        struct il_priv *il =
+            container_of(data, struct il_priv, scan_check.work);
+
+        D_SCAN("Scan check work\n");
+
+        /* Since we are here firmware does not finish scan and
+         * most likely is in bad shape, so we don't bother to
+         * send abort command, just force scan complete to mac80211 */
+        mutex_lock(&il->mutex);
+        il_force_scan_end(il);
+        mutex_unlock(&il->mutex);
+}
+
+/**
+ * il_fill_probe_req - fill in all required fields and IE for probe request
+ */
+
+u16
+il_fill_probe_req(struct il_priv *il, struct ieee80211_mgmt *frame,
+                  const u8 *ta, const u8 *ies, int ie_len, int left)
+{
+        int len = 0;
+        u8 *pos = NULL;
+
+        /* Make sure there is enough space for the probe request,
+         * two mandatory IEs and the data */
+        left -= 24;
+        if (left < 0)
+                return 0;
+
+        frame->frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);
+        memcpy(frame->da, il_bcast_addr, ETH_ALEN);
+        memcpy(frame->sa, ta, ETH_ALEN);
+        memcpy(frame->bssid, il_bcast_addr, ETH_ALEN);
+        frame->seq_ctrl = 0;
+
+        len += 24;
+
+        /* ...next IE... */
+        pos = &frame->u.probe_req.variable[0];
+
+        /* fill in our indirect SSID IE */
+        left -= 2;
+        if (left < 0)
+                return 0;
+        *pos++ = WLAN_EID_SSID;
+        *pos++ = 0;
+
+        len += 2;
+
+        if (WARN_ON(left < ie_len))
+                return len;
+
+        if (ies && ie_len) {
+                memcpy(pos, ies, ie_len);
+                len += ie_len;
+        }
+
+        return (u16) len;
+}
+EXPORT_SYMBOL(il_fill_probe_req);
+
+static void
+il_bg_abort_scan(struct work_struct *work)
+{
+        struct il_priv *il = container_of(work, struct il_priv, abort_scan);
+
+        D_SCAN("Abort scan work\n");
+
+        /* We keep scan_check work queued in case when firmware will not
+         * report back scan completed notification */
+        mutex_lock(&il->mutex);
+        il_scan_cancel_timeout(il, 200);
+        mutex_unlock(&il->mutex);
+}
+
+static void
+il_bg_scan_completed(struct work_struct *work)
+{
+        struct il_priv *il = container_of(work, struct il_priv, scan_completed);
+        bool aborted;
+
+        D_SCAN("Completed scan.\n");
+
+        cancel_delayed_work(&il->scan_check);
+
+        mutex_lock(&il->mutex);
+
+        aborted = test_and_clear_bit(S_SCAN_ABORTING, &il->status);
+        if (aborted)
+                D_SCAN("Aborted scan completed.\n");
+
+        if (!test_and_clear_bit(S_SCANNING, &il->status)) {
+                D_SCAN("Scan already completed.\n");
+                goto out_settings;
+        }
+
+        il_complete_scan(il, aborted);
+
+out_settings:
+        /* Can we still talk to firmware ? */
+        if (!il_is_ready_rf(il))
+                goto out;
+
+        /*
+         * We do not commit power settings while scan is pending,
+         * do it now if the settings changed.
+         */
+        il_power_set_mode(il, &il->power_data.sleep_cmd_next, false);
+        il_set_tx_power(il, il->tx_power_next, false);
+
+        il->cfg->ops->utils->post_scan(il);
+
+out:
+        mutex_unlock(&il->mutex);
+}
+
+void
+il_setup_scan_deferred_work(struct il_priv *il)
+{
+        INIT_WORK(&il->scan_completed, il_bg_scan_completed);
+        INIT_WORK(&il->abort_scan, il_bg_abort_scan);
+        INIT_DELAYED_WORK(&il->scan_check, il_bg_scan_check);
+}
+EXPORT_SYMBOL(il_setup_scan_deferred_work);
+
+void
+il_cancel_scan_deferred_work(struct il_priv *il)
+{
+        cancel_work_sync(&il->abort_scan);
+        cancel_work_sync(&il->scan_completed);
+
+        if (cancel_delayed_work_sync(&il->scan_check)) {
+                mutex_lock(&il->mutex);
+                il_force_scan_end(il);
+                mutex_unlock(&il->mutex);
+        }
+}
+EXPORT_SYMBOL(il_cancel_scan_deferred_work);
+
+/* il->sta_lock must be held */
+static void
+il_sta_ucode_activate(struct il_priv *il, u8 sta_id)
+{
+
+        if (!(il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE))
+                IL_ERR("ACTIVATE a non DRIVER active station id %u addr %pM\n",
+                       sta_id, il->stations[sta_id].sta.sta.addr);
+
+        if (il->stations[sta_id].used & IL_STA_UCODE_ACTIVE) {
+                D_ASSOC("STA id %u addr %pM already present"
+                        " in uCode (according to driver)\n", sta_id,
+                        il->stations[sta_id].sta.sta.addr);
+        } else {
+                il->stations[sta_id].used |= IL_STA_UCODE_ACTIVE;
+                D_ASSOC("Added STA id %u addr %pM to uCode\n", sta_id,
+                        il->stations[sta_id].sta.sta.addr);
+        }
+}
+
+static int
+il_process_add_sta_resp(struct il_priv *il, struct il_addsta_cmd *addsta,
+                        struct il_rx_pkt *pkt, bool sync)
+{
+        u8 sta_id = addsta->sta.sta_id;
+        unsigned long flags;
+        int ret = -EIO;
+
+        if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {
+                IL_ERR("Bad return from C_ADD_STA (0x%08X)\n", pkt->hdr.flags);
+                return ret;
+        }
+
+        D_INFO("Processing response for adding station %u\n", sta_id);
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+
+        switch (pkt->u.add_sta.status) {
+        case ADD_STA_SUCCESS_MSK:
+                D_INFO("C_ADD_STA PASSED\n");
+                il_sta_ucode_activate(il, sta_id);
+                ret = 0;
+                break;
+        case ADD_STA_NO_ROOM_IN_TBL:
+                IL_ERR("Adding station %d failed, no room in table.\n", sta_id);
+                break;
+        case ADD_STA_NO_BLOCK_ACK_RESOURCE:
+                IL_ERR("Adding station %d failed, no block ack resource.\n",
+                       sta_id);
+                break;
+        case ADD_STA_MODIFY_NON_EXIST_STA:
+                IL_ERR("Attempting to modify non-existing station %d\n",
+                       sta_id);
+                break;
+        default:
+                D_ASSOC("Received C_ADD_STA:(0x%08X)\n", pkt->u.add_sta.status);
+                break;
+        }
+
+        D_INFO("%s station id %u addr %pM\n",
+               il->stations[sta_id].sta.mode ==
+               STA_CONTROL_MODIFY_MSK ? "Modified" : "Added", sta_id,
+               il->stations[sta_id].sta.sta.addr);
+
+        /*
+         * XXX: The MAC address in the command buffer is often changed from
+         * the original sent to the device. That is, the MAC address
+         * written to the command buffer often is not the same MAC address
+         * read from the command buffer when the command returns. This
+         * issue has not yet been resolved and this debugging is left to
+         * observe the problem.
+         */
+        D_INFO("%s station according to cmd buffer %pM\n",
+               il->stations[sta_id].sta.mode ==
+               STA_CONTROL_MODIFY_MSK ? "Modified" : "Added", addsta->sta.addr);
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        return ret;
+}
+
+static void
+il_add_sta_callback(struct il_priv *il, struct il_device_cmd *cmd,
+                    struct il_rx_pkt *pkt)
+{
+        struct il_addsta_cmd *addsta = (struct il_addsta_cmd *)cmd->cmd.payload;
+
+        il_process_add_sta_resp(il, addsta, pkt, false);
+
+}
+
+int
+il_send_add_sta(struct il_priv *il, struct il_addsta_cmd *sta, u8 flags)
+{
+        struct il_rx_pkt *pkt = NULL;
+        int ret = 0;
+        u8 data[sizeof(*sta)];
+        struct il_host_cmd cmd = {
+                .id = C_ADD_STA,
+                .flags = flags,
+                .data = data,
+        };
+        u8 sta_id __maybe_unused = sta->sta.sta_id;
+
+        D_INFO("Adding sta %u (%pM) %ssynchronously\n", sta_id, sta->sta.addr,
+               flags & CMD_ASYNC ? "a" : "");
+
+        if (flags & CMD_ASYNC)
+                cmd.callback = il_add_sta_callback;
+        else {
+                cmd.flags |= CMD_WANT_SKB;
+                might_sleep();
+        }
+
+        cmd.len = il->cfg->ops->utils->build_addsta_hcmd(sta, data);
+        ret = il_send_cmd(il, &cmd);
+
+        if (ret || (flags & CMD_ASYNC))
+                return ret;
+
+        if (ret == 0) {
+                pkt = (struct il_rx_pkt *)cmd.reply_page;
+                ret = il_process_add_sta_resp(il, sta, pkt, true);
+        }
+        il_free_pages(il, cmd.reply_page);
+
+        return ret;
+}
+EXPORT_SYMBOL(il_send_add_sta);
+
+static void
+il_set_ht_add_station(struct il_priv *il, u8 idx, struct ieee80211_sta *sta,
+                      struct il_rxon_context *ctx)
+{
+        struct ieee80211_sta_ht_cap *sta_ht_inf = &sta->ht_cap;
+        __le32 sta_flags;
+        u8 mimo_ps_mode;
+
+        if (!sta || !sta_ht_inf->ht_supported)
+                goto done;
+
+        mimo_ps_mode = (sta_ht_inf->cap & IEEE80211_HT_CAP_SM_PS) >> 2;
+        D_ASSOC("spatial multiplexing power save mode: %s\n",
+                (mimo_ps_mode == WLAN_HT_CAP_SM_PS_STATIC) ? "static" :
+                (mimo_ps_mode == WLAN_HT_CAP_SM_PS_DYNAMIC) ? "dynamic" :
+                "disabled");
+
+        sta_flags = il->stations[idx].sta.station_flags;
+
+        sta_flags &= ~(STA_FLG_RTS_MIMO_PROT_MSK | STA_FLG_MIMO_DIS_MSK);
+
+        switch (mimo_ps_mode) {
+        case WLAN_HT_CAP_SM_PS_STATIC:
+                sta_flags |= STA_FLG_MIMO_DIS_MSK;
+                break;
+        case WLAN_HT_CAP_SM_PS_DYNAMIC:
+                sta_flags |= STA_FLG_RTS_MIMO_PROT_MSK;
+                break;
+        case WLAN_HT_CAP_SM_PS_DISABLED:
+                break;
+        default:
+                IL_WARN("Invalid MIMO PS mode %d\n", mimo_ps_mode);
+                break;
+        }
+
+        sta_flags |=
+            cpu_to_le32((u32) sta_ht_inf->
+                        ampdu_factor << STA_FLG_MAX_AGG_SIZE_POS);
+
+        sta_flags |=
+            cpu_to_le32((u32) sta_ht_inf->
+                        ampdu_density << STA_FLG_AGG_MPDU_DENSITY_POS);
+
+        if (il_is_ht40_tx_allowed(il, ctx, &sta->ht_cap))
+                sta_flags |= STA_FLG_HT40_EN_MSK;
+        else
+                sta_flags &= ~STA_FLG_HT40_EN_MSK;
+
+        il->stations[idx].sta.station_flags = sta_flags;
+done:
+        return;
+}
+
+/**
+ * il_prep_station - Prepare station information for addition
+ *
+ * should be called with sta_lock held
+ */
+u8
+il_prep_station(struct il_priv *il, struct il_rxon_context *ctx,
+                const u8 *addr, bool is_ap, struct ieee80211_sta *sta)
+{
+        struct il_station_entry *station;
+        int i;
+        u8 sta_id = IL_INVALID_STATION;
+        u16 rate;
+
+        if (is_ap)
+                sta_id = ctx->ap_sta_id;
+        else if (is_broadcast_ether_addr(addr))
+                sta_id = ctx->bcast_sta_id;
+        else
+                for (i = IL_STA_ID; i < il->hw_params.max_stations; i++) {
+                        if (!compare_ether_addr
+                            (il->stations[i].sta.sta.addr, addr)) {
+                                sta_id = i;
+                                break;
+                        }
+
+                        if (!il->stations[i].used &&
+                            sta_id == IL_INVALID_STATION)
+                                sta_id = i;
+                }
+
+        /*
+         * These two conditions have the same outcome, but keep them
+         * separate
+         */
+        if (unlikely(sta_id == IL_INVALID_STATION))
+                return sta_id;
+
+        /*
+         * uCode is not able to deal with multiple requests to add a
+         * station. Keep track if one is in progress so that we do not send
+         * another.
+         */
+        if (il->stations[sta_id].used & IL_STA_UCODE_INPROGRESS) {
+                D_INFO("STA %d already in process of being added.\n", sta_id);
+                return sta_id;
+        }
+
+        if ((il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE) &&
+            (il->stations[sta_id].used & IL_STA_UCODE_ACTIVE) &&
+            !compare_ether_addr(il->stations[sta_id].sta.sta.addr, addr)) {
+                D_ASSOC("STA %d (%pM) already added, not adding again.\n",
+                        sta_id, addr);
+                return sta_id;
+        }
+
+        station = &il->stations[sta_id];
+        station->used = IL_STA_DRIVER_ACTIVE;
+        D_ASSOC("Add STA to driver ID %d: %pM\n", sta_id, addr);
+        il->num_stations++;
+
+        /* Set up the C_ADD_STA command to send to device */
+        memset(&station->sta, 0, sizeof(struct il_addsta_cmd));
+        memcpy(station->sta.sta.addr, addr, ETH_ALEN);
+        station->sta.mode = 0;
+        station->sta.sta.sta_id = sta_id;
+        station->sta.station_flags = ctx->station_flags;
+        station->ctxid = ctx->ctxid;
+
+        if (sta) {
+                struct il_station_priv_common *sta_priv;
+
+                sta_priv = (void *)sta->drv_priv;
+                sta_priv->ctx = ctx;
+        }
+
+        /*
+         * OK to call unconditionally, since local stations (IBSS BSSID
+         * STA and broadcast STA) pass in a NULL sta, and mac80211
+         * doesn't allow HT IBSS.
+         */
+        il_set_ht_add_station(il, sta_id, sta, ctx);
+
+        /* 3945 only */
+        rate = (il->band == IEEE80211_BAND_5GHZ) ? RATE_6M_PLCP : RATE_1M_PLCP;
+        /* Turn on both antennas for the station... */
+        station->sta.rate_n_flags = cpu_to_le16(rate | RATE_MCS_ANT_AB_MSK);
+
+        return sta_id;
+
+}
+EXPORT_SYMBOL_GPL(il_prep_station);
+
+#define STA_WAIT_TIMEOUT (HZ/2)
+
+/**
+ * il_add_station_common -
+ */
+int
+il_add_station_common(struct il_priv *il, struct il_rxon_context *ctx,
+                      const u8 *addr, bool is_ap, struct ieee80211_sta *sta,
+                      u8 *sta_id_r)
+{
+        unsigned long flags_spin;
+        int ret = 0;
+        u8 sta_id;
+        struct il_addsta_cmd sta_cmd;
+
+        *sta_id_r = 0;
+        spin_lock_irqsave(&il->sta_lock, flags_spin);
+        sta_id = il_prep_station(il, ctx, addr, is_ap, sta);
+        if (sta_id == IL_INVALID_STATION) {
+                IL_ERR("Unable to prepare station %pM for addition\n", addr);
+                spin_unlock_irqrestore(&il->sta_lock, flags_spin);
+                return -EINVAL;
+        }
+
+        /*
+         * uCode is not able to deal with multiple requests to add a
+         * station. Keep track if one is in progress so that we do not send
+         * another.
+         */
+        if (il->stations[sta_id].used & IL_STA_UCODE_INPROGRESS) {
+                D_INFO("STA %d already in process of being added.\n", sta_id);
+                spin_unlock_irqrestore(&il->sta_lock, flags_spin);
+                return -EEXIST;
+        }
+
+        if ((il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE) &&
+            (il->stations[sta_id].used & IL_STA_UCODE_ACTIVE)) {
+                D_ASSOC("STA %d (%pM) already added, not adding again.\n",
+                        sta_id, addr);
+                spin_unlock_irqrestore(&il->sta_lock, flags_spin);
+                return -EEXIST;
+        }
+
+        il->stations[sta_id].used |= IL_STA_UCODE_INPROGRESS;
+        memcpy(&sta_cmd, &il->stations[sta_id].sta,
+               sizeof(struct il_addsta_cmd));
+        spin_unlock_irqrestore(&il->sta_lock, flags_spin);
+
+        /* Add station to device's station table */
+        ret = il_send_add_sta(il, &sta_cmd, CMD_SYNC);
+        if (ret) {
+                spin_lock_irqsave(&il->sta_lock, flags_spin);
+                IL_ERR("Adding station %pM failed.\n",
+                       il->stations[sta_id].sta.sta.addr);
+                il->stations[sta_id].used &= ~IL_STA_DRIVER_ACTIVE;
+                il->stations[sta_id].used &= ~IL_STA_UCODE_INPROGRESS;
+                spin_unlock_irqrestore(&il->sta_lock, flags_spin);
+        }
+        *sta_id_r = sta_id;
+        return ret;
+}
+EXPORT_SYMBOL(il_add_station_common);
+
+/**
+ * il_sta_ucode_deactivate - deactivate ucode status for a station
+ *
+ * il->sta_lock must be held
+ */
+static void
+il_sta_ucode_deactivate(struct il_priv *il, u8 sta_id)
+{
+        /* Ucode must be active and driver must be non active */
+        if ((il->stations[sta_id].
+             used & (IL_STA_UCODE_ACTIVE | IL_STA_DRIVER_ACTIVE)) !=
+            IL_STA_UCODE_ACTIVE)
+                IL_ERR("removed non active STA %u\n", sta_id);
+
+        il->stations[sta_id].used &= ~IL_STA_UCODE_ACTIVE;
+
+        memset(&il->stations[sta_id], 0, sizeof(struct il_station_entry));
+        D_ASSOC("Removed STA %u\n", sta_id);
+}
+
+static int
+il_send_remove_station(struct il_priv *il, const u8 * addr, int sta_id,
+                       bool temporary)
+{
+        struct il_rx_pkt *pkt;
+        int ret;
+
+        unsigned long flags_spin;
+        struct il_rem_sta_cmd rm_sta_cmd;
+
+        struct il_host_cmd cmd = {
+                .id = C_REM_STA,
+                .len = sizeof(struct il_rem_sta_cmd),
+                .flags = CMD_SYNC,
+                .data = &rm_sta_cmd,
+        };
+
+        memset(&rm_sta_cmd, 0, sizeof(rm_sta_cmd));
+        rm_sta_cmd.num_sta = 1;
+        memcpy(&rm_sta_cmd.addr, addr, ETH_ALEN);
+
+        cmd.flags |= CMD_WANT_SKB;
+
+        ret = il_send_cmd(il, &cmd);
+
+        if (ret)
+                return ret;
+
+        pkt = (struct il_rx_pkt *)cmd.reply_page;
+        if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {
+                IL_ERR("Bad return from C_REM_STA (0x%08X)\n", pkt->hdr.flags);
+                ret = -EIO;
+        }
+
+        if (!ret) {
+                switch (pkt->u.rem_sta.status) {
+                case REM_STA_SUCCESS_MSK:
+                        if (!temporary) {
+                                spin_lock_irqsave(&il->sta_lock, flags_spin);
+                                il_sta_ucode_deactivate(il, sta_id);
+                                spin_unlock_irqrestore(&il->sta_lock,
+                                                       flags_spin);
+                        }
+                        D_ASSOC("C_REM_STA PASSED\n");
+                        break;
+                default:
+                        ret = -EIO;
+                        IL_ERR("C_REM_STA failed\n");
+                        break;
+                }
+        }
+        il_free_pages(il, cmd.reply_page);
+
+        return ret;
+}
+
+/**
+ * il_remove_station - Remove driver's knowledge of station.
+ */
+int
+il_remove_station(struct il_priv *il, const u8 sta_id, const u8 * addr)
+{
+        unsigned long flags;
+
+        if (!il_is_ready(il)) {
+                D_INFO("Unable to remove station %pM, device not ready.\n",
+                       addr);
+                /*
+                 * It is typical for stations to be removed when we are
+                 * going down. Return success since device will be down
+                 * soon anyway
+                 */
+                return 0;
+        }
+
+        D_ASSOC("Removing STA from driver:%d  %pM\n", sta_id, addr);
+
+        if (WARN_ON(sta_id == IL_INVALID_STATION))
+                return -EINVAL;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+
+        if (!(il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE)) {
+                D_INFO("Removing %pM but non DRIVER active\n", addr);
+                goto out_err;
+        }
+
+        if (!(il->stations[sta_id].used & IL_STA_UCODE_ACTIVE)) {
+                D_INFO("Removing %pM but non UCODE active\n", addr);
+                goto out_err;
+        }
+
+        if (il->stations[sta_id].used & IL_STA_LOCAL) {
+                kfree(il->stations[sta_id].lq);
+                il->stations[sta_id].lq = NULL;
+        }
+
+        il->stations[sta_id].used &= ~IL_STA_DRIVER_ACTIVE;
+
+        il->num_stations--;
+
+        BUG_ON(il->num_stations < 0);
+
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+
+        return il_send_remove_station(il, addr, sta_id, false);
+out_err:
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+        return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(il_remove_station);
+
+/**
+ * il_clear_ucode_stations - clear ucode station table bits
+ *
+ * This function clears all the bits in the driver indicating
+ * which stations are active in the ucode. Call when something
+ * other than explicit station management would cause this in
+ * the ucode, e.g. unassociated RXON.
+ */
+void
+il_clear_ucode_stations(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        int i;
+        unsigned long flags_spin;
+        bool cleared = false;
+
+        D_INFO("Clearing ucode stations in driver\n");
+
+        spin_lock_irqsave(&il->sta_lock, flags_spin);
+        for (i = 0; i < il->hw_params.max_stations; i++) {
+                if (ctx && ctx->ctxid != il->stations[i].ctxid)
+                        continue;
+
+                if (il->stations[i].used & IL_STA_UCODE_ACTIVE) {
+                        D_INFO("Clearing ucode active for station %d\n", i);
+                        il->stations[i].used &= ~IL_STA_UCODE_ACTIVE;
+                        cleared = true;
+                }
+        }
+        spin_unlock_irqrestore(&il->sta_lock, flags_spin);
+
+        if (!cleared)
+                D_INFO("No active stations found to be cleared\n");
+}
+EXPORT_SYMBOL(il_clear_ucode_stations);
+
+/**
+ * il_restore_stations() - Restore driver known stations to device
+ *
+ * All stations considered active by driver, but not present in ucode, is
+ * restored.
+ *
+ * Function sleeps.
+ */
+void
+il_restore_stations(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        struct il_addsta_cmd sta_cmd;
+        struct il_link_quality_cmd lq;
+        unsigned long flags_spin;
+        int i;
+        bool found = false;
+        int ret;
+        bool send_lq;
+
+        if (!il_is_ready(il)) {
+                D_INFO("Not ready yet, not restoring any stations.\n");
+                return;
+        }
+
+        D_ASSOC("Restoring all known stations ... start.\n");
+        spin_lock_irqsave(&il->sta_lock, flags_spin);
+        for (i = 0; i < il->hw_params.max_stations; i++) {
+                if (ctx->ctxid != il->stations[i].ctxid)
+                        continue;
+                if ((il->stations[i].used & IL_STA_DRIVER_ACTIVE) &&
+                    !(il->stations[i].used & IL_STA_UCODE_ACTIVE)) {
+                        D_ASSOC("Restoring sta %pM\n",
+                                il->stations[i].sta.sta.addr);
+                        il->stations[i].sta.mode = 0;
+                        il->stations[i].used |= IL_STA_UCODE_INPROGRESS;
+                        found = true;
+                }
+        }
+
+        for (i = 0; i < il->hw_params.max_stations; i++) {
+                if ((il->stations[i].used & IL_STA_UCODE_INPROGRESS)) {
+                        memcpy(&sta_cmd, &il->stations[i].sta,
+                               sizeof(struct il_addsta_cmd));
+                        send_lq = false;
+                        if (il->stations[i].lq) {
+                                memcpy(&lq, il->stations[i].lq,
+                                       sizeof(struct il_link_quality_cmd));
+                                send_lq = true;
+                        }
+                        spin_unlock_irqrestore(&il->sta_lock, flags_spin);
+                        ret = il_send_add_sta(il, &sta_cmd, CMD_SYNC);
+                        if (ret) {
+                                spin_lock_irqsave(&il->sta_lock, flags_spin);
+                                IL_ERR("Adding station %pM failed.\n",
+                                       il->stations[i].sta.sta.addr);
+                                il->stations[i].used &= ~IL_STA_DRIVER_ACTIVE;
+                                il->stations[i].used &=
+                                    ~IL_STA_UCODE_INPROGRESS;
+                                spin_unlock_irqrestore(&il->sta_lock,
+                                                       flags_spin);
+                        }
+                        /*
+                         * Rate scaling has already been initialized, send
+                         * current LQ command
+                         */
+                        if (send_lq)
+                                il_send_lq_cmd(il, ctx, &lq, CMD_SYNC, true);
+                        spin_lock_irqsave(&il->sta_lock, flags_spin);
+                        il->stations[i].used &= ~IL_STA_UCODE_INPROGRESS;
+                }
+        }
+
+        spin_unlock_irqrestore(&il->sta_lock, flags_spin);
+        if (!found)
+                D_INFO("Restoring all known stations"
+                       " .... no stations to be restored.\n");
+        else
+                D_INFO("Restoring all known stations" " .... complete.\n");
+}
+EXPORT_SYMBOL(il_restore_stations);
+
+int
+il_get_free_ucode_key_idx(struct il_priv *il)
+{
+        int i;
+
+        for (i = 0; i < il->sta_key_max_num; i++)
+                if (!test_and_set_bit(i, &il->ucode_key_table))
+                        return i;
+
+        return WEP_INVALID_OFFSET;
+}
+EXPORT_SYMBOL(il_get_free_ucode_key_idx);
+
+void
+il_dealloc_bcast_stations(struct il_priv *il)
+{
+        unsigned long flags;
+        int i;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        for (i = 0; i < il->hw_params.max_stations; i++) {
+                if (!(il->stations[i].used & IL_STA_BCAST))
+                        continue;
+
+                il->stations[i].used &= ~IL_STA_UCODE_ACTIVE;
+                il->num_stations--;
+                BUG_ON(il->num_stations < 0);
+                kfree(il->stations[i].lq);
+                il->stations[i].lq = NULL;
+        }
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+}
+EXPORT_SYMBOL_GPL(il_dealloc_bcast_stations);
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+static void
+il_dump_lq_cmd(struct il_priv *il, struct il_link_quality_cmd *lq)
+{
+        int i;
+        D_RATE("lq station id 0x%x\n", lq->sta_id);
+        D_RATE("lq ant 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++)
+                D_RATE("lq idx %d 0x%X\n", i, lq->rs_table[i].rate_n_flags);
+}
+#else
+static inline void
+il_dump_lq_cmd(struct il_priv *il, struct il_link_quality_cmd *lq)
+{
+}
+#endif
+
+/**
+ * il_is_lq_table_valid() - Test one aspect of LQ cmd for validity
+ *
+ * It sometimes happens when a HT rate has been in use and we
+ * loose connectivity with AP then mac80211 will first tell us that the
+ * current channel is not HT anymore before removing the station. In such a
+ * scenario the RXON flags will be updated to indicate we are not
+ * communicating HT anymore, but the LQ command may still contain HT rates.
+ * Test for this to prevent driver from sending LQ command between the time
+ * RXON flags are updated and when LQ command is updated.
+ */
+static bool
+il_is_lq_table_valid(struct il_priv *il, struct il_rxon_context *ctx,
+                     struct il_link_quality_cmd *lq)
+{
+        int i;
+
+        if (ctx->ht.enabled)
+                return true;
+
+        D_INFO("Channel %u is not an HT channel\n", ctx->active.channel);
+        for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++) {
+                if (le32_to_cpu(lq->rs_table[i].rate_n_flags) & RATE_MCS_HT_MSK) {
+                        D_INFO("idx %d of LQ expects HT channel\n", i);
+                        return false;
+                }
+        }
+        return true;
+}
+
+/**
+ * il_send_lq_cmd() - Send link quality command
+ * @init: This command is sent as part of station initialization right
+ *        after station has been added.
+ *
+ * The link quality command is sent as the last step of station creation.
+ * This is the special case in which init is set and we call a callback in
+ * this case to clear the state indicating that station creation is in
+ * progress.
+ */
+int
+il_send_lq_cmd(struct il_priv *il, struct il_rxon_context *ctx,
+               struct il_link_quality_cmd *lq, u8 flags, bool init)
+{
+        int ret = 0;
+        unsigned long flags_spin;
+
+        struct il_host_cmd cmd = {
+                .id = C_TX_LINK_QUALITY_CMD,
+                .len = sizeof(struct il_link_quality_cmd),
+                .flags = flags,
+                .data = lq,
+        };
+
+        if (WARN_ON(lq->sta_id == IL_INVALID_STATION))
+                return -EINVAL;
+
+        spin_lock_irqsave(&il->sta_lock, flags_spin);
+        if (!(il->stations[lq->sta_id].used & IL_STA_DRIVER_ACTIVE)) {
+                spin_unlock_irqrestore(&il->sta_lock, flags_spin);
+                return -EINVAL;
+        }
+        spin_unlock_irqrestore(&il->sta_lock, flags_spin);
+
+        il_dump_lq_cmd(il, lq);
+        BUG_ON(init && (cmd.flags & CMD_ASYNC));
+
+        if (il_is_lq_table_valid(il, ctx, lq))
+                ret = il_send_cmd(il, &cmd);
+        else
+                ret = -EINVAL;
+
+        if (cmd.flags & CMD_ASYNC)
+                return ret;
+
+        if (init) {
+                D_INFO("init LQ command complete,"
+                       " clearing sta addition status for sta %d\n",
+                       lq->sta_id);
+                spin_lock_irqsave(&il->sta_lock, flags_spin);
+                il->stations[lq->sta_id].used &= ~IL_STA_UCODE_INPROGRESS;
+                spin_unlock_irqrestore(&il->sta_lock, flags_spin);
+        }
+        return ret;
+}
+EXPORT_SYMBOL(il_send_lq_cmd);
+
+int
+il_mac_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                  struct ieee80211_sta *sta)
+{
+        struct il_priv *il = hw->priv;
+        struct il_station_priv_common *sta_common = (void *)sta->drv_priv;
+        int ret;
+
+        D_INFO("received request to remove station %pM\n", sta->addr);
+        mutex_lock(&il->mutex);
+        D_INFO("proceeding to remove station %pM\n", sta->addr);
+        ret = il_remove_station(il, sta_common->sta_id, sta->addr);
+        if (ret)
+                IL_ERR("Error removing station %pM\n", sta->addr);
+        mutex_unlock(&il->mutex);
+        return ret;
+}
+EXPORT_SYMBOL(il_mac_sta_remove);
+
+/************************** RX-FUNCTIONS ****************************/
+/*
+ * Rx theory of operation
+ *
+ * Driver allocates a circular buffer of Receive Buffer Descriptors (RBDs),
+ * each of which point to Receive Buffers to be filled by the NIC.  These get
+ * used not only for Rx frames, but for any command response or notification
+ * from the NIC.  The driver and NIC manage the Rx buffers by means
+ * of idxes into the circular buffer.
+ *
+ * Rx Queue Indexes
+ * The host/firmware share two idx registers for managing the Rx buffers.
+ *
+ * The READ idx maps to the first position that the firmware may be writing
+ * to -- the driver can read up to (but not including) this position and get
+ * good data.
+ * The READ idx is managed by the firmware once the card is enabled.
+ *
+ * The WRITE idx maps to the last position the driver has read from -- the
+ * position preceding WRITE is the last slot the firmware can place a packet.
+ *
+ * The queue is empty (no good data) if WRITE = READ - 1, and is full if
+ * WRITE = READ.
+ *
+ * During initialization, the host sets up the READ queue position to the first
+ * IDX position, and WRITE to the last (READ - 1 wrapped)
+ *
+ * When the firmware places a packet in a buffer, it will advance the READ idx
+ * and fire the RX interrupt.  The driver can then query the READ idx and
+ * process as many packets as possible, moving the WRITE idx forward as it
+ * resets the Rx queue buffers with new memory.
+ *
+ * The management in the driver is as follows:
+ * + A list of pre-allocated SKBs is stored in iwl->rxq->rx_free.  When
+ *   iwl->rxq->free_count drops to or below RX_LOW_WATERMARK, work is scheduled
+ *   to replenish the iwl->rxq->rx_free.
+ * + In il_rx_replenish (scheduled) if 'processed' != 'read' then the
+ *   iwl->rxq is replenished and the READ IDX is updated (updating the
+ *   'processed' and 'read' driver idxes as well)
+ * + A received packet is processed and handed to the kernel network stack,
+ *   detached from the iwl->rxq.  The driver 'processed' idx is updated.
+ * + The Host/Firmware iwl->rxq is replenished at tasklet time from the rx_free
+ *   list. If there are no allocated buffers in iwl->rxq->rx_free, the READ
+ *   IDX is not incremented and iwl->status(RX_STALLED) is set.  If there
+ *   were enough free buffers and RX_STALLED is set it is cleared.
+ *
+ *
+ * Driver sequence:
+ *
+ * il_rx_queue_alloc()   Allocates rx_free
+ * il_rx_replenish()     Replenishes rx_free list from rx_used, and calls
+ *                            il_rx_queue_restock
+ * il_rx_queue_restock() Moves available buffers from rx_free into Rx
+ *                            queue, updates firmware pointers, and updates
+ *                            the WRITE idx.  If insufficient rx_free buffers
+ *                            are available, schedules il_rx_replenish
+ *
+ * -- enable interrupts --
+ * ISR - il_rx()         Detach il_rx_bufs from pool up to the
+ *                            READ IDX, detaching the SKB from the pool.
+ *                            Moves the packet buffer from queue to rx_used.
+ *                            Calls il_rx_queue_restock to refill any empty
+ *                            slots.
+ * ...
+ *
+ */
+
+/**
+ * il_rx_queue_space - Return number of free slots available in queue.
+ */
+int
+il_rx_queue_space(const struct il_rx_queue *q)
+{
+        int s = q->read - q->write;
+        if (s <= 0)
+                s += RX_QUEUE_SIZE;
+        /* keep some buffer to not confuse full and empty queue */
+        s -= 2;
+        if (s < 0)
+                s = 0;
+        return s;
+}
+EXPORT_SYMBOL(il_rx_queue_space);
+
+/**
+ * il_rx_queue_update_write_ptr - Update the write pointer for the RX queue
+ */
+void
+il_rx_queue_update_write_ptr(struct il_priv *il, struct il_rx_queue *q)
+{
+        unsigned long flags;
+        u32 rx_wrt_ptr_reg = il->hw_params.rx_wrt_ptr_reg;
+        u32 reg;
+
+        spin_lock_irqsave(&q->lock, flags);
+
+        if (q->need_update == 0)
+                goto exit_unlock;
+
+        /* If power-saving is in use, make sure device is awake */
+        if (test_bit(S_POWER_PMI, &il->status)) {
+                reg = _il_rd(il, CSR_UCODE_DRV_GP1);
+
+                if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {
+                        D_INFO("Rx queue requesting wakeup," " GP1 = 0x%x\n",
+                               reg);
+                        il_set_bit(il, CSR_GP_CNTRL,
+                                   CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+                        goto exit_unlock;
+                }
+
+                q->write_actual = (q->write & ~0x7);
+                il_wr(il, rx_wrt_ptr_reg, q->write_actual);
+
+                /* Else device is assumed to be awake */
+        } else {
+                /* Device expects a multiple of 8 */
+                q->write_actual = (q->write & ~0x7);
+                il_wr(il, rx_wrt_ptr_reg, q->write_actual);
+        }
+
+        q->need_update = 0;
+
+exit_unlock:
+        spin_unlock_irqrestore(&q->lock, flags);
+}
+EXPORT_SYMBOL(il_rx_queue_update_write_ptr);
+
+int
+il_rx_queue_alloc(struct il_priv *il)
+{
+        struct il_rx_queue *rxq = &il->rxq;
+        struct device *dev = &il->pci_dev->dev;
+        int i;
+
+        spin_lock_init(&rxq->lock);
+        INIT_LIST_HEAD(&rxq->rx_free);
+        INIT_LIST_HEAD(&rxq->rx_used);
+
+        /* Alloc the circular buffer of Read Buffer Descriptors (RBDs) */
+        rxq->bd =
+            dma_alloc_coherent(dev, 4 * RX_QUEUE_SIZE, &rxq->bd_dma,
+                               GFP_KERNEL);
+        if (!rxq->bd)
+                goto err_bd;
+
+        rxq->rb_stts =
+            dma_alloc_coherent(dev, sizeof(struct il_rb_status),
+                               &rxq->rb_stts_dma, GFP_KERNEL);
+        if (!rxq->rb_stts)
+                goto err_rb;
+
+        /* Fill the rx_used queue with _all_ of the Rx buffers */
+        for (i = 0; i < RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++)
+                list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
+
+        /* Set us so that we have processed and used all buffers, but have
+         * not restocked the Rx queue with fresh buffers */
+        rxq->read = rxq->write = 0;
+        rxq->write_actual = 0;
+        rxq->free_count = 0;
+        rxq->need_update = 0;
+        return 0;
+
+err_rb:
+        dma_free_coherent(&il->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,
+                          rxq->bd_dma);
+err_bd:
+        return -ENOMEM;
+}
+EXPORT_SYMBOL(il_rx_queue_alloc);
+
+void
+il_hdl_spectrum_measurement(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct il_spectrum_notification *report = &(pkt->u.spectrum_notif);
+
+        if (!report->state) {
+                D_11H("Spectrum Measure Notification: Start\n");
+                return;
+        }
+
+        memcpy(&il->measure_report, report, sizeof(*report));
+        il->measurement_status |= MEASUREMENT_READY;
+}
+EXPORT_SYMBOL(il_hdl_spectrum_measurement);
+
+/*
+ * returns non-zero if packet should be dropped
+ */
+int
+il_set_decrypted_flag(struct il_priv *il, struct ieee80211_hdr *hdr,
+                      u32 decrypt_res, struct ieee80211_rx_status *stats)
+{
+        u16 fc = le16_to_cpu(hdr->frame_control);
+
+        /*
+         * All contexts have the same setting here due to it being
+         * a module parameter, so OK to check any context.
+         */
+        if (il->ctx.active.filter_flags & RXON_FILTER_DIS_DECRYPT_MSK)
+                return 0;
+
+        if (!(fc & IEEE80211_FCTL_PROTECTED))
+                return 0;
+
+        D_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;
+
+        case RX_RES_STATUS_SEC_TYPE_WEP:
+                if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==
+                    RX_RES_STATUS_BAD_ICV_MIC) {
+                        /* bad ICV, the packet is destroyed since the
+                         * decryption is inplace, drop it */
+                        D_RX("Packet destroyed\n");
+                        return -1;
+                }
+        case RX_RES_STATUS_SEC_TYPE_CCMP:
+                if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==
+                    RX_RES_STATUS_DECRYPT_OK) {
+                        D_RX("hw decrypt successfully!!!\n");
+                        stats->flag |= RX_FLAG_DECRYPTED;
+                }
+                break;
+
+        default:
+                break;
+        }
+        return 0;
+}
+EXPORT_SYMBOL(il_set_decrypted_flag);
+
+/**
+ * il_txq_update_write_ptr - Send new write idx to hardware
+ */
+void
+il_txq_update_write_ptr(struct il_priv *il, struct il_tx_queue *txq)
+{
+        u32 reg = 0;
+        int txq_id = txq->q.id;
+
+        if (txq->need_update == 0)
+                return;
+
+        /* if we're trying to save power */
+        if (test_bit(S_POWER_PMI, &il->status)) {
+                /* 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 = _il_rd(il, CSR_UCODE_DRV_GP1);
+
+                if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {
+                        D_INFO("Tx queue %d requesting wakeup," " GP1 = 0x%x\n",
+                               txq_id, reg);
+                        il_set_bit(il, CSR_GP_CNTRL,
+                                   CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+                        return;
+                }
+
+                il_wr(il, HBUS_TARG_WRPTR, txq->q.write_ptr | (txq_id << 8));
+
+                /*
+                 * 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
+                _il_wr(il, HBUS_TARG_WRPTR, txq->q.write_ptr | (txq_id << 8));
+        txq->need_update = 0;
+}
+EXPORT_SYMBOL(il_txq_update_write_ptr);
+
+/**
+ * il_tx_queue_unmap -  Unmap any remaining DMA mappings and free skb's
+ */
+void
+il_tx_queue_unmap(struct il_priv *il, int txq_id)
+{
+        struct il_tx_queue *txq = &il->txq[txq_id];
+        struct il_queue *q = &txq->q;
+
+        if (q->n_bd == 0)
+                return;
+
+        while (q->write_ptr != q->read_ptr) {
+                il->cfg->ops->lib->txq_free_tfd(il, txq);
+                q->read_ptr = il_queue_inc_wrap(q->read_ptr, q->n_bd);
+        }
+}
+EXPORT_SYMBOL(il_tx_queue_unmap);
+
+/**
+ * il_tx_queue_free - Deallocate DMA queue.
+ * @txq: Transmit queue to deallocate.
+ *
+ * Empty queue by removing and destroying all BD's.
+ * Free all buffers.
+ * 0-fill, but do not free "txq" descriptor structure.
+ */
+void
+il_tx_queue_free(struct il_priv *il, int txq_id)
+{
+        struct il_tx_queue *txq = &il->txq[txq_id];
+        struct device *dev = &il->pci_dev->dev;
+        int i;
+
+        il_tx_queue_unmap(il, txq_id);
+
+        /* De-alloc array of command/tx buffers */
+        for (i = 0; i < TFD_TX_CMD_SLOTS; i++)
+                kfree(txq->cmd[i]);
+
+        /* De-alloc circular buffer of TFDs */
+        if (txq->q.n_bd)
+                dma_free_coherent(dev, il->hw_params.tfd_size * txq->q.n_bd,
+                                  txq->tfds, txq->q.dma_addr);
+
+        /* De-alloc array of per-TFD driver data */
+        kfree(txq->txb);
+        txq->txb = NULL;
+
+        /* deallocate arrays */
+        kfree(txq->cmd);
+        kfree(txq->meta);
+        txq->cmd = NULL;
+        txq->meta = NULL;
+
+        /* 0-fill queue descriptor structure */
+        memset(txq, 0, sizeof(*txq));
+}
+EXPORT_SYMBOL(il_tx_queue_free);
+
+/**
+ * il_cmd_queue_unmap - Unmap any remaining DMA mappings from command queue
+ */
+void
+il_cmd_queue_unmap(struct il_priv *il)
+{
+        struct il_tx_queue *txq = &il->txq[il->cmd_queue];
+        struct il_queue *q = &txq->q;
+        int i;
+
+        if (q->n_bd == 0)
+                return;
+
+        while (q->read_ptr != q->write_ptr) {
+                i = il_get_cmd_idx(q, q->read_ptr, 0);
+
+                if (txq->meta[i].flags & CMD_MAPPED) {
+                        pci_unmap_single(il->pci_dev,
+                                         dma_unmap_addr(&txq->meta[i], mapping),
+                                         dma_unmap_len(&txq->meta[i], len),
+                                         PCI_DMA_BIDIRECTIONAL);
+                        txq->meta[i].flags = 0;
+                }
+
+                q->read_ptr = il_queue_inc_wrap(q->read_ptr, q->n_bd);
+        }
+
+        i = q->n_win;
+        if (txq->meta[i].flags & CMD_MAPPED) {
+                pci_unmap_single(il->pci_dev,
+                                 dma_unmap_addr(&txq->meta[i], mapping),
+                                 dma_unmap_len(&txq->meta[i], len),
+                                 PCI_DMA_BIDIRECTIONAL);
+                txq->meta[i].flags = 0;
+        }
+}
+EXPORT_SYMBOL(il_cmd_queue_unmap);
+
+/**
+ * il_cmd_queue_free - Deallocate DMA queue.
+ * @txq: Transmit queue to deallocate.
+ *
+ * Empty queue by removing and destroying all BD's.
+ * Free all buffers.
+ * 0-fill, but do not free "txq" descriptor structure.
+ */
+void
+il_cmd_queue_free(struct il_priv *il)
+{
+        struct il_tx_queue *txq = &il->txq[il->cmd_queue];
+        struct device *dev = &il->pci_dev->dev;
+        int i;
+
+        il_cmd_queue_unmap(il);
+
+        /* De-alloc array of command/tx buffers */
+        for (i = 0; i <= TFD_CMD_SLOTS; i++)
+                kfree(txq->cmd[i]);
+
+        /* De-alloc circular buffer of TFDs */
+        if (txq->q.n_bd)
+                dma_free_coherent(dev, il->hw_params.tfd_size * txq->q.n_bd,
+                                  txq->tfds, txq->q.dma_addr);
+
+        /* deallocate arrays */
+        kfree(txq->cmd);
+        kfree(txq->meta);
+        txq->cmd = NULL;
+        txq->meta = NULL;
+
+        /* 0-fill queue descriptor structure */
+        memset(txq, 0, sizeof(*txq));
+}
+EXPORT_SYMBOL(il_cmd_queue_free);
+
+/*************** DMA-QUEUE-GENERAL-FUNCTIONS  *****
+ * DMA services
+ *
+ * Theory of operation
+ *
+ * A Tx or Rx queue resides in host DRAM, and is comprised of a circular buffer
+ * of buffer descriptors, each of which points to one or more data buffers for
+ * the device to read from or fill.  Driver and device exchange status of each
+ * queue via "read" and "write" pointers.  Driver keeps minimum of 2 empty
+ * entries in each circular buffer, to protect against confusing empty and full
+ * queue states.
+ *
+ * The device reads or writes the data in the queues via the device's several
+ * DMA/FIFO channels.  Each queue is mapped to a single DMA channel.
+ *
+ * For Tx queue, there are low mark and high mark limits. If, after queuing
+ * the packet for Tx, free space become < low mark, Tx queue stopped. When
+ * reclaiming packets (on 'tx done IRQ), if free space become > high mark,
+ * Tx queue resumed.
+ *
+ * See more detailed info in 4965.h.
+ ***************************************************/
+
+int
+il_queue_space(const struct il_queue *q)
+{
+        int s = q->read_ptr - q->write_ptr;
+
+        if (q->read_ptr > q->write_ptr)
+                s -= q->n_bd;
+
+        if (s <= 0)
+                s += q->n_win;
+        /* keep some reserve to not confuse empty and full situations */
+        s -= 2;
+        if (s < 0)
+                s = 0;
+        return s;
+}
+EXPORT_SYMBOL(il_queue_space);
+
+
+/**
+ * il_queue_init - Initialize queue's high/low-water and read/write idxes
+ */
+static int
+il_queue_init(struct il_priv *il, struct il_queue *q, int count, int slots_num,
+              u32 id)
+{
+        q->n_bd = count;
+        q->n_win = slots_num;
+        q->id = id;
+
+        /* count must be power-of-two size, otherwise il_queue_inc_wrap
+         * and il_queue_dec_wrap are broken. */
+        BUG_ON(!is_power_of_2(count));
+
+        /* slots_num must be power-of-two size, otherwise
+         * il_get_cmd_idx is broken. */
+        BUG_ON(!is_power_of_2(slots_num));
+
+        q->low_mark = q->n_win / 4;
+        if (q->low_mark < 4)
+                q->low_mark = 4;
+
+        q->high_mark = q->n_win / 8;
+        if (q->high_mark < 2)
+                q->high_mark = 2;
+
+        q->write_ptr = q->read_ptr = 0;
+
+        return 0;
+}
+
+/**
+ * il_tx_queue_alloc - Alloc driver data and TFD CB for one Tx/cmd queue
+ */
+static int
+il_tx_queue_alloc(struct il_priv *il, struct il_tx_queue *txq, u32 id)
+{
+        struct device *dev = &il->pci_dev->dev;
+        size_t tfd_sz = il->hw_params.tfd_size * TFD_QUEUE_SIZE_MAX;
+
+        /* Driver ilate data, only for Tx (not command) queues,
+         * not shared with device. */
+        if (id != il->cmd_queue) {
+                txq->txb = kcalloc(TFD_QUEUE_SIZE_MAX, sizeof(txq->txb[0]),
+                                   GFP_KERNEL);
+                if (!txq->txb) {
+                        IL_ERR("kmalloc for auxiliary BD "
+                               "structures failed\n");
+                        goto error;
+                }
+        } else {
+                txq->txb = NULL;
+        }
+
+        /* Circular buffer of transmit frame descriptors (TFDs),
+         * shared with device */
+        txq->tfds =
+            dma_alloc_coherent(dev, tfd_sz, &txq->q.dma_addr, GFP_KERNEL);
+        if (!txq->tfds) {
+                IL_ERR("pci_alloc_consistent(%zd) failed\n", tfd_sz);
+                goto error;
+        }
+        txq->q.id = id;
+
+        return 0;
+
+error:
+        kfree(txq->txb);
+        txq->txb = NULL;
+
+        return -ENOMEM;
+}
+
+/**
+ * il_tx_queue_init - Allocate and initialize one tx/cmd queue
+ */
+int
+il_tx_queue_init(struct il_priv *il, struct il_tx_queue *txq, int slots_num,
+                 u32 txq_id)
+{
+        int i, len;
+        int ret;
+        int actual_slots = slots_num;
+
+        /*
+         * Alloc buffer array for commands (Tx or other types of commands).
+         * For the command queue (#4/#9), allocate command space + one big
+         * command for scan, since scan command is very huge; the system will
+         * not have two scans at the same time, so only one is needed.
+         * For normal Tx queues (all other queues), no super-size command
+         * space is needed.
+         */
+        if (txq_id == il->cmd_queue)
+                actual_slots++;
+
+        txq->meta =
+            kzalloc(sizeof(struct il_cmd_meta) * actual_slots, GFP_KERNEL);
+        txq->cmd =
+            kzalloc(sizeof(struct il_device_cmd *) * actual_slots, GFP_KERNEL);
+
+        if (!txq->meta || !txq->cmd)
+                goto out_free_arrays;
+
+        len = sizeof(struct il_device_cmd);
+        for (i = 0; i < actual_slots; i++) {
+                /* only happens for cmd queue */
+                if (i == slots_num)
+                        len = IL_MAX_CMD_SIZE;
+
+                txq->cmd[i] = kmalloc(len, GFP_KERNEL);
+                if (!txq->cmd[i])
+                        goto err;
+        }
+
+        /* Alloc driver data array and TFD circular buffer */
+        ret = il_tx_queue_alloc(il, txq, txq_id);
+        if (ret)
+                goto err;
+
+        txq->need_update = 0;
+
+        /*
+         * For the default queues 0-3, set up the swq_id
+         * already -- all others need to get one later
+         * (if they need one at all).
+         */
+        if (txq_id < 4)
+                il_set_swq_id(txq, txq_id, txq_id);
+
+        /* TFD_QUEUE_SIZE_MAX must be power-of-two size, otherwise
+         * il_queue_inc_wrap and il_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 idxes */
+        il_queue_init(il, &txq->q, TFD_QUEUE_SIZE_MAX, slots_num, txq_id);
+
+        /* Tell device where to find queue */
+        il->cfg->ops->lib->txq_init(il, txq);
+
+        return 0;
+err:
+        for (i = 0; i < actual_slots; i++)
+                kfree(txq->cmd[i]);
+out_free_arrays:
+        kfree(txq->meta);
+        kfree(txq->cmd);
+
+        return -ENOMEM;
+}
+EXPORT_SYMBOL(il_tx_queue_init);
+
+void
+il_tx_queue_reset(struct il_priv *il, struct il_tx_queue *txq, int slots_num,
+                  u32 txq_id)
+{
+        int actual_slots = slots_num;
+
+        if (txq_id == il->cmd_queue)
+                actual_slots++;
+
+        memset(txq->meta, 0, sizeof(struct il_cmd_meta) * actual_slots);
+
+        txq->need_update = 0;
+
+        /* Initialize queue's high/low-water marks, and head/tail idxes */
+        il_queue_init(il, &txq->q, TFD_QUEUE_SIZE_MAX, slots_num, txq_id);
+
+        /* Tell device where to find queue */
+        il->cfg->ops->lib->txq_init(il, txq);
+}
+EXPORT_SYMBOL(il_tx_queue_reset);
+
+/*************** HOST COMMAND QUEUE FUNCTIONS   *****/
+
+/**
+ * il_enqueue_hcmd - enqueue a uCode command
+ * @il: device ilate data point
+ * @cmd: a point to the ucode command structure
+ *
+ * The function returns < 0 values to indicate the operation is
+ * failed. On success, it turns the idx (> 0) of command in the
+ * command queue.
+ */
+int
+il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd)
+{
+        struct il_tx_queue *txq = &il->txq[il->cmd_queue];
+        struct il_queue *q = &txq->q;
+        struct il_device_cmd *out_cmd;
+        struct il_cmd_meta *out_meta;
+        dma_addr_t phys_addr;
+        unsigned long flags;
+        int len;
+        u32 idx;
+        u16 fix_size;
+
+        cmd->len = il->cfg->ops->utils->get_hcmd_size(cmd->id, cmd->len);
+        fix_size = (u16) (cmd->len + sizeof(out_cmd->hdr));
+
+        /* If any of the command structures end up being larger than
+         * the TFD_MAX_PAYLOAD_SIZE, and it sent as a 'small' command then
+         * we will need to increase the size of the TFD entries
+         * Also, check to see if command buffer should not exceed the size
+         * of device_cmd and max_cmd_size. */
+        BUG_ON((fix_size > TFD_MAX_PAYLOAD_SIZE) &&
+               !(cmd->flags & CMD_SIZE_HUGE));
+        BUG_ON(fix_size > IL_MAX_CMD_SIZE);
+
+        if (il_is_rfkill(il) || il_is_ctkill(il)) {
+                IL_WARN("Not sending command - %s KILL\n",
+                        il_is_rfkill(il) ? "RF" : "CT");
+                return -EIO;
+        }
+
+        spin_lock_irqsave(&il->hcmd_lock, flags);
+
+        if (il_queue_space(q) < ((cmd->flags & CMD_ASYNC) ? 2 : 1)) {
+                spin_unlock_irqrestore(&il->hcmd_lock, flags);
+
+                IL_ERR("Restarting adapter due to command queue full\n");
+                queue_work(il->workqueue, &il->restart);
+                return -ENOSPC;
+        }
+
+        idx = il_get_cmd_idx(q, q->write_ptr, cmd->flags & CMD_SIZE_HUGE);
+        out_cmd = txq->cmd[idx];
+        out_meta = &txq->meta[idx];
+
+        if (WARN_ON(out_meta->flags & CMD_MAPPED)) {
+                spin_unlock_irqrestore(&il->hcmd_lock, flags);
+                return -ENOSPC;
+        }
+
+        memset(out_meta, 0, sizeof(*out_meta)); /* re-initialize to NULL */
+        out_meta->flags = cmd->flags | CMD_MAPPED;
+        if (cmd->flags & CMD_WANT_SKB)
+                out_meta->source = cmd;
+        if (cmd->flags & CMD_ASYNC)
+                out_meta->callback = cmd->callback;
+
+        out_cmd->hdr.cmd = cmd->id;
+        memcpy(&out_cmd->cmd.payload, cmd->data, cmd->len);
+
+        /* At this point, the out_cmd now has all of the incoming cmd
+         * information */
+
+        out_cmd->hdr.flags = 0;
+        out_cmd->hdr.sequence =
+            cpu_to_le16(QUEUE_TO_SEQ(il->cmd_queue) | IDX_TO_SEQ(q->write_ptr));
+        if (cmd->flags & CMD_SIZE_HUGE)
+                out_cmd->hdr.sequence |= SEQ_HUGE_FRAME;
+        len = sizeof(struct il_device_cmd);
+        if (idx == TFD_CMD_SLOTS)
+                len = IL_MAX_CMD_SIZE;
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+        switch (out_cmd->hdr.cmd) {
+        case C_TX_LINK_QUALITY_CMD:
+        case C_SENSITIVITY:
+                D_HC_DUMP("Sending command %s (#%x), seq: 0x%04X, "
+                          "%d bytes at %d[%d]:%d\n",
+                          il_get_cmd_string(out_cmd->hdr.cmd), out_cmd->hdr.cmd,
+                          le16_to_cpu(out_cmd->hdr.sequence), fix_size,
+                          q->write_ptr, idx, il->cmd_queue);
+                break;
+        default:
+                D_HC("Sending command %s (#%x), seq: 0x%04X, "
+                     "%d bytes at %d[%d]:%d\n",
+                     il_get_cmd_string(out_cmd->hdr.cmd), out_cmd->hdr.cmd,
+                     le16_to_cpu(out_cmd->hdr.sequence), fix_size, q->write_ptr,
+                     idx, il->cmd_queue);
+        }
+#endif
+        txq->need_update = 1;
+
+        if (il->cfg->ops->lib->txq_update_byte_cnt_tbl)
+                /* Set up entry in queue's byte count circular buffer */
+                il->cfg->ops->lib->txq_update_byte_cnt_tbl(il, txq, 0);
+
+        phys_addr =
+            pci_map_single(il->pci_dev, &out_cmd->hdr, fix_size,
+                           PCI_DMA_BIDIRECTIONAL);
+        dma_unmap_addr_set(out_meta, mapping, phys_addr);
+        dma_unmap_len_set(out_meta, len, fix_size);
+
+        il->cfg->ops->lib->txq_attach_buf_to_tfd(il, txq, phys_addr, fix_size,
+                                                 1, U32_PAD(cmd->len));
+
+        /* Increment and update queue's write idx */
+        q->write_ptr = il_queue_inc_wrap(q->write_ptr, q->n_bd);
+        il_txq_update_write_ptr(il, txq);
+
+        spin_unlock_irqrestore(&il->hcmd_lock, flags);
+        return idx;
+}
+
+/**
+ * il_hcmd_queue_reclaim - Reclaim TX command queue entries already Tx'd
+ *
+ * When FW advances 'R' idx, all entries between old and new 'R' idx
+ * 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
+il_hcmd_queue_reclaim(struct il_priv *il, int txq_id, int idx, int cmd_idx)
+{
+        struct il_tx_queue *txq = &il->txq[txq_id];
+        struct il_queue *q = &txq->q;
+        int nfreed = 0;
+
+        if (idx >= q->n_bd || il_queue_used(q, idx) == 0) {
+                IL_ERR("Read idx for DMA queue txq id (%d), idx %d, "
+                       "is out of range [0-%d] %d %d.\n", txq_id, idx, q->n_bd,
+                       q->write_ptr, q->read_ptr);
+                return;
+        }
+
+        for (idx = il_queue_inc_wrap(idx, q->n_bd); q->read_ptr != idx;
+             q->read_ptr = il_queue_inc_wrap(q->read_ptr, q->n_bd)) {
+
+                if (nfreed++ > 0) {
+                        IL_ERR("HCMD skipped: idx (%d) %d %d\n", idx,
+                               q->write_ptr, q->read_ptr);
+                        queue_work(il->workqueue, &il->restart);
+                }
+
+        }
+}
+
+/**
+ * il_tx_cmd_complete - Pull unused buffers off the queue and reclaim them
+ * @rxb: Rx buffer to reclaim
+ *
+ * If an Rx buffer has an async callback associated with it the callback
+ * will be executed.  The attached skb (if present) will only be freed
+ * if the callback returns 1
+ */
+void
+il_tx_cmd_complete(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        u16 sequence = le16_to_cpu(pkt->hdr.sequence);
+        int txq_id = SEQ_TO_QUEUE(sequence);
+        int idx = SEQ_TO_IDX(sequence);
+        int cmd_idx;
+        bool huge = !!(pkt->hdr.sequence & SEQ_HUGE_FRAME);
+        struct il_device_cmd *cmd;
+        struct il_cmd_meta *meta;
+        struct il_tx_queue *txq = &il->txq[il->cmd_queue];
+        unsigned long flags;
+
+        /* 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 (WARN
+            (txq_id != il->cmd_queue,
+             "wrong command queue %d (should be %d), sequence 0x%X readp=%d writep=%d\n",
+             txq_id, il->cmd_queue, sequence, il->txq[il->cmd_queue].q.read_ptr,
+             il->txq[il->cmd_queue].q.write_ptr)) {
+                il_print_hex_error(il, pkt, 32);
+                return;
+        }
+
+        cmd_idx = il_get_cmd_idx(&txq->q, idx, huge);
+        cmd = txq->cmd[cmd_idx];
+        meta = &txq->meta[cmd_idx];
+
+        txq->time_stamp = jiffies;
+
+        pci_unmap_single(il->pci_dev, dma_unmap_addr(meta, mapping),
+                         dma_unmap_len(meta, len), PCI_DMA_BIDIRECTIONAL);
+
+        /* Input error checking is done when commands are added to queue. */
+        if (meta->flags & CMD_WANT_SKB) {
+                meta->source->reply_page = (unsigned long)rxb_addr(rxb);
+                rxb->page = NULL;
+        } else if (meta->callback)
+                meta->callback(il, cmd, pkt);
+
+        spin_lock_irqsave(&il->hcmd_lock, flags);
+
+        il_hcmd_queue_reclaim(il, txq_id, idx, cmd_idx);
+
+        if (!(meta->flags & CMD_ASYNC)) {
+                clear_bit(S_HCMD_ACTIVE, &il->status);
+                D_INFO("Clearing HCMD_ACTIVE for command %s\n",
+                       il_get_cmd_string(cmd->hdr.cmd));
+                wake_up(&il->wait_command_queue);
+        }
+
+        /* Mark as unmapped */
+        meta->flags = 0;
+
+        spin_unlock_irqrestore(&il->hcmd_lock, flags);
+}
+EXPORT_SYMBOL(il_tx_cmd_complete);
+
+MODULE_DESCRIPTION("iwl-legacy: common functions for 3945 and 4965");
+MODULE_VERSION(IWLWIFI_VERSION);
+MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
+MODULE_LICENSE("GPL");
+
+/*
+ * set bt_coex_active to true, uCode will do kill/defer
+ * every time the priority line is asserted (BT is sending signals on the
+ * priority line in the PCIx).
+ * set bt_coex_active to false, uCode will ignore the BT activity and
+ * perform the normal operation
+ *
+ * User might experience transmit issue on some platform due to WiFi/BT
+ * co-exist problem. The possible behaviors are:
+ *   Able to scan and finding all the available AP
+ *   Not able to associate with any AP
+ * On those platforms, WiFi communication can be restored by set
+ * "bt_coex_active" module parameter to "false"
+ *
+ * default: bt_coex_active = true (BT_COEX_ENABLE)
+ */
+static bool bt_coex_active = true;
+module_param(bt_coex_active, bool, S_IRUGO);
+MODULE_PARM_DESC(bt_coex_active, "enable wifi/bluetooth co-exist");
+
+u32 il_debug_level;
+EXPORT_SYMBOL(il_debug_level);
+
+const u8 il_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+EXPORT_SYMBOL(il_bcast_addr);
+
+/* This function both allocates and initializes hw and il. */
+struct ieee80211_hw *
+il_alloc_all(struct il_cfg *cfg)
+{
+        struct il_priv *il;
+        /* mac80211 allocates memory for this device instance, including
+         *   space for this driver's ilate structure */
+        struct ieee80211_hw *hw;
+
+        hw = ieee80211_alloc_hw(sizeof(struct il_priv),
+                                cfg->ops->ieee80211_ops);
+        if (hw == NULL) {
+                pr_err("%s: Can not allocate network device\n", cfg->name);
+                goto out;
+        }
+
+        il = hw->priv;
+        il->hw = hw;
+
+out:
+        return hw;
+}
+EXPORT_SYMBOL(il_alloc_all);
+
+#define MAX_BIT_RATE_40_MHZ 150 /* Mbps */
+#define MAX_BIT_RATE_20_MHZ 72  /* Mbps */
+static void
+il_init_ht_hw_capab(const struct il_priv *il,
+                    struct ieee80211_sta_ht_cap *ht_info,
+                    enum ieee80211_band band)
+{
+        u16 max_bit_rate = 0;
+        u8 rx_chains_num = il->hw_params.rx_chains_num;
+        u8 tx_chains_num = il->hw_params.tx_chains_num;
+
+        ht_info->cap = 0;
+        memset(&ht_info->mcs, 0, sizeof(ht_info->mcs));
+
+        ht_info->ht_supported = true;
+
+        ht_info->cap |= IEEE80211_HT_CAP_SGI_20;
+        max_bit_rate = MAX_BIT_RATE_20_MHZ;
+        if (il->hw_params.ht40_channel & BIT(band)) {
+                ht_info->cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+                ht_info->cap |= IEEE80211_HT_CAP_SGI_40;
+                ht_info->mcs.rx_mask[4] = 0x01;
+                max_bit_rate = MAX_BIT_RATE_40_MHZ;
+        }
+
+        if (il->cfg->mod_params->amsdu_size_8K)
+                ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU;
+
+        ht_info->ampdu_factor = CFG_HT_RX_AMPDU_FACTOR_DEF;
+        ht_info->ampdu_density = CFG_HT_MPDU_DENSITY_DEF;
+
+        ht_info->mcs.rx_mask[0] = 0xFF;
+        if (rx_chains_num >= 2)
+                ht_info->mcs.rx_mask[1] = 0xFF;
+        if (rx_chains_num >= 3)
+                ht_info->mcs.rx_mask[2] = 0xFF;
+
+        /* Highest supported Rx data rate */
+        max_bit_rate *= rx_chains_num;
+        WARN_ON(max_bit_rate & ~IEEE80211_HT_MCS_RX_HIGHEST_MASK);
+        ht_info->mcs.rx_highest = cpu_to_le16(max_bit_rate);
+
+        /* Tx MCS capabilities */
+        ht_info->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
+        if (tx_chains_num != rx_chains_num) {
+                ht_info->mcs.tx_params |= IEEE80211_HT_MCS_TX_RX_DIFF;
+                ht_info->mcs.tx_params |=
+                    ((tx_chains_num -
+                      1) << IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT);
+        }
+}
+
+/**
+ * il_init_geos - Initialize mac80211's geo/channel info based from eeprom
+ */
+int
+il_init_geos(struct il_priv *il)
+{
+        struct il_channel_info *ch;
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_channel *channels;
+        struct ieee80211_channel *geo_ch;
+        struct ieee80211_rate *rates;
+        int i = 0;
+        s8 max_tx_power = 0;
+
+        if (il->bands[IEEE80211_BAND_2GHZ].n_bitrates ||
+            il->bands[IEEE80211_BAND_5GHZ].n_bitrates) {
+                D_INFO("Geography modes already initialized.\n");
+                set_bit(S_GEO_CONFIGURED, &il->status);
+                return 0;
+        }
+
+        channels =
+            kzalloc(sizeof(struct ieee80211_channel) * il->channel_count,
+                    GFP_KERNEL);
+        if (!channels)
+                return -ENOMEM;
+
+        rates =
+            kzalloc((sizeof(struct ieee80211_rate) * RATE_COUNT_LEGACY),
+                    GFP_KERNEL);
+        if (!rates) {
+                kfree(channels);
+                return -ENOMEM;
+        }
+
+        /* 5.2GHz channels start after the 2.4GHz channels */
+        sband = &il->bands[IEEE80211_BAND_5GHZ];
+        sband->channels = &channels[ARRAY_SIZE(il_eeprom_band_1)];
+        /* just OFDM */
+        sband->bitrates = &rates[IL_FIRST_OFDM_RATE];
+        sband->n_bitrates = RATE_COUNT_LEGACY - IL_FIRST_OFDM_RATE;
+
+        if (il->cfg->sku & IL_SKU_N)
+                il_init_ht_hw_capab(il, &sband->ht_cap, IEEE80211_BAND_5GHZ);
+
+        sband = &il->bands[IEEE80211_BAND_2GHZ];
+        sband->channels = channels;
+        /* OFDM & CCK */
+        sband->bitrates = rates;
+        sband->n_bitrates = RATE_COUNT_LEGACY;
+
+        if (il->cfg->sku & IL_SKU_N)
+                il_init_ht_hw_capab(il, &sband->ht_cap, IEEE80211_BAND_2GHZ);
+
+        il->ieee_channels = channels;
+        il->ieee_rates = rates;
+
+        for (i = 0; i < il->channel_count; i++) {
+                ch = &il->channel_info[i];
+
+                if (!il_is_channel_valid(ch))
+                        continue;
+
+                sband = &il->bands[ch->band];
+
+                geo_ch = &sband->channels[sband->n_channels++];
+
+                geo_ch->center_freq =
+                    ieee80211_channel_to_frequency(ch->channel, ch->band);
+                geo_ch->max_power = ch->max_power_avg;
+                geo_ch->max_antenna_gain = 0xff;
+                geo_ch->hw_value = ch->channel;
+
+                if (il_is_channel_valid(ch)) {
+                        if (!(ch->flags & EEPROM_CHANNEL_IBSS))
+                                geo_ch->flags |= IEEE80211_CHAN_NO_IBSS;
+
+                        if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))
+                                geo_ch->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+
+                        if (ch->flags & EEPROM_CHANNEL_RADAR)
+                                geo_ch->flags |= IEEE80211_CHAN_RADAR;
+
+                        geo_ch->flags |= ch->ht40_extension_channel;
+
+                        if (ch->max_power_avg > max_tx_power)
+                                max_tx_power = ch->max_power_avg;
+                } else {
+                        geo_ch->flags |= IEEE80211_CHAN_DISABLED;
+                }
+
+                D_INFO("Channel %d Freq=%d[%sGHz] %s flag=0x%X\n", ch->channel,
+                       geo_ch->center_freq,
+                       il_is_channel_a_band(ch) ? "5.2" : "2.4",
+                       geo_ch->
+                       flags & IEEE80211_CHAN_DISABLED ? "restricted" : "valid",
+                       geo_ch->flags);
+        }
+
+        il->tx_power_device_lmt = max_tx_power;
+        il->tx_power_user_lmt = max_tx_power;
+        il->tx_power_next = max_tx_power;
+
+        if (il->bands[IEEE80211_BAND_5GHZ].n_channels == 0 &&
+            (il->cfg->sku & IL_SKU_A)) {
+                IL_INFO("Incorrectly detected BG card as ABG. "
+                        "Please send your PCI ID 0x%04X:0x%04X to maintainer.\n",
+                        il->pci_dev->device, il->pci_dev->subsystem_device);
+                il->cfg->sku &= ~IL_SKU_A;
+        }
+
+        IL_INFO("Tunable channels: %d 802.11bg, %d 802.11a channels\n",
+                il->bands[IEEE80211_BAND_2GHZ].n_channels,
+                il->bands[IEEE80211_BAND_5GHZ].n_channels);
+
+        set_bit(S_GEO_CONFIGURED, &il->status);
+
+        return 0;
+}
+EXPORT_SYMBOL(il_init_geos);
+
+/*
+ * il_free_geos - undo allocations in il_init_geos
+ */
+void
+il_free_geos(struct il_priv *il)
+{
+        kfree(il->ieee_channels);
+        kfree(il->ieee_rates);
+        clear_bit(S_GEO_CONFIGURED, &il->status);
+}
+EXPORT_SYMBOL(il_free_geos);
+
+static bool
+il_is_channel_extension(struct il_priv *il, enum ieee80211_band band,
+                        u16 channel, u8 extension_chan_offset)
+{
+        const struct il_channel_info *ch_info;
+
+        ch_info = il_get_channel_info(il, band, channel);
+        if (!il_is_channel_valid(ch_info))
+                return false;
+
+        if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_ABOVE)
+                return !(ch_info->
+                         ht40_extension_channel & IEEE80211_CHAN_NO_HT40PLUS);
+        else if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_BELOW)
+                return !(ch_info->
+                         ht40_extension_channel & IEEE80211_CHAN_NO_HT40MINUS);
+
+        return false;
+}
+
+bool
+il_is_ht40_tx_allowed(struct il_priv *il, struct il_rxon_context *ctx,
+                      struct ieee80211_sta_ht_cap *ht_cap)
+{
+        if (!ctx->ht.enabled || !ctx->ht.is_40mhz)
+                return false;
+
+        /*
+         * We do not check for IEEE80211_HT_CAP_SUP_WIDTH_20_40
+         * the bit will not set if it is pure 40MHz case
+         */
+        if (ht_cap && !ht_cap->ht_supported)
+                return false;
+
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+        if (il->disable_ht40)
+                return false;
+#endif
+
+        return il_is_channel_extension(il, il->band,
+                                       le16_to_cpu(ctx->staging.channel),
+                                       ctx->ht.extension_chan_offset);
+}
+EXPORT_SYMBOL(il_is_ht40_tx_allowed);
+
+static u16
+il_adjust_beacon_interval(u16 beacon_val, u16 max_beacon_val)
+{
+        u16 new_val;
+        u16 beacon_factor;
+
+        /*
+         * If mac80211 hasn't given us a beacon interval, program
+         * the default into the device.
+         */
+        if (!beacon_val)
+                return DEFAULT_BEACON_INTERVAL;
+
+        /*
+         * If the beacon interval we obtained from the peer
+         * is too large, we'll have to wake up more often
+         * (and in IBSS case, we'll beacon too much)
+         *
+         * For example, if max_beacon_val is 4096, and the
+         * requested beacon interval is 7000, we'll have to
+         * use 3500 to be able to wake up on the beacons.
+         *
+         * This could badly influence beacon detection stats.
+         */
+
+        beacon_factor = (beacon_val + max_beacon_val) / max_beacon_val;
+        new_val = beacon_val / beacon_factor;
+
+        if (!new_val)
+                new_val = max_beacon_val;
+
+        return new_val;
+}
+
+int
+il_send_rxon_timing(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        u64 tsf;
+        s32 interval_tm, rem;
+        struct ieee80211_conf *conf = NULL;
+        u16 beacon_int;
+        struct ieee80211_vif *vif = ctx->vif;
+
+        conf = &il->hw->conf;
+
+        lockdep_assert_held(&il->mutex);
+
+        memset(&ctx->timing, 0, sizeof(struct il_rxon_time_cmd));
+
+        ctx->timing.timestamp = cpu_to_le64(il->timestamp);
+        ctx->timing.listen_interval = cpu_to_le16(conf->listen_interval);
+
+        beacon_int = vif ? vif->bss_conf.beacon_int : 0;
+
+        /*
+         * TODO: For IBSS we need to get atim_win from mac80211,
+         *       for now just always use 0
+         */
+        ctx->timing.atim_win = 0;
+
+        beacon_int =
+            il_adjust_beacon_interval(beacon_int,
+                                      il->hw_params.max_beacon_itrvl *
+                                      TIME_UNIT);
+        ctx->timing.beacon_interval = cpu_to_le16(beacon_int);
+
+        tsf = il->timestamp;    /* tsf is modifed by do_div: copy it */
+        interval_tm = beacon_int * TIME_UNIT;
+        rem = do_div(tsf, interval_tm);
+        ctx->timing.beacon_init_val = cpu_to_le32(interval_tm - rem);
+
+        ctx->timing.dtim_period = vif ? (vif->bss_conf.dtim_period ? : 1) : 1;
+
+        D_ASSOC("beacon interval %d beacon timer %d beacon tim %d\n",
+                le16_to_cpu(ctx->timing.beacon_interval),
+                le32_to_cpu(ctx->timing.beacon_init_val),
+                le16_to_cpu(ctx->timing.atim_win));
+
+        return il_send_cmd_pdu(il, ctx->rxon_timing_cmd, sizeof(ctx->timing),
+                               &ctx->timing);
+}
+EXPORT_SYMBOL(il_send_rxon_timing);
+
+void
+il_set_rxon_hwcrypto(struct il_priv *il, struct il_rxon_context *ctx,
+                     int hw_decrypt)
+{
+        struct il_rxon_cmd *rxon = &ctx->staging;
+
+        if (hw_decrypt)
+                rxon->filter_flags &= ~RXON_FILTER_DIS_DECRYPT_MSK;
+        else
+                rxon->filter_flags |= RXON_FILTER_DIS_DECRYPT_MSK;
+
+}
+EXPORT_SYMBOL(il_set_rxon_hwcrypto);
+
+/* validate RXON structure is valid */
+int
+il_check_rxon_cmd(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        struct il_rxon_cmd *rxon = &ctx->staging;
+        bool error = false;
+
+        if (rxon->flags & RXON_FLG_BAND_24G_MSK) {
+                if (rxon->flags & RXON_FLG_TGJ_NARROW_BAND_MSK) {
+                        IL_WARN("check 2.4G: wrong narrow\n");
+                        error = true;
+                }
+                if (rxon->flags & RXON_FLG_RADAR_DETECT_MSK) {
+                        IL_WARN("check 2.4G: wrong radar\n");
+                        error = true;
+                }
+        } else {
+                if (!(rxon->flags & RXON_FLG_SHORT_SLOT_MSK)) {
+                        IL_WARN("check 5.2G: not short slot!\n");
+                        error = true;
+                }
+                if (rxon->flags & RXON_FLG_CCK_MSK) {
+                        IL_WARN("check 5.2G: CCK!\n");
+                        error = true;
+                }
+        }
+        if ((rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1) {
+                IL_WARN("mac/bssid mcast!\n");
+                error = true;
+        }
+
+        /* make sure basic rates 6Mbps and 1Mbps are supported */
+        if ((rxon->ofdm_basic_rates & RATE_6M_MASK) == 0 &&
+            (rxon->cck_basic_rates & RATE_1M_MASK) == 0) {
+                IL_WARN("neither 1 nor 6 are basic\n");
+                error = true;
+        }
+
+        if (le16_to_cpu(rxon->assoc_id) > 2007) {
+                IL_WARN("aid > 2007\n");
+                error = true;
+        }
+
+        if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) ==
+            (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) {
+                IL_WARN("CCK and short slot\n");
+                error = true;
+        }
+
+        if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) ==
+            (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) {
+                IL_WARN("CCK and auto detect");
+                error = true;
+        }
+
+        if ((rxon->
+             flags & (RXON_FLG_AUTO_DETECT_MSK | RXON_FLG_TGG_PROTECT_MSK)) ==
+            RXON_FLG_TGG_PROTECT_MSK) {
+                IL_WARN("TGg but no auto-detect\n");
+                error = true;
+        }
+
+        if (error)
+                IL_WARN("Tuning to channel %d\n", le16_to_cpu(rxon->channel));
+
+        if (error) {
+                IL_ERR("Invalid RXON\n");
+                return -EINVAL;
+        }
+        return 0;
+}
+EXPORT_SYMBOL(il_check_rxon_cmd);
+
+/**
+ * il_full_rxon_required - check if full RXON (vs RXON_ASSOC) cmd is needed
+ * @il: staging_rxon is compared to active_rxon
+ *
+ * If the RXON structure is changing enough to require a new tune,
+ * 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.
+ */
+int
+il_full_rxon_required(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        const struct il_rxon_cmd *staging = &ctx->staging;
+        const struct il_rxon_cmd *active = &ctx->active;
+
+#define CHK(cond)                                                       \
+        if ((cond)) {                                                   \
+                D_INFO("need full RXON - " #cond "\n"); \
+                return 1;                                               \
+        }
+
+#define CHK_NEQ(c1, c2)                                         \
+        if ((c1) != (c2)) {                                     \
+                D_INFO("need full RXON - "      \
+                               #c1 " != " #c2 " - %d != %d\n",  \
+                               (c1), (c2));                     \
+                return 1;                                       \
+        }
+
+        /* These items are only settable from the full RXON command */
+        CHK(!il_is_associated_ctx(ctx));
+        CHK(compare_ether_addr(staging->bssid_addr, active->bssid_addr));
+        CHK(compare_ether_addr(staging->node_addr, active->node_addr));
+        CHK(compare_ether_addr
+            (staging->wlap_bssid_addr, active->wlap_bssid_addr));
+        CHK_NEQ(staging->dev_type, active->dev_type);
+        CHK_NEQ(staging->channel, active->channel);
+        CHK_NEQ(staging->air_propagation, active->air_propagation);
+        CHK_NEQ(staging->ofdm_ht_single_stream_basic_rates,
+                active->ofdm_ht_single_stream_basic_rates);
+        CHK_NEQ(staging->ofdm_ht_dual_stream_basic_rates,
+                active->ofdm_ht_dual_stream_basic_rates);
+        CHK_NEQ(staging->assoc_id, active->assoc_id);
+
+        /* flags, filter_flags, ofdm_basic_rates, and cck_basic_rates can
+         * be updated with the RXON_ASSOC command -- however only some
+         * flag transitions are allowed using RXON_ASSOC */
+
+        /* Check if we are not switching bands */
+        CHK_NEQ(staging->flags & RXON_FLG_BAND_24G_MSK,
+                active->flags & RXON_FLG_BAND_24G_MSK);
+
+        /* Check if we are switching association toggle */
+        CHK_NEQ(staging->filter_flags & RXON_FILTER_ASSOC_MSK,
+                active->filter_flags & RXON_FILTER_ASSOC_MSK);
+
+#undef CHK
+#undef CHK_NEQ
+
+        return 0;
+}
+EXPORT_SYMBOL(il_full_rxon_required);
+
+u8
+il_get_lowest_plcp(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        /*
+         * Assign the lowest rate -- should really get this from
+         * the beacon skb from mac80211.
+         */
+        if (ctx->staging.flags & RXON_FLG_BAND_24G_MSK)
+                return RATE_1M_PLCP;
+        else
+                return RATE_6M_PLCP;
+}
+EXPORT_SYMBOL(il_get_lowest_plcp);
+
+static void
+_il_set_rxon_ht(struct il_priv *il, struct il_ht_config *ht_conf,
+                struct il_rxon_context *ctx)
+{
+        struct il_rxon_cmd *rxon = &ctx->staging;
+
+        if (!ctx->ht.enabled) {
+                rxon->flags &=
+                    ~(RXON_FLG_CHANNEL_MODE_MSK |
+                      RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK | RXON_FLG_HT40_PROT_MSK
+                      | RXON_FLG_HT_PROT_MSK);
+                return;
+        }
+
+        rxon->flags |=
+            cpu_to_le32(ctx->ht.protection << RXON_FLG_HT_OPERATING_MODE_POS);
+
+        /* Set up channel bandwidth:
+         * 20 MHz only, 20/40 mixed or pure 40 if ht40 ok */
+        /* clear the HT channel mode before set the mode */
+        rxon->flags &=
+            ~(RXON_FLG_CHANNEL_MODE_MSK | RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK);
+        if (il_is_ht40_tx_allowed(il, ctx, NULL)) {
+                /* pure ht40 */
+                if (ctx->ht.protection == IEEE80211_HT_OP_MODE_PROTECTION_20MHZ) {
+                        rxon->flags |= RXON_FLG_CHANNEL_MODE_PURE_40;
+                        /* Note: control channel is opposite of extension channel */
+                        switch (ctx->ht.extension_chan_offset) {
+                        case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
+                                rxon->flags &=
+                                    ~RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;
+                                break;
+                        case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
+                                rxon->flags |= RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;
+                                break;
+                        }
+                } else {
+                        /* Note: control channel is opposite of extension channel */
+                        switch (ctx->ht.extension_chan_offset) {
+                        case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
+                                rxon->flags &=
+                                    ~(RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK);
+                                rxon->flags |= RXON_FLG_CHANNEL_MODE_MIXED;
+                                break;
+                        case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
+                                rxon->flags |= RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;
+                                rxon->flags |= RXON_FLG_CHANNEL_MODE_MIXED;
+                                break;
+                        case IEEE80211_HT_PARAM_CHA_SEC_NONE:
+                        default:
+                                /* channel location only valid if in Mixed mode */
+                                IL_ERR("invalid extension channel offset\n");
+                                break;
+                        }
+                }
+        } else {
+                rxon->flags |= RXON_FLG_CHANNEL_MODE_LEGACY;
+        }
+
+        if (il->cfg->ops->hcmd->set_rxon_chain)
+                il->cfg->ops->hcmd->set_rxon_chain(il, ctx);
+
+        D_ASSOC("rxon flags 0x%X operation mode :0x%X "
+                "extension channel offset 0x%x\n", le32_to_cpu(rxon->flags),
+                ctx->ht.protection, ctx->ht.extension_chan_offset);
+}
+
+void
+il_set_rxon_ht(struct il_priv *il, struct il_ht_config *ht_conf)
+{
+        _il_set_rxon_ht(il, ht_conf, &il->ctx);
+}
+EXPORT_SYMBOL(il_set_rxon_ht);
+
+/* Return valid, unused, channel for a passive scan to reset the RF */
+u8
+il_get_single_channel_number(struct il_priv *il, enum ieee80211_band band)
+{
+        const struct il_channel_info *ch_info;
+        int i;
+        u8 channel = 0;
+        u8 min, max;
+
+        if (band == IEEE80211_BAND_5GHZ) {
+                min = 14;
+                max = il->channel_count;
+        } else {
+                min = 0;
+                max = 14;
+        }
+
+        for (i = min; i < max; i++) {
+                channel = il->channel_info[i].channel;
+                if (channel == le16_to_cpu(il->ctx.staging.channel))
+                        continue;
+
+                ch_info = il_get_channel_info(il, band, channel);
+                if (il_is_channel_valid(ch_info))
+                        break;
+        }
+
+        return channel;
+}
+EXPORT_SYMBOL(il_get_single_channel_number);
+
+/**
+ * il_set_rxon_channel - Set the band and channel values in staging RXON
+ * @ch: requested channel as a pointer to struct ieee80211_channel
+
+ * NOTE:  Does not commit to the hardware; it sets appropriate bit fields
+ * in the staging RXON flag structure based on the ch->band
+ */
+int
+il_set_rxon_channel(struct il_priv *il, struct ieee80211_channel *ch,
+                    struct il_rxon_context *ctx)
+{
+        enum ieee80211_band band = ch->band;
+        u16 channel = ch->hw_value;
+
+        if (le16_to_cpu(ctx->staging.channel) == channel && il->band == band)
+                return 0;
+
+        ctx->staging.channel = cpu_to_le16(channel);
+        if (band == IEEE80211_BAND_5GHZ)
+                ctx->staging.flags &= ~RXON_FLG_BAND_24G_MSK;
+        else
+                ctx->staging.flags |= RXON_FLG_BAND_24G_MSK;
+
+        il->band = band;
+
+        D_INFO("Staging channel set to %d [%d]\n", channel, band);
+
+        return 0;
+}
+EXPORT_SYMBOL(il_set_rxon_channel);
+
+void
+il_set_flags_for_band(struct il_priv *il, struct il_rxon_context *ctx,
+                      enum ieee80211_band band, struct ieee80211_vif *vif)
+{
+        if (band == IEEE80211_BAND_5GHZ) {
+                ctx->staging.flags &=
+                    ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK |
+                      RXON_FLG_CCK_MSK);
+                ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
+        } else {
+                /* Copied from il_post_associate() */
+                if (vif && vif->bss_conf.use_short_slot)
+                        ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
+                else
+                        ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
+
+                ctx->staging.flags |= RXON_FLG_BAND_24G_MSK;
+                ctx->staging.flags |= RXON_FLG_AUTO_DETECT_MSK;
+                ctx->staging.flags &= ~RXON_FLG_CCK_MSK;
+        }
+}
+EXPORT_SYMBOL(il_set_flags_for_band);
+
+/*
+ * initialize rxon structure with default values from eeprom
+ */
+void
+il_connection_init_rx_config(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        const struct il_channel_info *ch_info;
+
+        memset(&ctx->staging, 0, sizeof(ctx->staging));
+
+        if (!ctx->vif) {
+                ctx->staging.dev_type = ctx->unused_devtype;
+        } else
+                switch (ctx->vif->type) {
+
+                case NL80211_IFTYPE_STATION:
+                        ctx->staging.dev_type = ctx->station_devtype;
+                        ctx->staging.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK;
+                        break;
+
+                case NL80211_IFTYPE_ADHOC:
+                        ctx->staging.dev_type = ctx->ibss_devtype;
+                        ctx->staging.flags = RXON_FLG_SHORT_PREAMBLE_MSK;
+                        ctx->staging.filter_flags =
+                            RXON_FILTER_BCON_AWARE_MSK |
+                            RXON_FILTER_ACCEPT_GRP_MSK;
+                        break;
+
+                default:
+                        IL_ERR("Unsupported interface type %d\n",
+                               ctx->vif->type);
+                        break;
+                }
+
+#if 0
+        /* TODO:  Figure out when short_preamble would be set and cache from
+         * that */
+        if (!hw_to_local(il->hw)->short_preamble)
+                ctx->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
+        else
+                ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
+#endif
+
+        ch_info =
+            il_get_channel_info(il, il->band, le16_to_cpu(ctx->active.channel));
+
+        if (!ch_info)
+                ch_info = &il->channel_info[0];
+
+        ctx->staging.channel = cpu_to_le16(ch_info->channel);
+        il->band = ch_info->band;
+
+        il_set_flags_for_band(il, ctx, il->band, ctx->vif);
+
+        ctx->staging.ofdm_basic_rates =
+            (IL_OFDM_RATES_MASK >> IL_FIRST_OFDM_RATE) & 0xFF;
+        ctx->staging.cck_basic_rates =
+            (IL_CCK_RATES_MASK >> IL_FIRST_CCK_RATE) & 0xF;
+
+        /* clear both MIX and PURE40 mode flag */
+        ctx->staging.flags &=
+            ~(RXON_FLG_CHANNEL_MODE_MIXED | RXON_FLG_CHANNEL_MODE_PURE_40);
+        if (ctx->vif)
+                memcpy(ctx->staging.node_addr, ctx->vif->addr, ETH_ALEN);
+
+        ctx->staging.ofdm_ht_single_stream_basic_rates = 0xff;
+        ctx->staging.ofdm_ht_dual_stream_basic_rates = 0xff;
+}
+EXPORT_SYMBOL(il_connection_init_rx_config);
+
+void
+il_set_rate(struct il_priv *il)
+{
+        const struct ieee80211_supported_band *hw = NULL;
+        struct ieee80211_rate *rate;
+        int i;
+
+        hw = il_get_hw_mode(il, il->band);
+        if (!hw) {
+                IL_ERR("Failed to set rate: unable to get hw mode\n");
+                return;
+        }
+
+        il->active_rate = 0;
+
+        for (i = 0; i < hw->n_bitrates; i++) {
+                rate = &(hw->bitrates[i]);
+                if (rate->hw_value < RATE_COUNT_LEGACY)
+                        il->active_rate |= (1 << rate->hw_value);
+        }
+
+        D_RATE("Set active_rate = %0x\n", il->active_rate);
+
+        il->ctx.staging.cck_basic_rates =
+            (IL_CCK_BASIC_RATES_MASK >> IL_FIRST_CCK_RATE) & 0xF;
+
+        il->ctx.staging.ofdm_basic_rates =
+            (IL_OFDM_BASIC_RATES_MASK >> IL_FIRST_OFDM_RATE) & 0xFF;
+}
+EXPORT_SYMBOL(il_set_rate);
+
+void
+il_chswitch_done(struct il_priv *il, bool is_success)
+{
+        struct il_rxon_context *ctx = &il->ctx;
+
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                return;
+
+        if (test_and_clear_bit(S_CHANNEL_SWITCH_PENDING, &il->status))
+                ieee80211_chswitch_done(ctx->vif, is_success);
+}
+EXPORT_SYMBOL(il_chswitch_done);
+
+void
+il_hdl_csa(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct il_csa_notification *csa = &(pkt->u.csa_notif);
+
+        struct il_rxon_context *ctx = &il->ctx;
+        struct il_rxon_cmd *rxon = (void *)&ctx->active;
+
+        if (!test_bit(S_CHANNEL_SWITCH_PENDING, &il->status))
+                return;
+
+        if (!le32_to_cpu(csa->status) && csa->channel == il->switch_channel) {
+                rxon->channel = csa->channel;
+                ctx->staging.channel = csa->channel;
+                D_11H("CSA notif: channel %d\n", le16_to_cpu(csa->channel));
+                il_chswitch_done(il, true);
+        } else {
+                IL_ERR("CSA notif (fail) : channel %d\n",
+                       le16_to_cpu(csa->channel));
+                il_chswitch_done(il, false);
+        }
+}
+EXPORT_SYMBOL(il_hdl_csa);
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+void
+il_print_rx_config_cmd(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        struct il_rxon_cmd *rxon = &ctx->staging;
+
+        D_RADIO("RX CONFIG:\n");
+        il_print_hex_dump(il, IL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));
+        D_RADIO("u16 channel: 0x%x\n", le16_to_cpu(rxon->channel));
+        D_RADIO("u32 flags: 0x%08X\n", le32_to_cpu(rxon->flags));
+        D_RADIO("u32 filter_flags: 0x%08x\n", le32_to_cpu(rxon->filter_flags));
+        D_RADIO("u8 dev_type: 0x%x\n", rxon->dev_type);
+        D_RADIO("u8 ofdm_basic_rates: 0x%02x\n", rxon->ofdm_basic_rates);
+        D_RADIO("u8 cck_basic_rates: 0x%02x\n", rxon->cck_basic_rates);
+        D_RADIO("u8[6] node_addr: %pM\n", rxon->node_addr);
+        D_RADIO("u8[6] bssid_addr: %pM\n", rxon->bssid_addr);
+        D_RADIO("u16 assoc_id: 0x%x\n", le16_to_cpu(rxon->assoc_id));
+}
+EXPORT_SYMBOL(il_print_rx_config_cmd);
+#endif
+/**
+ * il_irq_handle_error - called for HW or SW error interrupt from card
+ */
+void
+il_irq_handle_error(struct il_priv *il)
+{
+        /* Set the FW error flag -- cleared on il_down */
+        set_bit(S_FW_ERROR, &il->status);
+
+        /* Cancel currently queued command. */
+        clear_bit(S_HCMD_ACTIVE, &il->status);
+
+        IL_ERR("Loaded firmware version: %s\n", il->hw->wiphy->fw_version);
+
+        il->cfg->ops->lib->dump_nic_error_log(il);
+        if (il->cfg->ops->lib->dump_fh)
+                il->cfg->ops->lib->dump_fh(il, NULL, false);
+#ifdef CONFIG_IWLEGACY_DEBUG
+        if (il_get_debug_level(il) & IL_DL_FW_ERRORS)
+                il_print_rx_config_cmd(il, &il->ctx);
+#endif
+
+        wake_up(&il->wait_command_queue);
+
+        /* Keep the restart process from trying to send host
+         * commands by clearing the INIT status bit */
+        clear_bit(S_READY, &il->status);
+
+        if (!test_bit(S_EXIT_PENDING, &il->status)) {
+                IL_DBG(IL_DL_FW_ERRORS,
+                       "Restarting adapter due to uCode error.\n");
+
+                if (il->cfg->mod_params->restart_fw)
+                        queue_work(il->workqueue, &il->restart);
+        }
+}
+EXPORT_SYMBOL(il_irq_handle_error);
+
+static int
+il_apm_stop_master(struct il_priv *il)
+{
+        int ret = 0;
+
+        /* stop device's busmaster DMA activity */
+        il_set_bit(il, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);
+
+        ret =
+            _il_poll_bit(il, CSR_RESET, CSR_RESET_REG_FLAG_MASTER_DISABLED,
+                         CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);
+        if (ret)
+                IL_WARN("Master Disable Timed Out, 100 usec\n");
+
+        D_INFO("stop master\n");
+
+        return ret;
+}
+
+void
+il_apm_stop(struct il_priv *il)
+{
+        D_INFO("Stop card, put in low power state\n");
+
+        /* Stop device's DMA activity */
+        il_apm_stop_master(il);
+
+        /* Reset the entire device */
+        il_set_bit(il, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);
+
+        udelay(10);
+
+        /*
+         * Clear "initialization complete" bit to move adapter from
+         * D0A* (powered-up Active) --> D0U* (Uninitialized) state.
+         */
+        il_clear_bit(il, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
+}
+EXPORT_SYMBOL(il_apm_stop);
+
+/*
+ * Start up NIC's basic functionality after it has been reset
+ * (e.g. after platform boot, or shutdown via il_apm_stop())
+ * NOTE:  This does not load uCode nor start the embedded processor
+ */
+int
+il_apm_init(struct il_priv *il)
+{
+        int ret = 0;
+        u16 lctl;
+
+        D_INFO("Init card's basic functions\n");
+
+        /*
+         * Use "set_bit" below rather than "write", to preserve any hardware
+         * bits already set by default after reset.
+         */
+
+        /* Disable L0S exit timer (platform NMI Work/Around) */
+        il_set_bit(il, CSR_GIO_CHICKEN_BITS,
+                   CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);
+
+        /*
+         * Disable L0s without affecting L1;
+         *  don't wait for ICH L0s (ICH bug W/A)
+         */
+        il_set_bit(il, CSR_GIO_CHICKEN_BITS,
+                   CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX);
+
+        /* Set FH wait threshold to maximum (HW error during stress W/A) */
+        il_set_bit(il, CSR_DBG_HPET_MEM_REG, CSR_DBG_HPET_MEM_REG_VAL);
+
+        /*
+         * Enable HAP INTA (interrupt from management bus) to
+         * wake device's PCI Express link L1a -> L0s
+         * NOTE:  This is no-op for 3945 (non-existent bit)
+         */
+        il_set_bit(il, CSR_HW_IF_CONFIG_REG,
+                   CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A);
+
+        /*
+         * HW bug W/A for instability in PCIe bus L0->L0S->L1 transition.
+         * Check if BIOS (or OS) enabled L1-ASPM on this device.
+         * If so (likely), disable L0S, so device moves directly L0->L1;
+         *    costs negligible amount of power savings.
+         * If not (unlikely), enable L0S, so there is at least some
+         *    power savings, even without L1.
+         */
+        if (il->cfg->base_params->set_l0s) {
+                lctl = il_pcie_link_ctl(il);
+                if ((lctl & PCI_CFG_LINK_CTRL_VAL_L1_EN) ==
+                    PCI_CFG_LINK_CTRL_VAL_L1_EN) {
+                        /* L1-ASPM enabled; disable(!) L0S  */
+                        il_set_bit(il, CSR_GIO_REG,
+                                   CSR_GIO_REG_VAL_L0S_ENABLED);
+                        D_POWER("L1 Enabled; Disabling L0S\n");
+                } else {
+                        /* L1-ASPM disabled; enable(!) L0S */
+                        il_clear_bit(il, CSR_GIO_REG,
+                                     CSR_GIO_REG_VAL_L0S_ENABLED);
+                        D_POWER("L1 Disabled; Enabling L0S\n");
+                }
+        }
+
+        /* Configure analog phase-lock-loop before activating to D0A */
+        if (il->cfg->base_params->pll_cfg_val)
+                il_set_bit(il, CSR_ANA_PLL_CFG,
+                           il->cfg->base_params->pll_cfg_val);
+
+        /*
+         * Set "initialization complete" bit to move adapter from
+         * D0U* --> D0A* (powered-up active) state.
+         */
+        il_set_bit(il, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
+
+        /*
+         * Wait for clock stabilization; once stabilized, access to
+         * device-internal resources is supported, e.g. il_wr_prph()
+         * and accesses to uCode SRAM.
+         */
+        ret =
+            _il_poll_bit(il, CSR_GP_CNTRL,
+                         CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
+                         CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);
+        if (ret < 0) {
+                D_INFO("Failed to init the card\n");
+                goto out;
+        }
+
+        /*
+         * Enable DMA and BSM (if used) clocks, wait for them to stabilize.
+         * BSM (Boostrap State Machine) is only in 3945 and 4965.
+         *
+         * Write to "CLK_EN_REG"; "1" bits enable clocks, while "0" bits
+         * do not disable clocks.  This preserves any hardware bits already
+         * set by default in "CLK_CTRL_REG" after reset.
+         */
+        if (il->cfg->base_params->use_bsm)
+                il_wr_prph(il, APMG_CLK_EN_REG,
+                           APMG_CLK_VAL_DMA_CLK_RQT | APMG_CLK_VAL_BSM_CLK_RQT);
+        else
+                il_wr_prph(il, APMG_CLK_EN_REG, APMG_CLK_VAL_DMA_CLK_RQT);
+        udelay(20);
+
+        /* Disable L1-Active */
+        il_set_bits_prph(il, APMG_PCIDEV_STT_REG,
+                         APMG_PCIDEV_STT_VAL_L1_ACT_DIS);
+
+out:
+        return ret;
+}
+EXPORT_SYMBOL(il_apm_init);
+
+int
+il_set_tx_power(struct il_priv *il, s8 tx_power, bool force)
+{
+        int ret;
+        s8 prev_tx_power;
+        bool defer;
+        struct il_rxon_context *ctx = &il->ctx;
+
+        lockdep_assert_held(&il->mutex);
+
+        if (il->tx_power_user_lmt == tx_power && !force)
+                return 0;
+
+        if (!il->cfg->ops->lib->send_tx_power)
+                return -EOPNOTSUPP;
+
+        /* 0 dBm mean 1 milliwatt */
+        if (tx_power < 0) {
+                IL_WARN("Requested user TXPOWER %d below 1 mW.\n", tx_power);
+                return -EINVAL;
+        }
+
+        if (tx_power > il->tx_power_device_lmt) {
+                IL_WARN("Requested user TXPOWER %d above upper limit %d.\n",
+                        tx_power, il->tx_power_device_lmt);
+                return -EINVAL;
+        }
+
+        if (!il_is_ready_rf(il))
+                return -EIO;
+
+        /* scan complete and commit_rxon use tx_power_next value,
+         * it always need to be updated for newest request */
+        il->tx_power_next = tx_power;
+
+        /* do not set tx power when scanning or channel changing */
+        defer = test_bit(S_SCANNING, &il->status) ||
+            memcmp(&ctx->active, &ctx->staging, sizeof(ctx->staging));
+        if (defer && !force) {
+                D_INFO("Deferring tx power set\n");
+                return 0;
+        }
+
+        prev_tx_power = il->tx_power_user_lmt;
+        il->tx_power_user_lmt = tx_power;
+
+        ret = il->cfg->ops->lib->send_tx_power(il);
+
+        /* if fail to set tx_power, restore the orig. tx power */
+        if (ret) {
+                il->tx_power_user_lmt = prev_tx_power;
+                il->tx_power_next = prev_tx_power;
+        }
+        return ret;
+}
+EXPORT_SYMBOL(il_set_tx_power);
+
+void
+il_send_bt_config(struct il_priv *il)
+{
+        struct il_bt_cmd bt_cmd = {
+                .lead_time = BT_LEAD_TIME_DEF,
+                .max_kill = BT_MAX_KILL_DEF,
+                .kill_ack_mask = 0,
+                .kill_cts_mask = 0,
+        };
+
+        if (!bt_coex_active)
+                bt_cmd.flags = BT_COEX_DISABLE;
+        else
+                bt_cmd.flags = BT_COEX_ENABLE;
+
+        D_INFO("BT coex %s\n",
+               (bt_cmd.flags == BT_COEX_DISABLE) ? "disable" : "active");
+
+        if (il_send_cmd_pdu(il, C_BT_CONFIG, sizeof(struct il_bt_cmd), &bt_cmd))
+                IL_ERR("failed to send BT Coex Config\n");
+}
+EXPORT_SYMBOL(il_send_bt_config);
+
+int
+il_send_stats_request(struct il_priv *il, u8 flags, bool clear)
+{
+        struct il_stats_cmd stats_cmd = {
+                .configuration_flags = clear ? IL_STATS_CONF_CLEAR_STATS : 0,
+        };
+
+        if (flags & CMD_ASYNC)
+                return il_send_cmd_pdu_async(il, C_STATS, sizeof(struct il_stats_cmd),
+                                             &stats_cmd, NULL);
+        else
+                return il_send_cmd_pdu(il, C_STATS, sizeof(struct il_stats_cmd),
+                                       &stats_cmd);
+}
+EXPORT_SYMBOL(il_send_stats_request);
+
+void
+il_hdl_pm_sleep(struct il_priv *il, struct il_rx_buf *rxb)
+{
+#ifdef CONFIG_IWLEGACY_DEBUG
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        struct il_sleep_notification *sleep = &(pkt->u.sleep_notif);
+        D_RX("sleep mode: %d, src: %d\n",
+             sleep->pm_sleep_mode, sleep->pm_wakeup_src);
+#endif
+}
+EXPORT_SYMBOL(il_hdl_pm_sleep);
+
+void
+il_hdl_pm_debug_stats(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+        u32 len = le32_to_cpu(pkt->len_n_flags) & IL_RX_FRAME_SIZE_MSK;
+        D_RADIO("Dumping %d bytes of unhandled notification for %s:\n", len,
+                il_get_cmd_string(pkt->hdr.cmd));
+        il_print_hex_dump(il, IL_DL_RADIO, pkt->u.raw, len);
+}
+EXPORT_SYMBOL(il_hdl_pm_debug_stats);
+
+void
+il_hdl_error(struct il_priv *il, struct il_rx_buf *rxb)
+{
+        struct il_rx_pkt *pkt = rxb_addr(rxb);
+
+        IL_ERR("Error Reply type 0x%08X cmd %s (0x%02X) "
+               "seq 0x%04X ser 0x%08X\n",
+               le32_to_cpu(pkt->u.err_resp.error_type),
+               il_get_cmd_string(pkt->u.err_resp.cmd_id),
+               pkt->u.err_resp.cmd_id,
+               le16_to_cpu(pkt->u.err_resp.bad_cmd_seq_num),
+               le32_to_cpu(pkt->u.err_resp.error_info));
+}
+EXPORT_SYMBOL(il_hdl_error);
+
+void
+il_clear_isr_stats(struct il_priv *il)
+{
+        memset(&il->isr_stats, 0, sizeof(il->isr_stats));
+}
+
+int
+il_mac_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,
+               const struct ieee80211_tx_queue_params *params)
+{
+        struct il_priv *il = hw->priv;
+        unsigned long flags;
+        int q;
+
+        D_MAC80211("enter\n");
+
+        if (!il_is_ready_rf(il)) {
+                D_MAC80211("leave - RF not ready\n");
+                return -EIO;
+        }
+
+        if (queue >= AC_NUM) {
+                D_MAC80211("leave - queue >= AC_NUM %d\n", queue);
+                return 0;
+        }
+
+        q = AC_NUM - 1 - queue;
+
+        spin_lock_irqsave(&il->lock, flags);
+
+        il->ctx.qos_data.def_qos_parm.ac[q].cw_min =
+            cpu_to_le16(params->cw_min);
+        il->ctx.qos_data.def_qos_parm.ac[q].cw_max =
+            cpu_to_le16(params->cw_max);
+        il->ctx.qos_data.def_qos_parm.ac[q].aifsn = params->aifs;
+        il->ctx.qos_data.def_qos_parm.ac[q].edca_txop =
+            cpu_to_le16((params->txop * 32));
+
+        il->ctx.qos_data.def_qos_parm.ac[q].reserved1 = 0;
+
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        D_MAC80211("leave\n");
+        return 0;
+}
+EXPORT_SYMBOL(il_mac_conf_tx);
+
+int
+il_mac_tx_last_beacon(struct ieee80211_hw *hw)
+{
+        struct il_priv *il = hw->priv;
+
+        return il->ibss_manager == IL_IBSS_MANAGER;
+}
+EXPORT_SYMBOL_GPL(il_mac_tx_last_beacon);
+
+static int
+il_set_mode(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        il_connection_init_rx_config(il, ctx);
+
+        if (il->cfg->ops->hcmd->set_rxon_chain)
+                il->cfg->ops->hcmd->set_rxon_chain(il, ctx);
+
+        return il_commit_rxon(il, ctx);
+}
+
+static int
+il_setup_interface(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        struct ieee80211_vif *vif = ctx->vif;
+        int err;
+
+        lockdep_assert_held(&il->mutex);
+
+        /*
+         * This variable will be correct only when there's just
+         * a single context, but all code using it is for hardware
+         * that supports only one context.
+         */
+        il->iw_mode = vif->type;
+
+        ctx->is_active = true;
+
+        err = il_set_mode(il, ctx);
+        if (err) {
+                if (!ctx->always_active)
+                        ctx->is_active = false;
+                return err;
+        }
+
+        return 0;
+}
+
+int
+il_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
+{
+        struct il_priv *il = hw->priv;
+        struct il_vif_priv *vif_priv = (void *)vif->drv_priv;
+        int err;
+        u32 modes;
+
+        D_MAC80211("enter: type %d, addr %pM\n", vif->type, vif->addr);
+
+        mutex_lock(&il->mutex);
+
+        if (!il_is_ready_rf(il)) {
+                IL_WARN("Try to add interface when device not ready\n");
+                err = -EINVAL;
+                goto out;
+        }
+
+        /* check if busy context is exclusive */
+        if (il->ctx.vif &&
+            (il->ctx.exclusive_interface_modes & BIT(il->ctx.vif->type))) {
+                err = -EINVAL;
+                goto out;
+        }
+
+        modes = il->ctx.interface_modes | il->ctx.exclusive_interface_modes;
+        if (!(modes & BIT(vif->type))) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
+
+        vif_priv->ctx = &il->ctx;
+        il->ctx.vif = vif;
+
+        err = il_setup_interface(il, &il->ctx);
+        if (err) {
+                il->ctx.vif = NULL;
+                il->iw_mode = NL80211_IFTYPE_STATION;
+        }
+
+out:
+        mutex_unlock(&il->mutex);
+
+        D_MAC80211("leave\n");
+        return err;
+}
+EXPORT_SYMBOL(il_mac_add_interface);
+
+static void
+il_teardown_interface(struct il_priv *il, struct ieee80211_vif *vif,
+                      bool mode_change)
+{
+        struct il_rxon_context *ctx = il_rxon_ctx_from_vif(vif);
+
+        lockdep_assert_held(&il->mutex);
+
+        if (il->scan_vif == vif) {
+                il_scan_cancel_timeout(il, 200);
+                il_force_scan_end(il);
+        }
+
+        if (!mode_change) {
+                il_set_mode(il, ctx);
+                if (!ctx->always_active)
+                        ctx->is_active = false;
+        }
+}
+
+void
+il_mac_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
+{
+        struct il_priv *il = hw->priv;
+        struct il_rxon_context *ctx = il_rxon_ctx_from_vif(vif);
+
+        D_MAC80211("enter\n");
+
+        mutex_lock(&il->mutex);
+
+        WARN_ON(ctx->vif != vif);
+        ctx->vif = NULL;
+
+        il_teardown_interface(il, vif, false);
+
+        memset(il->bssid, 0, ETH_ALEN);
+        mutex_unlock(&il->mutex);
+
+        D_MAC80211("leave\n");
+
+}
+EXPORT_SYMBOL(il_mac_remove_interface);
+
+int
+il_alloc_txq_mem(struct il_priv *il)
+{
+        if (!il->txq)
+                il->txq =
+                    kzalloc(sizeof(struct il_tx_queue) *
+                            il->cfg->base_params->num_of_queues, GFP_KERNEL);
+        if (!il->txq) {
+                IL_ERR("Not enough memory for txq\n");
+                return -ENOMEM;
+        }
+        return 0;
+}
+EXPORT_SYMBOL(il_alloc_txq_mem);
+
+void
+il_txq_mem(struct il_priv *il)
+{
+        kfree(il->txq);
+        il->txq = NULL;
+}
+EXPORT_SYMBOL(il_txq_mem);
+
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+
+#define IL_TRAFFIC_DUMP_SIZE    (IL_TRAFFIC_ENTRY_SIZE * IL_TRAFFIC_ENTRIES)
+
+void
+il_reset_traffic_log(struct il_priv *il)
+{
+        il->tx_traffic_idx = 0;
+        il->rx_traffic_idx = 0;
+        if (il->tx_traffic)
+                memset(il->tx_traffic, 0, IL_TRAFFIC_DUMP_SIZE);
+        if (il->rx_traffic)
+                memset(il->rx_traffic, 0, IL_TRAFFIC_DUMP_SIZE);
+}
+
+int
+il_alloc_traffic_mem(struct il_priv *il)
+{
+        u32 traffic_size = IL_TRAFFIC_DUMP_SIZE;
+
+        if (il_debug_level & IL_DL_TX) {
+                if (!il->tx_traffic) {
+                        il->tx_traffic = kzalloc(traffic_size, GFP_KERNEL);
+                        if (!il->tx_traffic)
+                                return -ENOMEM;
+                }
+        }
+        if (il_debug_level & IL_DL_RX) {
+                if (!il->rx_traffic) {
+                        il->rx_traffic = kzalloc(traffic_size, GFP_KERNEL);
+                        if (!il->rx_traffic)
+                                return -ENOMEM;
+                }
+        }
+        il_reset_traffic_log(il);
+        return 0;
+}
+EXPORT_SYMBOL(il_alloc_traffic_mem);
+
+void
+il_free_traffic_mem(struct il_priv *il)
+{
+        kfree(il->tx_traffic);
+        il->tx_traffic = NULL;
+
+        kfree(il->rx_traffic);
+        il->rx_traffic = NULL;
+}
+EXPORT_SYMBOL(il_free_traffic_mem);
+
+void
+il_dbg_log_tx_data_frame(struct il_priv *il, u16 length,
+                         struct ieee80211_hdr *header)
+{
+        __le16 fc;
+        u16 len;
+
+        if (likely(!(il_debug_level & IL_DL_TX)))
+                return;
+
+        if (!il->tx_traffic)
+                return;
+
+        fc = header->frame_control;
+        if (ieee80211_is_data(fc)) {
+                len =
+                    (length >
+                     IL_TRAFFIC_ENTRY_SIZE) ? IL_TRAFFIC_ENTRY_SIZE : length;
+                memcpy((il->tx_traffic +
+                        (il->tx_traffic_idx * IL_TRAFFIC_ENTRY_SIZE)), header,
+                       len);
+                il->tx_traffic_idx =
+                    (il->tx_traffic_idx + 1) % IL_TRAFFIC_ENTRIES;
+        }
+}
+EXPORT_SYMBOL(il_dbg_log_tx_data_frame);
+
+void
+il_dbg_log_rx_data_frame(struct il_priv *il, u16 length,
+                         struct ieee80211_hdr *header)
+{
+        __le16 fc;
+        u16 len;
+
+        if (likely(!(il_debug_level & IL_DL_RX)))
+                return;
+
+        if (!il->rx_traffic)
+                return;
+
+        fc = header->frame_control;
+        if (ieee80211_is_data(fc)) {
+                len =
+                    (length >
+                     IL_TRAFFIC_ENTRY_SIZE) ? IL_TRAFFIC_ENTRY_SIZE : length;
+                memcpy((il->rx_traffic +
+                        (il->rx_traffic_idx * IL_TRAFFIC_ENTRY_SIZE)), header,
+                       len);
+                il->rx_traffic_idx =
+                    (il->rx_traffic_idx + 1) % IL_TRAFFIC_ENTRIES;
+        }
+}
+EXPORT_SYMBOL(il_dbg_log_rx_data_frame);
+
+const char *
+il_get_mgmt_string(int cmd)
+{
+        switch (cmd) {
+                IL_CMD(MANAGEMENT_ASSOC_REQ);
+                IL_CMD(MANAGEMENT_ASSOC_RESP);
+                IL_CMD(MANAGEMENT_REASSOC_REQ);
+                IL_CMD(MANAGEMENT_REASSOC_RESP);
+                IL_CMD(MANAGEMENT_PROBE_REQ);
+                IL_CMD(MANAGEMENT_PROBE_RESP);
+                IL_CMD(MANAGEMENT_BEACON);
+                IL_CMD(MANAGEMENT_ATIM);
+                IL_CMD(MANAGEMENT_DISASSOC);
+                IL_CMD(MANAGEMENT_AUTH);
+                IL_CMD(MANAGEMENT_DEAUTH);
+                IL_CMD(MANAGEMENT_ACTION);
+        default:
+                return "UNKNOWN";
+
+        }
+}
+
+const char *
+il_get_ctrl_string(int cmd)
+{
+        switch (cmd) {
+                IL_CMD(CONTROL_BACK_REQ);
+                IL_CMD(CONTROL_BACK);
+                IL_CMD(CONTROL_PSPOLL);
+                IL_CMD(CONTROL_RTS);
+                IL_CMD(CONTROL_CTS);
+                IL_CMD(CONTROL_ACK);
+                IL_CMD(CONTROL_CFEND);
+                IL_CMD(CONTROL_CFENDACK);
+        default:
+                return "UNKNOWN";
+
+        }
+}
+
+void
+il_clear_traffic_stats(struct il_priv *il)
+{
+        memset(&il->tx_stats, 0, sizeof(struct traffic_stats));
+        memset(&il->rx_stats, 0, sizeof(struct traffic_stats));
+}
+
+/*
+ * if CONFIG_IWLEGACY_DEBUGFS defined,
+ * il_update_stats function will
+ * record all the MGMT, CTRL and DATA pkt for both TX and Rx pass
+ * Use debugFs to display the rx/rx_stats
+ * if CONFIG_IWLEGACY_DEBUGFS not being defined, then no MGMT and CTRL
+ * information will be recorded, but DATA pkt still will be recorded
+ * for the reason of il_led.c need to control the led blinking based on
+ * number of tx and rx data.
+ *
+ */
+void
+il_update_stats(struct il_priv *il, bool is_tx, __le16 fc, u16 len)
+{
+        struct traffic_stats *stats;
+
+        if (is_tx)
+                stats = &il->tx_stats;
+        else
+                stats = &il->rx_stats;
+
+        if (ieee80211_is_mgmt(fc)) {
+                switch (fc & cpu_to_le16(IEEE80211_FCTL_STYPE)) {
+                case cpu_to_le16(IEEE80211_STYPE_ASSOC_REQ):
+                        stats->mgmt[MANAGEMENT_ASSOC_REQ]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
+                        stats->mgmt[MANAGEMENT_ASSOC_RESP]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_REASSOC_REQ):
+                        stats->mgmt[MANAGEMENT_REASSOC_REQ]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
+                        stats->mgmt[MANAGEMENT_REASSOC_RESP]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_PROBE_REQ):
+                        stats->mgmt[MANAGEMENT_PROBE_REQ]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
+                        stats->mgmt[MANAGEMENT_PROBE_RESP]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_BEACON):
+                        stats->mgmt[MANAGEMENT_BEACON]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_ATIM):
+                        stats->mgmt[MANAGEMENT_ATIM]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
+                        stats->mgmt[MANAGEMENT_DISASSOC]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_AUTH):
+                        stats->mgmt[MANAGEMENT_AUTH]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
+                        stats->mgmt[MANAGEMENT_DEAUTH]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_ACTION):
+                        stats->mgmt[MANAGEMENT_ACTION]++;
+                        break;
+                }
+        } else if (ieee80211_is_ctl(fc)) {
+                switch (fc & cpu_to_le16(IEEE80211_FCTL_STYPE)) {
+                case cpu_to_le16(IEEE80211_STYPE_BACK_REQ):
+                        stats->ctrl[CONTROL_BACK_REQ]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_BACK):
+                        stats->ctrl[CONTROL_BACK]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_PSPOLL):
+                        stats->ctrl[CONTROL_PSPOLL]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_RTS):
+                        stats->ctrl[CONTROL_RTS]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_CTS):
+                        stats->ctrl[CONTROL_CTS]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_ACK):
+                        stats->ctrl[CONTROL_ACK]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_CFEND):
+                        stats->ctrl[CONTROL_CFEND]++;
+                        break;
+                case cpu_to_le16(IEEE80211_STYPE_CFENDACK):
+                        stats->ctrl[CONTROL_CFENDACK]++;
+                        break;
+                }
+        } else {
+                /* data */
+                stats->data_cnt++;
+                stats->data_bytes += len;
+        }
+}
+EXPORT_SYMBOL(il_update_stats);
+#endif
+
+int
+il_force_reset(struct il_priv *il, bool external)
+{
+        struct il_force_reset *force_reset;
+
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                return -EINVAL;
+
+        force_reset = &il->force_reset;
+        force_reset->reset_request_count++;
+        if (!external) {
+                if (force_reset->last_force_reset_jiffies &&
+                    time_after(force_reset->last_force_reset_jiffies +
+                               force_reset->reset_duration, jiffies)) {
+                        D_INFO("force reset rejected\n");
+                        force_reset->reset_reject_count++;
+                        return -EAGAIN;
+                }
+        }
+        force_reset->reset_success_count++;
+        force_reset->last_force_reset_jiffies = jiffies;
+
+        /*
+         * if the request is from external(ex: debugfs),
+         * then always perform the request in regardless the module
+         * parameter setting
+         * if the request is from internal (uCode error or driver
+         * detect failure), then fw_restart module parameter
+         * need to be check before performing firmware reload
+         */
+
+        if (!external && !il->cfg->mod_params->restart_fw) {
+                D_INFO("Cancel firmware reload based on "
+                       "module parameter setting\n");
+                return 0;
+        }
+
+        IL_ERR("On demand firmware reload\n");
+
+        /* Set the FW error flag -- cleared on il_down */
+        set_bit(S_FW_ERROR, &il->status);
+        wake_up(&il->wait_command_queue);
+        /*
+         * Keep the restart process from trying to send host
+         * commands by clearing the INIT status bit
+         */
+        clear_bit(S_READY, &il->status);
+        queue_work(il->workqueue, &il->restart);
+
+        return 0;
+}
+
+int
+il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                        enum nl80211_iftype newtype, bool newp2p)
+{
+        struct il_priv *il = hw->priv;
+        struct il_rxon_context *ctx = il_rxon_ctx_from_vif(vif);
+        u32 modes;
+        int err;
+
+        newtype = ieee80211_iftype_p2p(newtype, newp2p);
+
+        mutex_lock(&il->mutex);
+
+        if (!ctx->vif || !il_is_ready_rf(il)) {
+                /*
+                 * Huh? But wait ... this can maybe happen when
+                 * we're in the middle of a firmware restart!
+                 */
+                err = -EBUSY;
+                goto out;
+        }
+
+        modes = ctx->interface_modes | ctx->exclusive_interface_modes;
+        if (!(modes & BIT(newtype))) {
+                err = -EOPNOTSUPP;
+                goto out;
+        }
+
+        if ((il->ctx.exclusive_interface_modes & BIT(il->ctx.vif->type)) ||
+            (il->ctx.exclusive_interface_modes & BIT(newtype))) {
+                err = -EINVAL;
+                goto out;
+        }
+
+        /* success */
+        il_teardown_interface(il, vif, true);
+        vif->type = newtype;
+        vif->p2p = newp2p;
+        err = il_setup_interface(il, ctx);
+        WARN_ON(err);
+        /*
+         * We've switched internally, but submitting to the
+         * device may have failed for some reason. Mask this
+         * error, because otherwise mac80211 will not switch
+         * (and set the interface type back) and we'll be
+         * out of sync with it.
+         */
+        err = 0;
+
+out:
+        mutex_unlock(&il->mutex);
+        return err;
+}
+EXPORT_SYMBOL(il_mac_change_interface);
+
+/*
+ * On every watchdog tick we check (latest) time stamp. If it does not
+ * change during timeout period and queue is not empty we reset firmware.
+ */
+static int
+il_check_stuck_queue(struct il_priv *il, int cnt)
+{
+        struct il_tx_queue *txq = &il->txq[cnt];
+        struct il_queue *q = &txq->q;
+        unsigned long timeout;
+        int ret;
+
+        if (q->read_ptr == q->write_ptr) {
+                txq->time_stamp = jiffies;
+                return 0;
+        }
+
+        timeout =
+            txq->time_stamp +
+            msecs_to_jiffies(il->cfg->base_params->wd_timeout);
+
+        if (time_after(jiffies, timeout)) {
+                IL_ERR("Queue %d stuck for %u ms.\n", q->id,
+                       il->cfg->base_params->wd_timeout);
+                ret = il_force_reset(il, false);
+                return (ret == -EAGAIN) ? 0 : 1;
+        }
+
+        return 0;
+}
+
+/*
+ * Making watchdog tick be a quarter of timeout assure we will
+ * discover the queue hung between timeout and 1.25*timeout
+ */
+#define IL_WD_TICK(timeout) ((timeout) / 4)
+
+/*
+ * Watchdog timer callback, we check each tx queue for stuck, if if hung
+ * we reset the firmware. If everything is fine just rearm the timer.
+ */
+void
+il_bg_watchdog(unsigned long data)
+{
+        struct il_priv *il = (struct il_priv *)data;
+        int cnt;
+        unsigned long timeout;
+
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                return;
+
+        timeout = il->cfg->base_params->wd_timeout;
+        if (timeout == 0)
+                return;
+
+        /* monitor and check for stuck cmd queue */
+        if (il_check_stuck_queue(il, il->cmd_queue))
+                return;
+
+        /* monitor and check for other stuck queues */
+        if (il_is_any_associated(il)) {
+                for (cnt = 0; cnt < il->hw_params.max_txq_num; cnt++) {
+                        /* skip as we already checked the command queue */
+                        if (cnt == il->cmd_queue)
+                                continue;
+                        if (il_check_stuck_queue(il, cnt))
+                                return;
+                }
+        }
+
+        mod_timer(&il->watchdog,
+                  jiffies + msecs_to_jiffies(IL_WD_TICK(timeout)));
+}
+EXPORT_SYMBOL(il_bg_watchdog);
+
+void
+il_setup_watchdog(struct il_priv *il)
+{
+        unsigned int timeout = il->cfg->base_params->wd_timeout;
+
+        if (timeout)
+                mod_timer(&il->watchdog,
+                          jiffies + msecs_to_jiffies(IL_WD_TICK(timeout)));
+        else
+                del_timer(&il->watchdog);
+}
+EXPORT_SYMBOL(il_setup_watchdog);
+
+/*
+ * extended beacon time format
+ * time in usec will be changed into a 32-bit value in extended:internal format
+ * the extended part is the beacon counts
+ * the internal part is the time in usec within one beacon interval
+ */
+u32
+il_usecs_to_beacons(struct il_priv *il, u32 usec, u32 beacon_interval)
+{
+        u32 quot;
+        u32 rem;
+        u32 interval = beacon_interval * TIME_UNIT;
+
+        if (!interval || !usec)
+                return 0;
+
+        quot =
+            (usec /
+             interval) & (il_beacon_time_mask_high(il,
+                                                   il->hw_params.
+                                                   beacon_time_tsf_bits) >> il->
+                          hw_params.beacon_time_tsf_bits);
+        rem =
+            (usec % interval) & il_beacon_time_mask_low(il,
+                                                        il->hw_params.
+                                                        beacon_time_tsf_bits);
+
+        return (quot << il->hw_params.beacon_time_tsf_bits) + rem;
+}
+EXPORT_SYMBOL(il_usecs_to_beacons);
+
+/* base is usually what we get from ucode with each received frame,
+ * the same as HW timer counter counting down
+ */
+__le32
+il_add_beacon_time(struct il_priv *il, u32 base, u32 addon,
+                   u32 beacon_interval)
+{
+        u32 base_low = base & il_beacon_time_mask_low(il,
+                                                      il->hw_params.
+                                                      beacon_time_tsf_bits);
+        u32 addon_low = addon & il_beacon_time_mask_low(il,
+                                                        il->hw_params.
+                                                        beacon_time_tsf_bits);
+        u32 interval = beacon_interval * TIME_UNIT;
+        u32 res = (base & il_beacon_time_mask_high(il,
+                                                   il->hw_params.
+                                                   beacon_time_tsf_bits)) +
+            (addon & il_beacon_time_mask_high(il,
+                                              il->hw_params.
+                                              beacon_time_tsf_bits));
+
+        if (base_low > addon_low)
+                res += base_low - addon_low;
+        else if (base_low < addon_low) {
+                res += interval + base_low - addon_low;
+                res += (1 << il->hw_params.beacon_time_tsf_bits);
+        } else
+                res += (1 << il->hw_params.beacon_time_tsf_bits);
+
+        return cpu_to_le32(res);
+}
+EXPORT_SYMBOL(il_add_beacon_time);
+
+#ifdef CONFIG_PM
+
+int
+il_pci_suspend(struct device *device)
+{
+        struct pci_dev *pdev = to_pci_dev(device);
+        struct il_priv *il = pci_get_drvdata(pdev);
+
+        /*
+         * This function is called when system goes into suspend state
+         * mac80211 will call il_mac_stop() from the mac80211 suspend function
+         * first but since il_mac_stop() has no knowledge of who the caller is,
+         * it will not call apm_ops.stop() to stop the DMA operation.
+         * Calling apm_ops.stop here to make sure we stop the DMA.
+         */
+        il_apm_stop(il);
+
+        return 0;
+}
+EXPORT_SYMBOL(il_pci_suspend);
+
+int
+il_pci_resume(struct device *device)
+{
+        struct pci_dev *pdev = to_pci_dev(device);
+        struct il_priv *il = pci_get_drvdata(pdev);
+        bool hw_rfkill = false;
+
+        /*
+         * We disable the RETRY_TIMEOUT register (0x41) to keep
+         * PCI Tx retries from interfering with C3 CPU state.
+         */
+        pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);
+
+        il_enable_interrupts(il);
+
+        if (!(_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW))
+                hw_rfkill = true;
+
+        if (hw_rfkill)
+                set_bit(S_RF_KILL_HW, &il->status);
+        else
+                clear_bit(S_RF_KILL_HW, &il->status);
+
+        wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rfkill);
+
+        return 0;
+}
+EXPORT_SYMBOL(il_pci_resume);
+
+const struct dev_pm_ops il_pm_ops = {
+        .suspend = il_pci_suspend,
+        .resume = il_pci_resume,
+        .freeze = il_pci_suspend,
+        .thaw = il_pci_resume,
+        .poweroff = il_pci_suspend,
+        .restore = il_pci_resume,
+};
+EXPORT_SYMBOL(il_pm_ops);
+
+#endif /* CONFIG_PM */
+
+static void
+il_update_qos(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        if (test_bit(S_EXIT_PENDING, &il->status))
+                return;
+
+        if (!ctx->is_active)
+                return;
+
+        ctx->qos_data.def_qos_parm.qos_flags = 0;
+
+        if (ctx->qos_data.qos_active)
+                ctx->qos_data.def_qos_parm.qos_flags |=
+                    QOS_PARAM_FLG_UPDATE_EDCA_MSK;
+
+        if (ctx->ht.enabled)
+                ctx->qos_data.def_qos_parm.qos_flags |= QOS_PARAM_FLG_TGN_MSK;
+
+        D_QOS("send QoS cmd with Qos active=%d FLAGS=0x%X\n",
+              ctx->qos_data.qos_active, ctx->qos_data.def_qos_parm.qos_flags);
+
+        il_send_cmd_pdu_async(il, ctx->qos_cmd, sizeof(struct il_qosparam_cmd),
+                              &ctx->qos_data.def_qos_parm, NULL);
+}
+
+/**
+ * il_mac_config - mac80211 config callback
+ */
+int
+il_mac_config(struct ieee80211_hw *hw, u32 changed)
+{
+        struct il_priv *il = hw->priv;
+        const struct il_channel_info *ch_info;
+        struct ieee80211_conf *conf = &hw->conf;
+        struct ieee80211_channel *channel = conf->channel;
+        struct il_ht_config *ht_conf = &il->current_ht_config;
+        struct il_rxon_context *ctx = &il->ctx;
+        unsigned long flags = 0;
+        int ret = 0;
+        u16 ch;
+        int scan_active = 0;
+        bool ht_changed = false;
+
+        if (WARN_ON(!il->cfg->ops->legacy))
+                return -EOPNOTSUPP;
+
+        mutex_lock(&il->mutex);
+
+        D_MAC80211("enter to channel %d changed 0x%X\n", channel->hw_value,
+                   changed);
+
+        if (unlikely(test_bit(S_SCANNING, &il->status))) {
+                scan_active = 1;
+                D_MAC80211("scan active\n");
+        }
+
+        if (changed &
+            (IEEE80211_CONF_CHANGE_SMPS | IEEE80211_CONF_CHANGE_CHANNEL)) {
+                /* mac80211 uses static for non-HT which is what we want */
+                il->current_ht_config.smps = conf->smps_mode;
+
+                /*
+                 * Recalculate chain counts.
+                 *
+                 * If monitor mode is enabled then mac80211 will
+                 * set up the SM PS mode to OFF if an HT channel is
+                 * configured.
+                 */
+                if (il->cfg->ops->hcmd->set_rxon_chain)
+                        il->cfg->ops->hcmd->set_rxon_chain(il, &il->ctx);
+        }
+
+        /* during scanning mac80211 will delay channel setting until
+         * scan finish with changed = 0
+         */
+        if (!changed || (changed & IEEE80211_CONF_CHANGE_CHANNEL)) {
+
+                if (scan_active)
+                        goto set_ch_out;
+
+                ch = channel->hw_value;
+                ch_info = il_get_channel_info(il, channel->band, ch);
+                if (!il_is_channel_valid(ch_info)) {
+                        D_MAC80211("leave - invalid channel\n");
+                        ret = -EINVAL;
+                        goto set_ch_out;
+                }
+
+                if (il->iw_mode == NL80211_IFTYPE_ADHOC &&
+                    !il_is_channel_ibss(ch_info)) {
+                        D_MAC80211("leave - not IBSS channel\n");
+                        ret = -EINVAL;
+                        goto set_ch_out;
+                }
+
+                spin_lock_irqsave(&il->lock, flags);
+
+                /* Configure HT40 channels */
+                if (ctx->ht.enabled != conf_is_ht(conf)) {
+                        ctx->ht.enabled = conf_is_ht(conf);
+                        ht_changed = true;
+                }
+                if (ctx->ht.enabled) {
+                        if (conf_is_ht40_minus(conf)) {
+                                ctx->ht.extension_chan_offset =
+                                    IEEE80211_HT_PARAM_CHA_SEC_BELOW;
+                                ctx->ht.is_40mhz = true;
+                        } else if (conf_is_ht40_plus(conf)) {
+                                ctx->ht.extension_chan_offset =
+                                    IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
+                                ctx->ht.is_40mhz = true;
+                        } else {
+                                ctx->ht.extension_chan_offset =
+                                    IEEE80211_HT_PARAM_CHA_SEC_NONE;
+                                ctx->ht.is_40mhz = false;
+                        }
+                } else
+                        ctx->ht.is_40mhz = false;
+
+                /*
+                 * Default to no protection. Protection mode will
+                 * later be set from BSS config in il_ht_conf
+                 */
+                ctx->ht.protection = IEEE80211_HT_OP_MODE_PROTECTION_NONE;
+
+                /* 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(ctx->staging.channel) != ch))
+                        ctx->staging.flags = 0;
+
+                il_set_rxon_channel(il, channel, ctx);
+                il_set_rxon_ht(il, ht_conf);
+
+                il_set_flags_for_band(il, ctx, channel->band, ctx->vif);
+
+                spin_unlock_irqrestore(&il->lock, flags);
+
+                if (il->cfg->ops->legacy->update_bcast_stations)
+                        ret = il->cfg->ops->legacy->update_bcast_stations(il);
+
+set_ch_out:
+                /* The list of supported rates and rate mask can be different
+                 * for each band; since the band may have changed, reset
+                 * the rate mask to what mac80211 lists */
+                il_set_rate(il);
+        }
+
+        if (changed & (IEEE80211_CONF_CHANGE_PS | IEEE80211_CONF_CHANGE_IDLE)) {
+                ret = il_power_update_mode(il, false);
+                if (ret)
+                        D_MAC80211("Error setting sleep level\n");
+        }
+
+        if (changed & IEEE80211_CONF_CHANGE_POWER) {
+                D_MAC80211("TX Power old=%d new=%d\n", il->tx_power_user_lmt,
+                           conf->power_level);
+
+                il_set_tx_power(il, conf->power_level, false);
+        }
+
+        if (!il_is_ready(il)) {
+                D_MAC80211("leave - not ready\n");
+                goto out;
+        }
+
+        if (scan_active)
+                goto out;
+
+        if (memcmp(&ctx->active, &ctx->staging, sizeof(ctx->staging)))
+                il_commit_rxon(il, ctx);
+        else
+                D_INFO("Not re-sending same RXON configuration.\n");
+        if (ht_changed)
+                il_update_qos(il, ctx);
+
+out:
+        D_MAC80211("leave\n");
+        mutex_unlock(&il->mutex);
+        return ret;
+}
+EXPORT_SYMBOL(il_mac_config);
+
+void
+il_mac_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
+{
+        struct il_priv *il = hw->priv;
+        unsigned long flags;
+        struct il_rxon_context *ctx = &il->ctx;
+
+        if (WARN_ON(!il->cfg->ops->legacy))
+                return;
+
+        mutex_lock(&il->mutex);
+        D_MAC80211("enter\n");
+
+        spin_lock_irqsave(&il->lock, flags);
+        memset(&il->current_ht_config, 0, sizeof(struct il_ht_config));
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        spin_lock_irqsave(&il->lock, flags);
+
+        /* new association get rid of ibss beacon skb */
+        if (il->beacon_skb)
+                dev_kfree_skb(il->beacon_skb);
+
+        il->beacon_skb = NULL;
+
+        il->timestamp = 0;
+
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        il_scan_cancel_timeout(il, 100);
+        if (!il_is_ready_rf(il)) {
+                D_MAC80211("leave - not ready\n");
+                mutex_unlock(&il->mutex);
+                return;
+        }
+
+        /* we are restarting association process
+         * clear RXON_FILTER_ASSOC_MSK bit
+         */
+        ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+        il_commit_rxon(il, ctx);
+
+        il_set_rate(il);
+
+        mutex_unlock(&il->mutex);
+
+        D_MAC80211("leave\n");
+}
+EXPORT_SYMBOL(il_mac_reset_tsf);
+
+static void
+il_ht_conf(struct il_priv *il, struct ieee80211_vif *vif)
+{
+        struct il_ht_config *ht_conf = &il->current_ht_config;
+        struct ieee80211_sta *sta;
+        struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
+        struct il_rxon_context *ctx = il_rxon_ctx_from_vif(vif);
+
+        D_ASSOC("enter:\n");
+
+        if (!ctx->ht.enabled)
+                return;
+
+        ctx->ht.protection =
+            bss_conf->ht_operation_mode & IEEE80211_HT_OP_MODE_PROTECTION;
+        ctx->ht.non_gf_sta_present =
+            !!(bss_conf->
+               ht_operation_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);
+
+        ht_conf->single_chain_sufficient = false;
+
+        switch (vif->type) {
+        case NL80211_IFTYPE_STATION:
+                rcu_read_lock();
+                sta = ieee80211_find_sta(vif, bss_conf->bssid);
+                if (sta) {
+                        struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
+                        int maxstreams;
+
+                        maxstreams =
+                            (ht_cap->mcs.
+                             tx_params & IEEE80211_HT_MCS_TX_MAX_STREAMS_MASK)
+                            >> IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT;
+                        maxstreams += 1;
+
+                        if (ht_cap->mcs.rx_mask[1] == 0 &&
+                            ht_cap->mcs.rx_mask[2] == 0)
+                                ht_conf->single_chain_sufficient = true;
+                        if (maxstreams <= 1)
+                                ht_conf->single_chain_sufficient = true;
+                } else {
+                        /*
+                         * If at all, this can only happen through a race
+                         * when the AP disconnects us while we're still
+                         * setting up the connection, in that case mac80211
+                         * will soon tell us about that.
+                         */
+                        ht_conf->single_chain_sufficient = true;
+                }
+                rcu_read_unlock();
+                break;
+        case NL80211_IFTYPE_ADHOC:
+                ht_conf->single_chain_sufficient = true;
+                break;
+        default:
+                break;
+        }
+
+        D_ASSOC("leave\n");
+}
+
+static inline void
+il_set_no_assoc(struct il_priv *il, struct ieee80211_vif *vif)
+{
+        struct il_rxon_context *ctx = il_rxon_ctx_from_vif(vif);
+
+        /*
+         * inform the ucode that there is no longer an
+         * association and that no more packets should be
+         * sent
+         */
+        ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+        ctx->staging.assoc_id = 0;
+        il_commit_rxon(il, ctx);
+}
+
+static void
+il_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
+{
+        struct il_priv *il = hw->priv;
+        unsigned long flags;
+        __le64 timestamp;
+        struct sk_buff *skb = ieee80211_beacon_get(hw, vif);
+
+        if (!skb)
+                return;
+
+        D_MAC80211("enter\n");
+
+        lockdep_assert_held(&il->mutex);
+
+        if (!il->beacon_ctx) {
+                IL_ERR("update beacon but no beacon context!\n");
+                dev_kfree_skb(skb);
+                return;
+        }
+
+        spin_lock_irqsave(&il->lock, flags);
+
+        if (il->beacon_skb)
+                dev_kfree_skb(il->beacon_skb);
+
+        il->beacon_skb = skb;
+
+        timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;
+        il->timestamp = le64_to_cpu(timestamp);
+
+        D_MAC80211("leave\n");
+        spin_unlock_irqrestore(&il->lock, flags);
+
+        if (!il_is_ready_rf(il)) {
+                D_MAC80211("leave - RF not ready\n");
+                return;
+        }
+
+        il->cfg->ops->legacy->post_associate(il);
+}
+
+void
+il_mac_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                        struct ieee80211_bss_conf *bss_conf, u32 changes)
+{
+        struct il_priv *il = hw->priv;
+        struct il_rxon_context *ctx = il_rxon_ctx_from_vif(vif);
+        int ret;
+
+        if (WARN_ON(!il->cfg->ops->legacy))
+                return;
+
+        D_MAC80211("changes = 0x%X\n", changes);
+
+        mutex_lock(&il->mutex);
+
+        if (!il_is_alive(il)) {
+                mutex_unlock(&il->mutex);
+                return;
+        }
+
+        if (changes & BSS_CHANGED_QOS) {
+                unsigned long flags;
+
+                spin_lock_irqsave(&il->lock, flags);
+                ctx->qos_data.qos_active = bss_conf->qos;
+                il_update_qos(il, ctx);
+                spin_unlock_irqrestore(&il->lock, flags);
+        }
+
+        if (changes & BSS_CHANGED_BEACON_ENABLED) {
+                /*
+                 * the add_interface code must make sure we only ever
+                 * have a single interface that could be beaconing at
+                 * any time.
+                 */
+                if (vif->bss_conf.enable_beacon)
+                        il->beacon_ctx = ctx;
+                else
+                        il->beacon_ctx = NULL;
+        }
+
+        if (changes & BSS_CHANGED_BSSID) {
+                D_MAC80211("BSSID %pM\n", bss_conf->bssid);
+
+                /*
+                 * If there is currently a HW scan going on in the
+                 * background then we need to cancel it else the RXON
+                 * below/in post_associate will fail.
+                 */
+                if (il_scan_cancel_timeout(il, 100)) {
+                        IL_WARN("Aborted scan still in progress after 100ms\n");
+                        D_MAC80211("leaving - scan abort failed.\n");
+                        mutex_unlock(&il->mutex);
+                        return;
+                }
+
+                /* mac80211 only sets assoc when in STATION mode */
+                if (vif->type == NL80211_IFTYPE_ADHOC || bss_conf->assoc) {
+                        memcpy(ctx->staging.bssid_addr, bss_conf->bssid,
+                               ETH_ALEN);
+
+                        /* currently needed in a few places */
+                        memcpy(il->bssid, bss_conf->bssid, ETH_ALEN);
+                } else {
+                        ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+                }
+
+        }
+
+        /*
+         * This needs to be after setting the BSSID in case
+         * mac80211 decides to do both changes at once because
+         * it will invoke post_associate.
+         */
+        if (vif->type == NL80211_IFTYPE_ADHOC && (changes & BSS_CHANGED_BEACON))
+                il_beacon_update(hw, vif);
+
+        if (changes & BSS_CHANGED_ERP_PREAMBLE) {
+                D_MAC80211("ERP_PREAMBLE %d\n", bss_conf->use_short_preamble);
+                if (bss_conf->use_short_preamble)
+                        ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
+                else
+                        ctx->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
+        }
+
+        if (changes & BSS_CHANGED_ERP_CTS_PROT) {
+                D_MAC80211("ERP_CTS %d\n", bss_conf->use_cts_prot);
+                if (bss_conf->use_cts_prot && il->band != IEEE80211_BAND_5GHZ)
+                        ctx->staging.flags |= RXON_FLG_TGG_PROTECT_MSK;
+                else
+                        ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
+                if (bss_conf->use_cts_prot)
+                        ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
+                else
+                        ctx->staging.flags &= ~RXON_FLG_SELF_CTS_EN;
+        }
+
+        if (changes & BSS_CHANGED_BASIC_RATES) {
+                /* XXX use this information
+                 *
+                 * To do that, remove code from il_set_rate() and put something
+                 * like this here:
+                 *
+                 if (A-band)
+                 ctx->staging.ofdm_basic_rates =
+                 bss_conf->basic_rates;
+                 else
+                 ctx->staging.ofdm_basic_rates =
+                 bss_conf->basic_rates >> 4;
+                 ctx->staging.cck_basic_rates =
+                 bss_conf->basic_rates & 0xF;
+                 */
+        }
+
+        if (changes & BSS_CHANGED_HT) {
+                il_ht_conf(il, vif);
+
+                if (il->cfg->ops->hcmd->set_rxon_chain)
+                        il->cfg->ops->hcmd->set_rxon_chain(il, ctx);
+        }
+
+        if (changes & BSS_CHANGED_ASSOC) {
+                D_MAC80211("ASSOC %d\n", bss_conf->assoc);
+                if (bss_conf->assoc) {
+                        il->timestamp = bss_conf->timestamp;
+
+                        if (!il_is_rfkill(il))
+                                il->cfg->ops->legacy->post_associate(il);
+                } else
+                        il_set_no_assoc(il, vif);
+        }
+
+        if (changes && il_is_associated_ctx(ctx) && bss_conf->aid) {
+                D_MAC80211("Changes (%#x) while associated\n", changes);
+                ret = il_send_rxon_assoc(il, ctx);
+                if (!ret) {
+                        /* Sync active_rxon with latest change. */
+                        memcpy((void *)&ctx->active, &ctx->staging,
+                               sizeof(struct il_rxon_cmd));
+                }
+        }
+
+        if (changes & BSS_CHANGED_BEACON_ENABLED) {
+                if (vif->bss_conf.enable_beacon) {
+                        memcpy(ctx->staging.bssid_addr, bss_conf->bssid,
+                               ETH_ALEN);
+                        memcpy(il->bssid, bss_conf->bssid, ETH_ALEN);
+                        il->cfg->ops->legacy->config_ap(il);
+                } else
+                        il_set_no_assoc(il, vif);
+        }
+
+        if (changes & BSS_CHANGED_IBSS) {
+                ret =
+                    il->cfg->ops->legacy->manage_ibss_station(il, vif,
+                                                              bss_conf->
+                                                              ibss_joined);
+                if (ret)
+                        IL_ERR("failed to %s IBSS station %pM\n",
+                               bss_conf->ibss_joined ? "add" : "remove",
+                               bss_conf->bssid);
+        }
+
+        mutex_unlock(&il->mutex);
+
+        D_MAC80211("leave\n");
+}
+EXPORT_SYMBOL(il_mac_bss_info_changed);
+
+irqreturn_t
+il_isr(int irq, void *data)
+{
+        struct il_priv *il = data;
+        u32 inta, inta_mask;
+        u32 inta_fh;
+        unsigned long flags;
+        if (!il)
+                return IRQ_NONE;
+
+        spin_lock_irqsave(&il->lock, flags);
+
+        /* Disable (but don't clear!) interrupts here to avoid
+         *    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 = _il_rd(il, CSR_INT_MASK);   /* just for debug */
+        _il_wr(il, CSR_INT_MASK, 0x00000000);
+
+        /* Discover which interrupts are active/pending */
+        inta = _il_rd(il, CSR_INT);
+        inta_fh = _il_rd(il, CSR_FH_INT_STATUS);
+
+        /* Ignore interrupt if there's nothing in NIC to service.
+         * This may be due to IRQ shared with another device,
+         * or due to sporadic interrupts thrown from our NIC. */
+        if (!inta && !inta_fh) {
+                D_ISR("Ignore interrupt, inta == 0, inta_fh == 0\n");
+                goto none;
+        }
+
+        if (inta == 0xFFFFFFFF || (inta & 0xFFFFFFF0) == 0xa5a5a5a0) {
+                /* Hardware disappeared. It might have already raised
+                 * an interrupt */
+                IL_WARN("HARDWARE GONE?? INTA == 0x%08x\n", inta);
+                goto unplugged;
+        }
+
+        D_ISR("ISR inta 0x%08x, enabled 0x%08x, fh 0x%08x\n", inta, inta_mask,
+              inta_fh);
+
+        inta &= ~CSR_INT_BIT_SCD;
+
+        /* il_irq_tasklet() will service interrupts and re-enable them */
+        if (likely(inta || inta_fh))
+                tasklet_schedule(&il->irq_tasklet);
+
+unplugged:
+        spin_unlock_irqrestore(&il->lock, flags);
+        return IRQ_HANDLED;
+
+none:
+        /* re-enable interrupts here since we don't have anything to service. */
+        /* only Re-enable if disabled by irq */
+        if (test_bit(S_INT_ENABLED, &il->status))
+                il_enable_interrupts(il);
+        spin_unlock_irqrestore(&il->lock, flags);
+        return IRQ_NONE;
+}
+EXPORT_SYMBOL(il_isr);
+
+/*
+ *  il_tx_cmd_protection: Set rts/cts. 3945 and 4965 only share this
+ *  function.
+ */
+void
+il_tx_cmd_protection(struct il_priv *il, struct ieee80211_tx_info *info,
+                     __le16 fc, __le32 *tx_flags)
+{
+        if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) {
+                *tx_flags |= TX_CMD_FLG_RTS_MSK;
+                *tx_flags &= ~TX_CMD_FLG_CTS_MSK;
+                *tx_flags |= TX_CMD_FLG_FULL_TXOP_PROT_MSK;
+
+                if (!ieee80211_is_mgmt(fc))
+                        return;
+
+                switch (fc & cpu_to_le16(IEEE80211_FCTL_STYPE)) {
+                case cpu_to_le16(IEEE80211_STYPE_AUTH):
+                case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
+                case cpu_to_le16(IEEE80211_STYPE_ASSOC_REQ):
+                case cpu_to_le16(IEEE80211_STYPE_REASSOC_REQ):
+                        *tx_flags &= ~TX_CMD_FLG_RTS_MSK;
+                        *tx_flags |= TX_CMD_FLG_CTS_MSK;
+                        break;
+                }
+        } else if (info->control.rates[0].
+                   flags & IEEE80211_TX_RC_USE_CTS_PROTECT) {
+                *tx_flags &= ~TX_CMD_FLG_RTS_MSK;
+                *tx_flags |= TX_CMD_FLG_CTS_MSK;
+                *tx_flags |= TX_CMD_FLG_FULL_TXOP_PROT_MSK;
+        }
+}
+EXPORT_SYMBOL(il_tx_cmd_protection);
diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
new file mode 100644
index 000000000000..1bc0b02f559c
--- /dev/null
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -0,0 +1,3424 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2003 - 2011 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:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ *****************************************************************************/
+#ifndef __il_core_h__
+#define __il_core_h__
+
+#include <linux/interrupt.h>
+#include <linux/pci.h>          /* for struct pci_device_id */
+#include <linux/kernel.h>
+#include <linux/leds.h>
+#include <linux/wait.h>
+#include <net/mac80211.h>
+#include <net/ieee80211_radiotap.h>
+
+#include "commands.h"
+#include "csr.h"
+#include "prph.h"
+
+struct il_host_cmd;
+struct il_cmd;
+struct il_tx_queue;
+
+#define IL_ERR(f, a...) dev_err(&il->pci_dev->dev, f, ## a)
+#define IL_WARN(f, a...) dev_warn(&il->pci_dev->dev, f, ## a)
+#define IL_INFO(f, a...) dev_info(&il->pci_dev->dev, f, ## a)
+
+#define RX_QUEUE_SIZE                         256
+#define RX_QUEUE_MASK                         255
+#define RX_QUEUE_SIZE_LOG                     8
+
+/*
+ * RX related structures and functions
+ */
+#define RX_FREE_BUFFERS 64
+#define RX_LOW_WATERMARK 8
+
+#define U32_PAD(n)              ((4-(n))&0x3)
+
+/* CT-KILL constants */
+#define CT_KILL_THRESHOLD_LEGACY   110  /* in Celsius */
+
+/* Default noise level to report when noise measurement is not available.
+ *   This may be because we're:
+ *   1)  Not associated (4965, no beacon stats being sent to driver)
+ *   2)  Scanning (noise measurement does not apply to associated channel)
+ *   3)  Receiving CCK (3945 delivers noise info only for OFDM frames)
+ * Use default noise value of -127 ... this is below the range of measurable
+ *   Rx dBm for either 3945 or 4965, so it can indicate "unmeasurable" to user.
+ *   Also, -127 works better than 0 when averaging frames with/without
+ *   noise info (e.g. averaging might be done in app); measured dBm values are
+ *   always negative ... using a negative value as the default keeps all
+ *   averages within an s8's (used in some apps) range of negative values. */
+#define IL_NOISE_MEAS_NOT_AVAILABLE (-127)
+
+/*
+ * RTS threshold here is total size [2347] minus 4 FCS bytes
+ * Per spec:
+ *   a value of 0 means RTS on all data/management packets
+ *   a value > max MSDU size means no RTS
+ * else RTS for data/management frames where MPDU is larger
+ *   than RTS value.
+ */
+#define DEFAULT_RTS_THRESHOLD     2347U
+#define MIN_RTS_THRESHOLD         0U
+#define MAX_RTS_THRESHOLD         2347U
+#define MAX_MSDU_SIZE             2304U
+#define MAX_MPDU_SIZE             2346U
+#define DEFAULT_BEACON_INTERVAL   100U
+#define DEFAULT_SHORT_RETRY_LIMIT 7U
+#define DEFAULT_LONG_RETRY_LIMIT  4U
+
+struct il_rx_buf {
+        dma_addr_t page_dma;
+        struct page *page;
+        struct list_head list;
+};
+
+#define rxb_addr(r) page_address(r->page)
+
+/* defined below */
+struct il_device_cmd;
+
+struct il_cmd_meta {
+        /* only for SYNC commands, iff the reply skb is wanted */
+        struct il_host_cmd *source;
+        /*
+         * only for ASYNC commands
+         * (which is somewhat stupid -- look at common.c for instance
+         * which duplicates a bunch of code because the callback isn't
+         * invoked for SYNC commands, if it were and its result passed
+         * through it would be simpler...)
+         */
+        void (*callback) (struct il_priv *il, struct il_device_cmd *cmd,
+                          struct il_rx_pkt *pkt);
+
+        /* The CMD_SIZE_HUGE flag bit indicates that the command
+         * structure is stored at the end of the shared queue memory. */
+        u32 flags;
+
+         DEFINE_DMA_UNMAP_ADDR(mapping);
+         DEFINE_DMA_UNMAP_LEN(len);
+};
+
+/*
+ * Generic queue structure
+ *
+ * Contains common data for Rx and Tx queues
+ */
+struct il_queue {
+        int n_bd;               /* number of BDs in this queue */
+        int write_ptr;          /* 1-st empty entry (idx) host_w */
+        int read_ptr;           /* last used entry (idx) host_r */
+        /* use for monitoring and recovering the stuck queue */
+        dma_addr_t dma_addr;    /* physical addr for BD's */
+        int n_win;              /* safe queue win */
+        u32 id;
+        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 */
+};
+
+/* One for each TFD */
+struct il_tx_info {
+        struct sk_buff *skb;
+        struct il_rxon_context *ctx;
+};
+
+/**
+ * struct il_tx_queue - Tx Queue for DMA
+ * @q: generic Rx/Tx queue descriptor
+ * @bd: base of circular buffer of TFDs
+ * @cmd: array of command/TX buffer pointers
+ * @meta: array of meta data for each command/tx buffer
+ * @dma_addr_cmd: physical address of cmd/tx buffer array
+ * @txb: array of per-TFD driver data
+ * @time_stamp: time (in jiffies) of last read_ptr change
+ * @need_update: indicates need to update read/write idx
+ * @sched_retry: indicates queue is high-throughput aggregation (HT AGG) enabled
+ *
+ * A Tx queue consists of circular buffer of BDs (a.k.a. TFDs, transmit frame
+ * descriptors) and required locking structures.
+ */
+#define TFD_TX_CMD_SLOTS 256
+#define TFD_CMD_SLOTS 32
+
+struct il_tx_queue {
+        struct il_queue q;
+        void *tfds;
+        struct il_device_cmd **cmd;
+        struct il_cmd_meta *meta;
+        struct il_tx_info *txb;
+        unsigned long time_stamp;
+        u8 need_update;
+        u8 sched_retry;
+        u8 active;
+        u8 swq_id;
+};
+
+/*
+ * EEPROM access time values:
+ *
+ * Driver initiates EEPROM read by writing byte address << 1 to CSR_EEPROM_REG.
+ * 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 IL_EEPROM_ACCESS_TIMEOUT        5000    /* uSec */
+
+#define IL_EEPROM_SEM_TIMEOUT           10      /* microseconds */
+#define IL_EEPROM_SEM_RETRY_LIMIT       1000    /* number of attempts (not time) */
+
+/*
+ * Regulatory channel usage flags in EEPROM struct il4965_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 "HT40" 40 MHz channels.
+ *        It only indicates that 20 MHz channel use is supported; HT40 channel
+ *        usage is indicated by a separate set of regulatory flags for each
+ *        HT40 channel pair.
+ *
+ * NOTE:  Using a channel inappropriately will result in a uCode error!
+ */
+#define IL_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 */
+        /* Bit 6 Reserved (was Narrow Channel) */
+        EEPROM_CHANNEL_DFS = (1 << 7),  /* dynamic freq selection candidate */
+};
+
+/* SKU Capabilities */
+/* 3945 only */
+#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 HT40 (40 MHz) vs. normal (20 MHz) channels. */
+struct il_eeprom_channel {
+        u8 flags;               /* EEPROM_CHANNEL_* flags copied from EEPROM */
+        s8 max_power_avg;       /* max power (dBm) on this chnl, limit 31 */
+} __packed;
+
+/* 3945 Specific */
+#define EEPROM_3945_EEPROM_VERSION      (0x2f)
+
+/* 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 Specific */
+/* 4965 driver does not work with txpower calibration version < 5 */
+#define EEPROM_4965_TX_POWER_VERSION    (5)
+#define EEPROM_4965_EEPROM_VERSION      (0x2f)
+#define EEPROM_4965_CALIB_VERSION_OFFSET       (2*0xB6) /* 2 bytes */
+#define EEPROM_4965_CALIB_TXPOWER_OFFSET       (2*0xE8) /* 48  bytes */
+#define EEPROM_4965_BOARD_REVISION             (2*0x4F) /* 2 bytes */
+#define EEPROM_4965_BOARD_PBA                  (2*0x56+1)       /* 9 bytes */
+
+/* 2.4 GHz */
+extern const u8 il_eeprom_band_1[14];
+
+/*
+ * 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 idx used to achieve the target measurement power.
+ *     This refers to the "well-known" gain tables (see 4965.h).
+ *
+ * 3)  Actual measured output power, in half-dBm ("34" = 17 dBm).
+ *
+ * 4)  RF power amplifier detector level measurement (not used).
+ */
+struct il_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) */
+} __packed;
+
+/*
+ * 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 il_eeprom_calib_ch_info {
+        u8 ch_num;
+        struct il_eeprom_calib_measure
+            measurements[EEPROM_TX_POWER_TX_CHAINS]
+            [EEPROM_TX_POWER_MEASUREMENTS];
+} __packed;
+
+/*
+ * 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 il_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 il_eeprom_calib_ch_info ch1;
+        struct il_eeprom_calib_ch_info ch2;
+} __packed;
+
+/*
+ * 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 il_eeprom_calib_subband_info contains range of channels
+ *     (0 if unused) for each set of data.
+ */
+struct il_eeprom_calib_info {
+        u8 saturation_power24;  /* half-dBm (e.g. "34" = 17 dBm) */
+        u8 saturation_power52;  /* half-dBm */
+        __le16 voltage;         /* signed */
+        struct il_eeprom_calib_subband_info band_info[EEPROM_TX_POWER_BANDS];
+} __packed;
+
+/* General */
+#define EEPROM_DEVICE_ID                    (2*0x08)    /* 2 bytes */
+#define EEPROM_MAC_ADDRESS                  (2*0x15)    /* 6  bytes */
+#define EEPROM_BOARD_REVISION               (2*0x35)    /* 2  bytes */
+#define EEPROM_BOARD_PBA_NUMBER             (2*0x3B+1)  /* 9  bytes */
+#define EEPROM_VERSION                      (2*0x44)    /* 2  bytes */
+#define EEPROM_SKU_CAP                      (2*0x45)    /* 2  bytes */
+#define EEPROM_OEM_MODE                     (2*0x46)    /* 2  bytes */
+#define EEPROM_WOWLAN_MODE                  (2*0x47)    /* 2  bytes */
+#define EEPROM_RADIO_CONFIG                 (2*0x48)    /* 2  bytes */
+#define EEPROM_NUM_MAC_ADDRESS              (2*0x4C)    /* 2  bytes */
+
+/* The following masks are to be applied on EEPROM_RADIO_CONFIG */
+#define EEPROM_RF_CFG_TYPE_MSK(x)   (x & 0x3)   /* bits 0-1   */
+#define EEPROM_RF_CFG_STEP_MSK(x)   ((x >> 2)  & 0x3)   /* bits 2-3   */
+#define EEPROM_RF_CFG_DASH_MSK(x)   ((x >> 4)  & 0x3)   /* bits 4-5   */
+#define EEPROM_RF_CFG_PNUM_MSK(x)   ((x >> 6)  & 0x3)   /* bits 6-7   */
+#define EEPROM_RF_CFG_TX_ANT_MSK(x) ((x >> 8)  & 0xF)   /* bits 8-11  */
+#define EEPROM_RF_CFG_RX_ANT_MSK(x) ((x >> 12) & 0xF)   /* bits 12-15 */
+
+#define EEPROM_3945_RF_CFG_TYPE_MAX  0x0
+#define EEPROM_4965_RF_CFG_TYPE_MAX  0x1
+
+/*
+ * Per-channel regulatory data.
+ *
+ * Each channel that *might* be supported by iwl 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.  HT40 (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_SKU_ID            (2*0x60)    /* 4  bytes */
+#define EEPROM_REGULATORY_BAND_1            (2*0x62)    /* 2  bytes */
+#define EEPROM_REGULATORY_BAND_1_CHANNELS   (2*0x63)    /* 28 bytes */
+
+/*
+ * 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 */
+#define EEPROM_REGULATORY_BAND_2_CHANNELS   (2*0x72)    /* 26 bytes */
+
+/*
+ * 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 */
+#define EEPROM_REGULATORY_BAND_3_CHANNELS   (2*0x80)    /* 24 bytes */
+
+/*
+ * 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 */
+#define EEPROM_REGULATORY_BAND_4_CHANNELS   (2*0x8D)    /* 22 bytes */
+
+/*
+ * 5.7 GHz channels 145, 149, 153, 157, 161, 165
+ * (5725-5825MHz)
+ */
+#define EEPROM_REGULATORY_BAND_5            (2*0x98)    /* 2  bytes */
+#define EEPROM_REGULATORY_BAND_5_CHANNELS   (2*0x99)    /* 12 bytes */
+
+/*
+ * 2.4 GHz HT40 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 HT40 channel is centered 4 channels (20 MHz) away
+ * from the lower half; e.g. the upper half of HT40 channel 1 is channel 5,
+ * and the overall HT40 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 HT40 channel.
+ *
+ * NOTE:  4965 does not support HT40 channels on 2.4 GHz.
+ */
+#define EEPROM_4965_REGULATORY_BAND_24_HT40_CHANNELS (2*0xA0)   /* 14 bytes */
+
+/*
+ * 5.2 GHz HT40 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_4965_REGULATORY_BAND_52_HT40_CHANNELS (2*0xA8)   /* 22 bytes */
+
+#define EEPROM_REGULATORY_BAND_NO_HT40                  (0)
+
+struct il_eeprom_ops {
+        const u32 regulatory_bands[7];
+        int (*acquire_semaphore) (struct il_priv *il);
+        void (*release_semaphore) (struct il_priv *il);
+};
+
+int il_eeprom_init(struct il_priv *il);
+void il_eeprom_free(struct il_priv *il);
+const u8 *il_eeprom_query_addr(const struct il_priv *il, size_t offset);
+u16 il_eeprom_query16(const struct il_priv *il, size_t offset);
+int il_init_channel_map(struct il_priv *il);
+void il_free_channel_map(struct il_priv *il);
+const struct il_channel_info *il_get_channel_info(const struct il_priv *il,
+                                                  enum ieee80211_band band,
+                                                  u16 channel);
+
+#define IL_NUM_SCAN_RATES         (2)
+
+struct il4965_channel_tgd_info {
+        u8 type;
+        s8 max_power;
+};
+
+struct il4965_channel_tgh_info {
+        s64 last_radar_time;
+};
+
+#define IL4965_MAX_RATE (33)
+
+struct il3945_clip_group {
+        /* maximum power level to prevent clipping for each rate, derived by
+         *   us from this band's saturation power in EEPROM */
+        const s8 clip_powers[IL_MAX_RATES];
+};
+
+/* current Tx power values to use, one for each rate for each channel.
+ * requested power is limited by:
+ * -- regulatory EEPROM limits for this channel
+ * -- hardware capabilities (clip-powers)
+ * -- spectrum management
+ * -- user preference (e.g. iwconfig)
+ * when requested power is set, base power idx must also be set. */
+struct il3945_channel_power_info {
+        struct il3945_tx_power tpc;     /* actual radio and DSP gain settings */
+        s8 power_table_idx;     /* actual (compenst'd) idx into gain table */
+        s8 base_power_idx;      /* gain idx for power at factory temp. */
+        s8 requested_power;     /* power (dBm) requested for this chnl/rate */
+};
+
+/* current scan Tx power values to use, one for each scan rate for each
+ * channel. */
+struct il3945_scan_power_info {
+        struct il3945_tx_power tpc;     /* actual radio and DSP gain settings */
+        s8 power_table_idx;     /* actual (compenst'd) idx into gain table */
+        s8 requested_power;     /* scan pwr (dBm) requested for chnl/rate */
+};
+
+/*
+ * One for each channel, holds all channel setup data
+ * Some of the fields (e.g. eeprom and flags/max_power_avg) are redundant
+ *     with one another!
+ */
+struct il_channel_info {
+        struct il4965_channel_tgd_info tgd;
+        struct il4965_channel_tgh_info tgh;
+        struct il_eeprom_channel eeprom;        /* EEPROM regulatory limit */
+        struct il_eeprom_channel ht40_eeprom;   /* EEPROM regulatory limit for
+                                                 * HT40 channel */
+
+        u8 channel;             /* channel number */
+        u8 flags;               /* flags copied from EEPROM */
+        s8 max_power_avg;       /* (dBm) regul. eeprom, normal Tx, any rate */
+        s8 curr_txpow;          /* (dBm) regulatory/spectrum/user (not h/w) limit */
+        s8 min_power;           /* always 0 */
+        s8 scan_power;          /* (dBm) regul. eeprom, direct scans, any rate */
+
+        u8 group_idx;           /* 0-4, maps channel to group1/2/3/4/5 */
+        u8 band_idx;            /* 0-4, maps channel to band1/2/3/4/5 */
+        enum ieee80211_band band;
+
+        /* HT40 channel info */
+        s8 ht40_max_power_avg;  /* (dBm) regul. eeprom, normal Tx, any rate */
+        u8 ht40_flags;          /* flags copied from EEPROM */
+        u8 ht40_extension_channel;      /* HT_IE_EXT_CHANNEL_* */
+
+        /* Radio/DSP gain settings for each "normal" data Tx rate.
+         * These include, in addition to RF and DSP gain, a few fields for
+         *   remembering/modifying gain settings (idxes). */
+        struct il3945_channel_power_info power_info[IL4965_MAX_RATE];
+
+        /* Radio/DSP gain settings for each scan rate, for directed scans. */
+        struct il3945_scan_power_info scan_pwr_info[IL_NUM_SCAN_RATES];
+};
+
+#define IL_TX_FIFO_BK           0       /* shared */
+#define IL_TX_FIFO_BE           1
+#define IL_TX_FIFO_VI           2       /* shared */
+#define IL_TX_FIFO_VO           3
+#define IL_TX_FIFO_UNUSED       -1
+
+/* Minimum number of queues. MAX_NUM is defined in hw specific files.
+ * Set the minimum to accommodate the 4 standard TX queues, 1 command
+ * queue, 2 (unused) HCCA queues, and 4 HT queues (one for each AC) */
+#define IL_MIN_NUM_QUEUES       10
+
+#define IL_DEFAULT_CMD_QUEUE_NUM        4
+
+#define IEEE80211_DATA_LEN              2304
+#define IEEE80211_4ADDR_LEN             30
+#define IEEE80211_HLEN                  (IEEE80211_4ADDR_LEN)
+#define IEEE80211_FRAME_LEN             (IEEE80211_DATA_LEN + IEEE80211_HLEN)
+
+struct il_frame {
+        union {
+                struct ieee80211_hdr frame;
+                struct il_tx_beacon_cmd beacon;
+                u8 raw[IEEE80211_FRAME_LEN];
+                u8 cmd[360];
+        } u;
+        struct list_head list;
+};
+
+#define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)
+#define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)
+#define MAX_SN ((IEEE80211_SCTL_SEQ) >> 4)
+
+enum {
+        CMD_SYNC = 0,
+        CMD_SIZE_NORMAL = 0,
+        CMD_NO_SKB = 0,
+        CMD_SIZE_HUGE = (1 << 0),
+        CMD_ASYNC = (1 << 1),
+        CMD_WANT_SKB = (1 << 2),
+        CMD_MAPPED = (1 << 3),
+};
+
+#define DEF_CMD_PAYLOAD_SIZE 320
+
+/**
+ * struct il_device_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 il_device_cmd {
+        struct il_cmd_header hdr;       /* uCode API */
+        union {
+                u32 flags;
+                u8 val8;
+                u16 val16;
+                u32 val32;
+                struct il_tx_cmd tx;
+                u8 payload[DEF_CMD_PAYLOAD_SIZE];
+        } __packed cmd;
+} __packed;
+
+#define TFD_MAX_PAYLOAD_SIZE (sizeof(struct il_device_cmd))
+
+struct il_host_cmd {
+        const void *data;
+        unsigned long reply_page;
+        void (*callback) (struct il_priv *il, struct il_device_cmd *cmd,
+                          struct il_rx_pkt *pkt);
+        u32 flags;
+        u16 len;
+        u8 id;
+};
+
+#define SUP_RATE_11A_MAX_NUM_CHANNELS  8
+#define SUP_RATE_11B_MAX_NUM_CHANNELS  4
+#define SUP_RATE_11G_MAX_NUM_CHANNELS  12
+
+/**
+ * struct il_rx_queue - Rx queue
+ * @bd: driver's pointer to buffer of receive buffer descriptors (rbd)
+ * @bd_dma: bus address of buffer of receive buffer descriptors (rbd)
+ * @read: Shared idx to newest available Rx buffer
+ * @write: Shared idx to oldest written Rx packet
+ * @free_count: Number of pre-allocated buffers in rx_free
+ * @rx_free: list of free SKBs for use
+ * @rx_used: List of Rx buffers with no SKB
+ * @need_update: flag to indicate we need to update read/write idx
+ * @rb_stts: driver's pointer to receive buffer status
+ * @rb_stts_dma: bus address of receive buffer status
+ *
+ * NOTE:  rx_free and rx_used are used as a FIFO for il_rx_bufs
+ */
+struct il_rx_queue {
+        __le32 *bd;
+        dma_addr_t bd_dma;
+        struct il_rx_buf pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];
+        struct il_rx_buf *queue[RX_QUEUE_SIZE];
+        u32 read;
+        u32 write;
+        u32 free_count;
+        u32 write_actual;
+        struct list_head rx_free;
+        struct list_head rx_used;
+        int need_update;
+        struct il_rb_status *rb_stts;
+        dma_addr_t rb_stts_dma;
+        spinlock_t lock;
+};
+
+#define IL_SUPPORTED_RATES_IE_LEN         8
+
+#define MAX_TID_COUNT        9
+
+#define IL_INVALID_RATE     0xFF
+#define IL_INVALID_VALUE    -1
+
+/**
+ * struct il_ht_agg -- aggregation status while waiting for block-ack
+ * @txq_id: Tx queue used for Tx attempt
+ * @frame_count: # frames attempted by Tx command
+ * @wait_for_ba: Expect block-ack before next Tx reply
+ * @start_idx: Index of 1st Transmit Frame Descriptor (TFD) in Tx win
+ * @bitmap0: Low order bitmap, one bit for each frame pending ACK in Tx win
+ * @bitmap1: High order, one bit for each frame pending ACK in Tx win
+ * @rate_n_flags: Rate at which Tx was attempted
+ *
+ * If C_TX indicates that aggregation was attempted, driver must wait
+ * for block ack (N_COMPRESSED_BA).  This struct stores tx reply info
+ * until block ack arrives.
+ */
+struct il_ht_agg {
+        u16 txq_id;
+        u16 frame_count;
+        u16 wait_for_ba;
+        u16 start_idx;
+        u64 bitmap;
+        u32 rate_n_flags;
+#define IL_AGG_OFF 0
+#define IL_AGG_ON 1
+#define IL_EMPTYING_HW_QUEUE_ADDBA 2
+#define IL_EMPTYING_HW_QUEUE_DELBA 3
+        u8 state;
+};
+
+struct il_tid_data {
+        u16 seq_number;         /* 4965 only */
+        u16 tfds_in_queue;
+        struct il_ht_agg agg;
+};
+
+struct il_hw_key {
+        u32 cipher;
+        int keylen;
+        u8 keyidx;
+        u8 key[32];
+};
+
+union il_ht_rate_supp {
+        u16 rates;
+        struct {
+                u8 siso_rate;
+                u8 mimo_rate;
+        };
+};
+
+#define CFG_HT_RX_AMPDU_FACTOR_8K   (0x0)
+#define CFG_HT_RX_AMPDU_FACTOR_16K  (0x1)
+#define CFG_HT_RX_AMPDU_FACTOR_32K  (0x2)
+#define CFG_HT_RX_AMPDU_FACTOR_64K  (0x3)
+#define CFG_HT_RX_AMPDU_FACTOR_DEF  CFG_HT_RX_AMPDU_FACTOR_64K
+#define CFG_HT_RX_AMPDU_FACTOR_MAX  CFG_HT_RX_AMPDU_FACTOR_64K
+#define CFG_HT_RX_AMPDU_FACTOR_MIN  CFG_HT_RX_AMPDU_FACTOR_8K
+
+/*
+ * Maximal MPDU density for TX aggregation
+ * 4 - 2us density
+ * 5 - 4us density
+ * 6 - 8us density
+ * 7 - 16us density
+ */
+#define CFG_HT_MPDU_DENSITY_2USEC   (0x4)
+#define CFG_HT_MPDU_DENSITY_4USEC   (0x5)
+#define CFG_HT_MPDU_DENSITY_8USEC   (0x6)
+#define CFG_HT_MPDU_DENSITY_16USEC  (0x7)
+#define CFG_HT_MPDU_DENSITY_DEF CFG_HT_MPDU_DENSITY_4USEC
+#define CFG_HT_MPDU_DENSITY_MAX CFG_HT_MPDU_DENSITY_16USEC
+#define CFG_HT_MPDU_DENSITY_MIN     (0x1)
+
+struct il_ht_config {
+        bool single_chain_sufficient;
+        enum ieee80211_smps_mode smps;  /* current smps mode */
+};
+
+/* QoS structures */
+struct il_qos_info {
+        int qos_active;
+        struct il_qosparam_cmd def_qos_parm;
+};
+
+/*
+ * Structure should be accessed with sta_lock held. When station addition
+ * is in progress (IL_STA_UCODE_INPROGRESS) it is possible to access only
+ * the commands (il_addsta_cmd and il_link_quality_cmd) without
+ * sta_lock held.
+ */
+struct il_station_entry {
+        struct il_addsta_cmd sta;
+        struct il_tid_data tid[MAX_TID_COUNT];
+        u8 used, ctxid;
+        struct il_hw_key keyinfo;
+        struct il_link_quality_cmd *lq;
+};
+
+struct il_station_priv_common {
+        struct il_rxon_context *ctx;
+        u8 sta_id;
+};
+
+/**
+ * struct il_vif_priv - driver's ilate per-interface information
+ *
+ * When mac80211 allocates a virtual interface, it can allocate
+ * space for us to put data into.
+ */
+struct il_vif_priv {
+        struct il_rxon_context *ctx;
+        u8 ibss_bssid_sta_id;
+};
+
+/* one for each uCode image (inst/data, boot/init/runtime) */
+struct fw_desc {
+        void *v_addr;           /* access by driver */
+        dma_addr_t p_addr;      /* access by card's busmaster DMA */
+        u32 len;                /* bytes */
+};
+
+/* uCode file layout */
+struct il_ucode_header {
+        __le32 ver;             /* major/minor/API/serial */
+        struct {
+                __le32 inst_size;       /* bytes of runtime code */
+                __le32 data_size;       /* bytes of runtime data */
+                __le32 init_size;       /* bytes of init code */
+                __le32 init_data_size;  /* bytes of init data */
+                __le32 boot_size;       /* bytes of bootstrap code */
+                u8 data[0];     /* in same order as sizes */
+        } v1;
+};
+
+struct il4965_ibss_seq {
+        u8 mac[ETH_ALEN];
+        u16 seq_num;
+        u16 frag_num;
+        unsigned long packet_time;
+        struct list_head list;
+};
+
+struct il_sensitivity_ranges {
+        u16 min_nrg_cck;
+        u16 max_nrg_cck;
+
+        u16 nrg_th_cck;
+        u16 nrg_th_ofdm;
+
+        u16 auto_corr_min_ofdm;
+        u16 auto_corr_min_ofdm_mrc;
+        u16 auto_corr_min_ofdm_x1;
+        u16 auto_corr_min_ofdm_mrc_x1;
+
+        u16 auto_corr_max_ofdm;
+        u16 auto_corr_max_ofdm_mrc;
+        u16 auto_corr_max_ofdm_x1;
+        u16 auto_corr_max_ofdm_mrc_x1;
+
+        u16 auto_corr_max_cck;
+        u16 auto_corr_max_cck_mrc;
+        u16 auto_corr_min_cck;
+        u16 auto_corr_min_cck_mrc;
+
+        u16 barker_corr_th_min;
+        u16 barker_corr_th_min_mrc;
+        u16 nrg_th_cca;
+};
+
+#define KELVIN_TO_CELSIUS(x) ((x)-273)
+#define CELSIUS_TO_KELVIN(x) ((x)+273)
+
+/**
+ * struct il_hw_params
+ * @max_txq_num: Max # Tx queues supported
+ * @dma_chnl_num: Number of Tx DMA/FIFO channels
+ * @scd_bc_tbls_size: size of scheduler byte count tables
+ * @tfd_size: TFD size
+ * @tx/rx_chains_num: Number of TX/RX chains
+ * @valid_tx/rx_ant: usable antennas
+ * @max_rxq_size: Max # Rx frames in Rx queue (must be power-of-2)
+ * @max_rxq_log: Log-base-2 of max_rxq_size
+ * @rx_page_order: Rx buffer page order
+ * @rx_wrt_ptr_reg: FH{39}_RSCSR_CHNL0_WPTR
+ * @max_stations:
+ * @ht40_channel: is 40MHz width possible in band 2.4
+ * BIT(IEEE80211_BAND_5GHZ) BIT(IEEE80211_BAND_5GHZ)
+ * @sw_crypto: 0 for hw, 1 for sw
+ * @max_xxx_size: for ucode uses
+ * @ct_kill_threshold: temperature threshold
+ * @beacon_time_tsf_bits: number of valid tsf bits for beacon time
+ * @struct il_sensitivity_ranges: range of sensitivity values
+ */
+struct il_hw_params {
+        u8 max_txq_num;
+        u8 dma_chnl_num;
+        u16 scd_bc_tbls_size;
+        u32 tfd_size;
+        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_page_order;
+        u32 rx_wrt_ptr_reg;
+        u8 max_stations;
+        u8 ht40_channel;
+        u8 max_beacon_itrvl;    /* in 1024 ms */
+        u32 max_inst_size;
+        u32 max_data_size;
+        u32 max_bsm_size;
+        u32 ct_kill_threshold;  /* value in hw-dependent units */
+        u16 beacon_time_tsf_bits;
+        const struct il_sensitivity_ranges *sens;
+};
+
+/******************************************************************************
+ *
+ * Functions implemented in core module which are forward declared here
+ * for use by iwl-[4-5].c
+ *
+ * NOTE:  The implementation of these functions are not hardware specific
+ * which is why they are in the core module files.
+ *
+ * Naming convention --
+ * il_         <-- Is part of iwlwifi
+ * iwlXXXX_     <-- Hardware specific (implemented in iwl-XXXX.c for XXXX)
+ * il4965_bg_      <-- Called from work queue context
+ * il4965_mac_     <-- mac80211 callback
+ *
+ ****************************************************************************/
+extern void il4965_update_chain_flags(struct il_priv *il);
+extern const u8 il_bcast_addr[ETH_ALEN];
+extern int il_queue_space(const struct il_queue *q);
+static inline int
+il_queue_used(const struct il_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
+il_get_cmd_idx(struct il_queue *q, u32 idx, int is_huge)
+{
+        /*
+         * This is for init calibration result and scan command which
+         * required buffer > TFD_MAX_PAYLOAD_SIZE,
+         * the big buffer at end of command array
+         */
+        if (is_huge)
+                return q->n_win;        /* must be power of 2 */
+
+        /* Otherwise, use normal size buffers */
+        return idx & (q->n_win - 1);
+}
+
+struct il_dma_ptr {
+        dma_addr_t dma;
+        void *addr;
+        size_t size;
+};
+
+#define IL_OPERATION_MODE_AUTO     0
+#define IL_OPERATION_MODE_HT_ONLY  1
+#define IL_OPERATION_MODE_MIXED    2
+#define IL_OPERATION_MODE_20MHZ    3
+
+#define IL_TX_CRC_SIZE 4
+#define IL_TX_DELIMITER_SIZE 4
+
+#define TX_POWER_IL_ILLEGAL_VOLTAGE -10000
+
+/* Sensitivity and chain noise calibration */
+#define INITIALIZATION_VALUE            0xFFFF
+#define IL4965_CAL_NUM_BEACONS          20
+#define IL_CAL_NUM_BEACONS              16
+#define MAXIMUM_ALLOWED_PATHLOSS        15
+
+#define CHAIN_NOISE_MAX_DELTA_GAIN_CODE 3
+
+#define MAX_FA_OFDM  50
+#define MIN_FA_OFDM  5
+#define MAX_FA_CCK   50
+#define MIN_FA_CCK   5
+
+#define AUTO_CORR_STEP_OFDM       1
+
+#define AUTO_CORR_STEP_CCK     3
+#define AUTO_CORR_MAX_TH_CCK   160
+
+#define NRG_DIFF               2
+#define NRG_STEP_CCK           2
+#define NRG_MARGIN             8
+#define MAX_NUMBER_CCK_NO_FA 100
+
+#define AUTO_CORR_CCK_MIN_VAL_DEF    (125)
+
+#define CHAIN_A             0
+#define CHAIN_B             1
+#define CHAIN_C             2
+#define CHAIN_NOISE_DELTA_GAIN_INIT_VAL 4
+#define ALL_BAND_FILTER                 0xFF00
+#define IN_BAND_FILTER                  0xFF
+#define MIN_AVERAGE_NOISE_MAX_VALUE     0xFFFFFFFF
+
+#define NRG_NUM_PREV_STAT_L     20
+#define NUM_RX_CHAINS           3
+
+enum il4965_false_alarm_state {
+        IL_FA_TOO_MANY = 0,
+        IL_FA_TOO_FEW = 1,
+        IL_FA_GOOD_RANGE = 2,
+};
+
+enum il4965_chain_noise_state {
+        IL_CHAIN_NOISE_ALIVE = 0,       /* must be 0 */
+        IL_CHAIN_NOISE_ACCUMULATE,
+        IL_CHAIN_NOISE_CALIBRATED,
+        IL_CHAIN_NOISE_DONE,
+};
+
+enum il4965_calib_enabled_state {
+        IL_CALIB_DISABLED = 0,  /* must be 0 */
+        IL_CALIB_ENABLED = 1,
+};
+
+/*
+ * enum il_calib
+ * defines the order in which results of initial calibrations
+ * should be sent to the runtime uCode
+ */
+enum il_calib {
+        IL_CALIB_MAX,
+};
+
+/* Opaque calibration results */
+struct il_calib_result {
+        void *buf;
+        size_t buf_len;
+};
+
+enum ucode_type {
+        UCODE_NONE = 0,
+        UCODE_INIT,
+        UCODE_RT
+};
+
+/* Sensitivity calib data */
+struct il_sensitivity_data {
+        u32 auto_corr_ofdm;
+        u32 auto_corr_ofdm_mrc;
+        u32 auto_corr_ofdm_x1;
+        u32 auto_corr_ofdm_mrc_x1;
+        u32 auto_corr_cck;
+        u32 auto_corr_cck_mrc;
+
+        u32 last_bad_plcp_cnt_ofdm;
+        u32 last_fa_cnt_ofdm;
+        u32 last_bad_plcp_cnt_cck;
+        u32 last_fa_cnt_cck;
+
+        u32 nrg_curr_state;
+        u32 nrg_prev_state;
+        u32 nrg_value[10];
+        u8 nrg_silence_rssi[NRG_NUM_PREV_STAT_L];
+        u32 nrg_silence_ref;
+        u32 nrg_energy_idx;
+        u32 nrg_silence_idx;
+        u32 nrg_th_cck;
+        s32 nrg_auto_corr_silence_diff;
+        u32 num_in_cck_no_fa;
+        u32 nrg_th_ofdm;
+
+        u16 barker_corr_th_min;
+        u16 barker_corr_th_min_mrc;
+        u16 nrg_th_cca;
+};
+
+/* Chain noise (differential Rx gain) calib data */
+struct il_chain_noise_data {
+        u32 active_chains;
+        u32 chain_noise_a;
+        u32 chain_noise_b;
+        u32 chain_noise_c;
+        u32 chain_signal_a;
+        u32 chain_signal_b;
+        u32 chain_signal_c;
+        u16 beacon_count;
+        u8 disconn_array[NUM_RX_CHAINS];
+        u8 delta_gain_code[NUM_RX_CHAINS];
+        u8 radio_write;
+        u8 state;
+};
+
+#define EEPROM_SEM_TIMEOUT 10   /* milliseconds */
+#define EEPROM_SEM_RETRY_LIMIT 1000     /* number of attempts (not time) */
+
+#define IL_TRAFFIC_ENTRIES      (256)
+#define IL_TRAFFIC_ENTRY_SIZE  (64)
+
+enum {
+        MEASUREMENT_READY = (1 << 0),
+        MEASUREMENT_ACTIVE = (1 << 1),
+};
+
+/* interrupt stats */
+struct isr_stats {
+        u32 hw;
+        u32 sw;
+        u32 err_code;
+        u32 sch;
+        u32 alive;
+        u32 rfkill;
+        u32 ctkill;
+        u32 wakeup;
+        u32 rx;
+        u32 handlers[IL_CN_MAX];
+        u32 tx;
+        u32 unhandled;
+};
+
+/* management stats */
+enum il_mgmt_stats {
+        MANAGEMENT_ASSOC_REQ = 0,
+        MANAGEMENT_ASSOC_RESP,
+        MANAGEMENT_REASSOC_REQ,
+        MANAGEMENT_REASSOC_RESP,
+        MANAGEMENT_PROBE_REQ,
+        MANAGEMENT_PROBE_RESP,
+        MANAGEMENT_BEACON,
+        MANAGEMENT_ATIM,
+        MANAGEMENT_DISASSOC,
+        MANAGEMENT_AUTH,
+        MANAGEMENT_DEAUTH,
+        MANAGEMENT_ACTION,
+        MANAGEMENT_MAX,
+};
+/* control stats */
+enum il_ctrl_stats {
+        CONTROL_BACK_REQ = 0,
+        CONTROL_BACK,
+        CONTROL_PSPOLL,
+        CONTROL_RTS,
+        CONTROL_CTS,
+        CONTROL_ACK,
+        CONTROL_CFEND,
+        CONTROL_CFENDACK,
+        CONTROL_MAX,
+};
+
+struct traffic_stats {
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+        u32 mgmt[MANAGEMENT_MAX];
+        u32 ctrl[CONTROL_MAX];
+        u32 data_cnt;
+        u64 data_bytes;
+#endif
+};
+
+/*
+ * host interrupt timeout value
+ * used with setting interrupt coalescing timer
+ * the CSR_INT_COALESCING is an 8 bit register in 32-usec unit
+ *
+ * default interrupt coalescing timer is 64 x 32 = 2048 usecs
+ * default interrupt coalescing calibration timer is 16 x 32 = 512 usecs
+ */
+#define IL_HOST_INT_TIMEOUT_MAX (0xFF)
+#define IL_HOST_INT_TIMEOUT_DEF (0x40)
+#define IL_HOST_INT_TIMEOUT_MIN (0x0)
+#define IL_HOST_INT_CALIB_TIMEOUT_MAX   (0xFF)
+#define IL_HOST_INT_CALIB_TIMEOUT_DEF   (0x10)
+#define IL_HOST_INT_CALIB_TIMEOUT_MIN   (0x0)
+
+#define IL_DELAY_NEXT_FORCE_FW_RELOAD (HZ*5)
+
+/* TX queue watchdog timeouts in mSecs */
+#define IL_DEF_WD_TIMEOUT       (2000)
+#define IL_LONG_WD_TIMEOUT      (10000)
+#define IL_MAX_WD_TIMEOUT       (120000)
+
+struct il_force_reset {
+        int reset_request_count;
+        int reset_success_count;
+        int reset_reject_count;
+        unsigned long reset_duration;
+        unsigned long last_force_reset_jiffies;
+};
+
+/* extend beacon time format bit shifting  */
+/*
+ * for _3945 devices
+ * bits 31:24 - extended
+ * bits 23:0  - interval
+ */
+#define IL3945_EXT_BEACON_TIME_POS      24
+/*
+ * for _4965 devices
+ * bits 31:22 - extended
+ * bits 21:0  - interval
+ */
+#define IL4965_EXT_BEACON_TIME_POS      22
+
+struct il_rxon_context {
+        struct ieee80211_vif *vif;
+
+        const u8 *ac_to_fifo;
+        const u8 *ac_to_queue;
+        u8 mcast_queue;
+
+        /*
+         * We could use the vif to indicate active, but we
+         * also need it to be active during disabling when
+         * we already removed the vif for type setting.
+         */
+        bool always_active, is_active;
+
+        bool ht_need_multiple_chains;
+
+        int ctxid;
+
+        u32 interface_modes, exclusive_interface_modes;
+        u8 unused_devtype, ap_devtype, ibss_devtype, station_devtype;
+
+        /*
+         * We declare this const so it can only be
+         * changed via explicit cast within the
+         * routines that actually update the physical
+         * hardware.
+         */
+        const struct il_rxon_cmd active;
+        struct il_rxon_cmd staging;
+
+        struct il_rxon_time_cmd timing;
+
+        struct il_qos_info qos_data;
+
+        u8 bcast_sta_id, ap_sta_id;
+
+        u8 rxon_cmd, rxon_assoc_cmd, rxon_timing_cmd;
+        u8 qos_cmd;
+        u8 wep_key_cmd;
+
+        struct il_wep_key wep_keys[WEP_KEYS_MAX];
+        u8 key_mapping_keys;
+
+        __le32 station_flags;
+
+        struct {
+                bool non_gf_sta_present;
+                u8 protection;
+                bool enabled, is_40mhz;
+                u8 extension_chan_offset;
+        } ht;
+};
+
+struct il_power_mgr {
+        struct il_powertable_cmd sleep_cmd;
+        struct il_powertable_cmd sleep_cmd_next;
+        int debug_sleep_level_override;
+        bool pci_pm;
+};
+
+struct il_priv {
+
+        /* ieee device used by generic ieee processing code */
+        struct ieee80211_hw *hw;
+        struct ieee80211_channel *ieee_channels;
+        struct ieee80211_rate *ieee_rates;
+        struct il_cfg *cfg;
+
+        /* temporary frame storage list */
+        struct list_head free_frames;
+        int frames_count;
+
+        enum ieee80211_band band;
+        int alloc_rxb_page;
+
+        void (*handlers[IL_CN_MAX]) (struct il_priv *il,
+                                     struct il_rx_buf *rxb);
+
+        struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
+
+        /* spectrum measurement report caching */
+        struct il_spectrum_notification measure_report;
+        u8 measurement_status;
+
+        /* ucode beacon time */
+        u32 ucode_beacon_time;
+        int missed_beacon_threshold;
+
+        /* track IBSS manager (last beacon) status */
+        u32 ibss_manager;
+
+        /* force reset */
+        struct il_force_reset force_reset;
+
+        /* we allocate array of il_channel_info for NIC's valid channels.
+         *    Access via channel # using indirect idx array */
+        struct il_channel_info *channel_info;   /* channel info array */
+        u8 channel_count;       /* # of channels */
+
+        /* thermal calibration */
+        s32 temperature;        /* degrees Kelvin */
+        s32 last_temperature;
+
+        /* init calibration results */
+        struct il_calib_result calib_results[IL_CALIB_MAX];
+
+        /* Scan related variables */
+        unsigned long scan_start;
+        unsigned long scan_start_tsf;
+        void *scan_cmd;
+        enum ieee80211_band scan_band;
+        struct cfg80211_scan_request *scan_request;
+        struct ieee80211_vif *scan_vif;
+        u8 scan_tx_ant[IEEE80211_NUM_BANDS];
+        u8 mgmt_tx_ant;
+
+        /* spinlock */
+        spinlock_t lock;        /* protect general shared data */
+        spinlock_t hcmd_lock;   /* protect hcmd */
+        spinlock_t reg_lock;    /* protect hw register access */
+        struct mutex mutex;
+
+        /* basic pci-network driver stuff */
+        struct pci_dev *pci_dev;
+
+        /* pci hardware address support */
+        void __iomem *hw_base;
+        u32 hw_rev;
+        u32 hw_wa_rev;
+        u8 rev_id;
+
+        /* command queue number */
+        u8 cmd_queue;
+
+        /* max number of station keys */
+        u8 sta_key_max_num;
+
+        /* EEPROM MAC addresses */
+        struct mac_address addresses[1];
+
+        /* uCode images, save to reload in case of failure */
+        int fw_idx;             /* firmware we're trying to load */
+        u32 ucode_ver;          /* version of ucode, copy of
+                                   il_ucode.ver */
+        struct fw_desc ucode_code;      /* runtime inst */
+        struct fw_desc ucode_data;      /* runtime data original */
+        struct fw_desc ucode_data_backup;       /* runtime data save/restore */
+        struct fw_desc ucode_init;      /* initialization inst */
+        struct fw_desc ucode_init_data; /* initialization data */
+        struct fw_desc ucode_boot;      /* bootstrap inst */
+        enum ucode_type ucode_type;
+        u8 ucode_write_complete;        /* the image write is complete */
+        char firmware_name[25];
+
+        struct il_rxon_context ctx;
+
+        __le16 switch_channel;
+
+        /* 1st responses from initialize and runtime uCode images.
+         * _4965's initialize alive response contains some calibration data. */
+        struct il_init_alive_resp card_alive_init;
+        struct il_alive_resp card_alive;
+
+        u16 active_rate;
+
+        u8 start_calib;
+        struct il_sensitivity_data sensitivity_data;
+        struct il_chain_noise_data chain_noise_data;
+        __le16 sensitivity_tbl[HD_TBL_SIZE];
+
+        struct il_ht_config current_ht_config;
+
+        /* Rate scaling data */
+        u8 retry_rate;
+
+        wait_queue_head_t wait_command_queue;
+
+        int activity_timer_active;
+
+        /* Rx and Tx DMA processing queues */
+        struct il_rx_queue rxq;
+        struct il_tx_queue *txq;
+        unsigned long txq_ctx_active_msk;
+        struct il_dma_ptr kw;   /* keep warm address */
+        struct il_dma_ptr scd_bc_tbls;
+
+        u32 scd_base_addr;      /* scheduler sram base address */
+
+        unsigned long status;
+
+        /* counts mgmt, ctl, and data packets */
+        struct traffic_stats tx_stats;
+        struct traffic_stats rx_stats;
+
+        /* counts interrupts */
+        struct isr_stats isr_stats;
+
+        struct il_power_mgr power_data;
+
+        /* context information */
+        u8 bssid[ETH_ALEN];     /* used only on 3945 but filled by core */
+
+        /* station table variables */
+
+        /* Note: if lock and sta_lock are needed, lock must be acquired first */
+        spinlock_t sta_lock;
+        int num_stations;
+        struct il_station_entry stations[IL_STATION_COUNT];
+        unsigned long ucode_key_table;
+
+        /* queue refcounts */
+#define IL_MAX_HW_QUEUES        32
+        unsigned long queue_stopped[BITS_TO_LONGS(IL_MAX_HW_QUEUES)];
+        /* for each AC */
+        atomic_t queue_stop_count[4];
+
+        /* Indication if ieee80211_ops->open has been called */
+        u8 is_open;
+
+        u8 mac80211_registered;
+
+        /* eeprom -- this is in the card's little endian byte order */
+        u8 *eeprom;
+        struct il_eeprom_calib_info *calib_info;
+
+        enum nl80211_iftype iw_mode;
+
+        /* Last Rx'd beacon timestamp */
+        u64 timestamp;
+
+        union {
+#if defined(CONFIG_IWL3945) || defined(CONFIG_IWL3945_MODULE)
+                struct {
+                        void *shared_virt;
+                        dma_addr_t shared_phys;
+
+                        struct delayed_work thermal_periodic;
+                        struct delayed_work rfkill_poll;
+
+                        struct il3945_notif_stats stats;
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+                        struct il3945_notif_stats accum_stats;
+                        struct il3945_notif_stats delta_stats;
+                        struct il3945_notif_stats max_delta;
+#endif
+
+                        u32 sta_supp_rates;
+                        int last_rx_rssi;       /* From Rx packet stats */
+
+                        /* Rx'd packet timing information */
+                        u32 last_beacon_time;
+                        u64 last_tsf;
+
+                        /*
+                         * each calibration channel group in the
+                         * EEPROM has a derived clip setting for
+                         * each rate.
+                         */
+                        const struct il3945_clip_group clip_groups[5];
+
+                } _3945;
+#endif
+#if defined(CONFIG_IWL4965) || defined(CONFIG_IWL4965_MODULE)
+                struct {
+                        struct il_rx_phy_res last_phy_res;
+                        bool last_phy_res_valid;
+
+                        struct completion firmware_loading_complete;
+
+                        /*
+                         * chain noise reset and gain commands are the
+                         * two extra calibration commands follows the standard
+                         * phy calibration commands
+                         */
+                        u8 phy_calib_chain_noise_reset_cmd;
+                        u8 phy_calib_chain_noise_gain_cmd;
+
+                        struct il_notif_stats stats;
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+                        struct il_notif_stats accum_stats;
+                        struct il_notif_stats delta_stats;
+                        struct il_notif_stats max_delta;
+#endif
+
+                } _4965;
+#endif
+        };
+
+        struct il_hw_params hw_params;
+
+        u32 inta_mask;
+
+        struct workqueue_struct *workqueue;
+
+        struct work_struct restart;
+        struct work_struct scan_completed;
+        struct work_struct rx_replenish;
+        struct work_struct abort_scan;
+
+        struct il_rxon_context *beacon_ctx;
+        struct sk_buff *beacon_skb;
+
+        struct work_struct tx_flush;
+
+        struct tasklet_struct irq_tasklet;
+
+        struct delayed_work init_alive_start;
+        struct delayed_work alive_start;
+        struct delayed_work scan_check;
+
+        /* TX Power */
+        s8 tx_power_user_lmt;
+        s8 tx_power_device_lmt;
+        s8 tx_power_next;
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+        /* debugging info */
+        u32 debug_level;        /* per device debugging will override global
+                                   il_debug_level if set */
+#endif                          /* CONFIG_IWLEGACY_DEBUG */
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+        /* debugfs */
+        u16 tx_traffic_idx;
+        u16 rx_traffic_idx;
+        u8 *tx_traffic;
+        u8 *rx_traffic;
+        struct dentry *debugfs_dir;
+        u32 dbgfs_sram_offset, dbgfs_sram_len;
+        bool disable_ht40;
+#endif                          /* CONFIG_IWLEGACY_DEBUGFS */
+
+        struct work_struct txpower_work;
+        u32 disable_sens_cal;
+        u32 disable_chain_noise_cal;
+        u32 disable_tx_power_cal;
+        struct work_struct run_time_calib_work;
+        struct timer_list stats_periodic;
+        struct timer_list watchdog;
+        bool hw_ready;
+
+        struct led_classdev led;
+        unsigned long blink_on, blink_off;
+        bool led_registered;
+};                              /*il_priv */
+
+static inline void
+il_txq_ctx_activate(struct il_priv *il, int txq_id)
+{
+        set_bit(txq_id, &il->txq_ctx_active_msk);
+}
+
+static inline void
+il_txq_ctx_deactivate(struct il_priv *il, int txq_id)
+{
+        clear_bit(txq_id, &il->txq_ctx_active_msk);
+}
+
+static inline struct ieee80211_hdr *
+il_tx_queue_get_hdr(struct il_priv *il, int txq_id, int idx)
+{
+        if (il->txq[txq_id].txb[idx].skb)
+                return (struct ieee80211_hdr *)il->txq[txq_id].txb[idx].skb->
+                    data;
+        return NULL;
+}
+
+static inline struct il_rxon_context *
+il_rxon_ctx_from_vif(struct ieee80211_vif *vif)
+{
+        struct il_vif_priv *vif_priv = (void *)vif->drv_priv;
+
+        return vif_priv->ctx;
+}
+
+#define for_each_context(il, _ctx) \
+        for (_ctx = &il->ctx; _ctx == &il->ctx; _ctx++)
+
+static inline int
+il_is_associated(struct il_priv *il)
+{
+        return (il->ctx.active.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0;
+}
+
+static inline int
+il_is_any_associated(struct il_priv *il)
+{
+        return il_is_associated(il);
+}
+
+static inline int
+il_is_associated_ctx(struct il_rxon_context *ctx)
+{
+        return (ctx->active.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0;
+}
+
+static inline int
+il_is_channel_valid(const struct il_channel_info *ch_info)
+{
+        if (ch_info == NULL)
+                return 0;
+        return (ch_info->flags & EEPROM_CHANNEL_VALID) ? 1 : 0;
+}
+
+static inline int
+il_is_channel_radar(const struct il_channel_info *ch_info)
+{
+        return (ch_info->flags & EEPROM_CHANNEL_RADAR) ? 1 : 0;
+}
+
+static inline u8
+il_is_channel_a_band(const struct il_channel_info *ch_info)
+{
+        return ch_info->band == IEEE80211_BAND_5GHZ;
+}
+
+static inline int
+il_is_channel_passive(const struct il_channel_info *ch)
+{
+        return (!(ch->flags & EEPROM_CHANNEL_ACTIVE)) ? 1 : 0;
+}
+
+static inline int
+il_is_channel_ibss(const struct il_channel_info *ch)
+{
+        return (ch->flags & EEPROM_CHANNEL_IBSS) ? 1 : 0;
+}
+
+static inline void
+__il_free_pages(struct il_priv *il, struct page *page)
+{
+        __free_pages(page, il->hw_params.rx_page_order);
+        il->alloc_rxb_page--;
+}
+
+static inline void
+il_free_pages(struct il_priv *il, unsigned long page)
+{
+        free_pages(page, il->hw_params.rx_page_order);
+        il->alloc_rxb_page--;
+}
+
+#define IWLWIFI_VERSION "in-tree:"
+#define DRV_COPYRIGHT   "Copyright(c) 2003-2011 Intel Corporation"
+#define DRV_AUTHOR     "<ilw@linux.intel.com>"
+
+#define IL_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 TIME_UNIT               1024
+
+#define IL_SKU_G       0x1
+#define IL_SKU_A       0x2
+#define IL_SKU_N       0x8
+
+#define IL_CMD(x) case x: return #x
+
+/* Size of one Rx buffer in host DRAM */
+#define IL_RX_BUF_SIZE_3K (3 * 1000)    /* 3945 only */
+#define IL_RX_BUF_SIZE_4K (4 * 1024)
+#define IL_RX_BUF_SIZE_8K (8 * 1024)
+
+struct il_hcmd_ops {
+        int (*rxon_assoc) (struct il_priv *il, struct il_rxon_context *ctx);
+        int (*commit_rxon) (struct il_priv *il, struct il_rxon_context *ctx);
+        void (*set_rxon_chain) (struct il_priv *il,
+                                struct il_rxon_context *ctx);
+};
+
+struct il_hcmd_utils_ops {
+        u16(*get_hcmd_size) (u8 cmd_id, u16 len);
+        u16(*build_addsta_hcmd) (const struct il_addsta_cmd *cmd, u8 *data);
+        int (*request_scan) (struct il_priv *il, struct ieee80211_vif *vif);
+        void (*post_scan) (struct il_priv *il);
+};
+
+struct il_apm_ops {
+        int (*init) (struct il_priv *il);
+        void (*config) (struct il_priv *il);
+};
+
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+struct il_debugfs_ops {
+        ssize_t(*rx_stats_read) (struct file *file, char __user *user_buf,
+                                 size_t count, loff_t *ppos);
+        ssize_t(*tx_stats_read) (struct file *file, char __user *user_buf,
+                                 size_t count, loff_t *ppos);
+        ssize_t(*general_stats_read) (struct file *file,
+                                      char __user *user_buf, size_t count,
+                                      loff_t *ppos);
+};
+#endif
+
+struct il_temp_ops {
+        void (*temperature) (struct il_priv *il);
+};
+
+struct il_lib_ops {
+        /* set hw dependent parameters */
+        int (*set_hw_params) (struct il_priv *il);
+        /* Handling TX */
+        void (*txq_update_byte_cnt_tbl) (struct il_priv *il,
+                                         struct il_tx_queue *txq,
+                                         u16 byte_cnt);
+        int (*txq_attach_buf_to_tfd) (struct il_priv *il,
+                                      struct il_tx_queue *txq, dma_addr_t addr,
+                                      u16 len, u8 reset, u8 pad);
+        void (*txq_free_tfd) (struct il_priv *il, struct il_tx_queue *txq);
+        int (*txq_init) (struct il_priv *il, struct il_tx_queue *txq);
+        /* setup Rx handler */
+        void (*handler_setup) (struct il_priv *il);
+        /* alive notification after init uCode load */
+        void (*init_alive_start) (struct il_priv *il);
+        /* check validity of rtc data address */
+        int (*is_valid_rtc_data_addr) (u32 addr);
+        /* 1st ucode load */
+        int (*load_ucode) (struct il_priv *il);
+
+        void (*dump_nic_error_log) (struct il_priv *il);
+        int (*dump_fh) (struct il_priv *il, char **buf, bool display);
+        int (*set_channel_switch) (struct il_priv *il,
+                                   struct ieee80211_channel_switch *ch_switch);
+        /* power management */
+        struct il_apm_ops apm_ops;
+
+        /* power */
+        int (*send_tx_power) (struct il_priv *il);
+        void (*update_chain_flags) (struct il_priv *il);
+
+        /* eeprom operations */
+        struct il_eeprom_ops eeprom_ops;
+
+        /* temperature */
+        struct il_temp_ops temp_ops;
+
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+        struct il_debugfs_ops debugfs_ops;
+#endif
+
+};
+
+struct il_led_ops {
+        int (*cmd) (struct il_priv *il, struct il_led_cmd *led_cmd);
+};
+
+struct il_legacy_ops {
+        void (*post_associate) (struct il_priv *il);
+        void (*config_ap) (struct il_priv *il);
+        /* station management */
+        int (*update_bcast_stations) (struct il_priv *il);
+        int (*manage_ibss_station) (struct il_priv *il,
+                                    struct ieee80211_vif *vif, bool add);
+};
+
+struct il_ops {
+        const struct il_lib_ops *lib;
+        const struct il_hcmd_ops *hcmd;
+        const struct il_hcmd_utils_ops *utils;
+        const struct il_led_ops *led;
+        const struct il_nic_ops *nic;
+        const struct il_legacy_ops *legacy;
+        const struct ieee80211_ops *ieee80211_ops;
+};
+
+struct il_mod_params {
+        int sw_crypto;          /* def: 0 = using hardware encryption */
+        int disable_hw_scan;    /* def: 0 = use h/w scan */
+        int num_of_queues;      /* def: HW dependent */
+        int disable_11n;        /* def: 0 = 11n capabilities enabled */
+        int amsdu_size_8K;      /* def: 1 = enable 8K amsdu size */
+        int antenna;            /* def: 0 = both antennas (use diversity) */
+        int restart_fw;         /* def: 1 = restart firmware */
+};
+
+/*
+ * @led_compensation: compensate on the led on/off time per HW according
+ *      to the deviation to achieve the desired led frequency.
+ *      The detail algorithm is described in common.c
+ * @chain_noise_num_beacons: number of beacons used to compute chain noise
+ * @wd_timeout: TX queues watchdog timeout
+ * @temperature_kelvin: temperature report by uCode in kelvin
+ * @ucode_tracing: support ucode continuous tracing
+ * @sensitivity_calib_by_driver: driver has the capability to perform
+ *      sensitivity calibration operation
+ * @chain_noise_calib_by_driver: driver has the capability to perform
+ *      chain noise calibration operation
+ */
+struct il_base_params {
+        int eeprom_size;
+        int num_of_queues;      /* def: HW dependent */
+        int num_of_ampdu_queues;        /* def: HW dependent */
+        /* for il_apm_init() */
+        u32 pll_cfg_val;
+        bool set_l0s;
+        bool use_bsm;
+
+        u16 led_compensation;
+        int chain_noise_num_beacons;
+        unsigned int wd_timeout;
+        bool temperature_kelvin;
+        const bool ucode_tracing;
+        const bool sensitivity_calib_by_driver;
+        const bool chain_noise_calib_by_driver;
+};
+
+#define IL_LED_SOLID 11
+#define IL_DEF_LED_INTRVL cpu_to_le32(1000)
+
+#define IL_LED_ACTIVITY       (0<<1)
+#define IL_LED_LINK           (1<<1)
+
+/*
+ * LED mode
+ *    IL_LED_DEFAULT:  use device default
+ *    IL_LED_RF_STATE: turn LED on/off based on RF state
+ *                      LED ON  = RF ON
+ *                      LED OFF = RF OFF
+ *    IL_LED_BLINK:    adjust led blink rate based on blink table
+ */
+enum il_led_mode {
+        IL_LED_DEFAULT,
+        IL_LED_RF_STATE,
+        IL_LED_BLINK,
+};
+
+void il_leds_init(struct il_priv *il);
+void il_leds_exit(struct il_priv *il);
+
+/**
+ * struct il_cfg
+ * @fw_name_pre: Firmware filename prefix. The api version and extension
+ *      (.ucode) will be added to filename before loading from disk. The
+ *      filename is constructed as fw_name_pre<api>.ucode.
+ * @ucode_api_max: Highest version of uCode API supported by driver.
+ * @ucode_api_min: Lowest version of uCode API supported by driver.
+ * @scan_antennas: available antenna for scan operation
+ * @led_mode: 0=blinking, 1=On(RF On)/Off(RF Off)
+ *
+ * We enable the driver to be backward compatible wrt API version. The
+ * driver specifies which APIs it supports (with @ucode_api_max being the
+ * highest and @ucode_api_min the lowest). Firmware will only be loaded if
+ * it has a supported API version. The firmware's API version will be
+ * stored in @il_priv, enabling the driver to make runtime changes based
+ * on firmware version used.
+ *
+ * For example,
+ * if (IL_UCODE_API(il->ucode_ver) >= 2) {
+ *      Driver interacts with Firmware API version >= 2.
+ * } else {
+ *      Driver interacts with Firmware API version 1.
+ * }
+ *
+ * The ideal usage of this infrastructure is to treat a new ucode API
+ * release as a new hardware revision. That is, through utilizing the
+ * il_hcmd_utils_ops etc. we accommodate different command structures
+ * and flows between hardware versions as well as their API
+ * versions.
+ *
+ */
+struct il_cfg {
+        /* params specific to an individual device within a device family */
+        const char *name;
+        const char *fw_name_pre;
+        const unsigned int ucode_api_max;
+        const unsigned int ucode_api_min;
+        u8 valid_tx_ant;
+        u8 valid_rx_ant;
+        unsigned int sku;
+        u16 eeprom_ver;
+        u16 eeprom_calib_ver;
+        const struct il_ops *ops;
+        /* module based parameters which can be set from modprobe cmd */
+        const struct il_mod_params *mod_params;
+        /* params not likely to change within a device family */
+        struct il_base_params *base_params;
+        /* params likely to change within a device family */
+        u8 scan_rx_antennas[IEEE80211_NUM_BANDS];
+        enum il_led_mode led_mode;
+};
+
+/***************************
+ *   L i b                 *
+ ***************************/
+
+struct ieee80211_hw *il_alloc_all(struct il_cfg *cfg);
+int il_mac_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                   u16 queue, const struct ieee80211_tx_queue_params *params);
+int il_mac_tx_last_beacon(struct ieee80211_hw *hw);
+
+void il_set_rxon_hwcrypto(struct il_priv *il, struct il_rxon_context *ctx,
+                          int hw_decrypt);
+int il_check_rxon_cmd(struct il_priv *il, struct il_rxon_context *ctx);
+int il_full_rxon_required(struct il_priv *il, struct il_rxon_context *ctx);
+int il_set_rxon_channel(struct il_priv *il, struct ieee80211_channel *ch,
+                        struct il_rxon_context *ctx);
+void il_set_flags_for_band(struct il_priv *il, struct il_rxon_context *ctx,
+                           enum ieee80211_band band, struct ieee80211_vif *vif);
+u8 il_get_single_channel_number(struct il_priv *il, enum ieee80211_band band);
+void il_set_rxon_ht(struct il_priv *il, struct il_ht_config *ht_conf);
+bool il_is_ht40_tx_allowed(struct il_priv *il, struct il_rxon_context *ctx,
+                           struct ieee80211_sta_ht_cap *ht_cap);
+void il_connection_init_rx_config(struct il_priv *il,
+                                  struct il_rxon_context *ctx);
+void il_set_rate(struct il_priv *il);
+int il_set_decrypted_flag(struct il_priv *il, struct ieee80211_hdr *hdr,
+                          u32 decrypt_res, struct ieee80211_rx_status *stats);
+void il_irq_handle_error(struct il_priv *il);
+int il_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
+void il_mac_remove_interface(struct ieee80211_hw *hw,
+                             struct ieee80211_vif *vif);
+int il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                            enum nl80211_iftype newtype, bool newp2p);
+int il_alloc_txq_mem(struct il_priv *il);
+void il_txq_mem(struct il_priv *il);
+
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+int il_alloc_traffic_mem(struct il_priv *il);
+void il_free_traffic_mem(struct il_priv *il);
+void il_reset_traffic_log(struct il_priv *il);
+void il_dbg_log_tx_data_frame(struct il_priv *il, u16 length,
+                              struct ieee80211_hdr *header);
+void il_dbg_log_rx_data_frame(struct il_priv *il, u16 length,
+                              struct ieee80211_hdr *header);
+const char *il_get_mgmt_string(int cmd);
+const char *il_get_ctrl_string(int cmd);
+void il_clear_traffic_stats(struct il_priv *il);
+void il_update_stats(struct il_priv *il, bool is_tx, __le16 fc, u16 len);
+#else
+static inline int
+il_alloc_traffic_mem(struct il_priv *il)
+{
+        return 0;
+}
+
+static inline void
+il_free_traffic_mem(struct il_priv *il)
+{
+}
+
+static inline void
+il_reset_traffic_log(struct il_priv *il)
+{
+}
+
+static inline void
+il_dbg_log_tx_data_frame(struct il_priv *il, u16 length,
+                         struct ieee80211_hdr *header)
+{
+}
+
+static inline void
+il_dbg_log_rx_data_frame(struct il_priv *il, u16 length,
+                         struct ieee80211_hdr *header)
+{
+}
+
+static inline void
+il_update_stats(struct il_priv *il, bool is_tx, __le16 fc, u16 len)
+{
+}
+#endif
+/*****************************************************
+ * RX handlers.
+ * **************************************************/
+void il_hdl_pm_sleep(struct il_priv *il, struct il_rx_buf *rxb);
+void il_hdl_pm_debug_stats(struct il_priv *il, struct il_rx_buf *rxb);
+void il_hdl_error(struct il_priv *il, struct il_rx_buf *rxb);
+
+/*****************************************************
+* RX
+******************************************************/
+void il_cmd_queue_unmap(struct il_priv *il);
+void il_cmd_queue_free(struct il_priv *il);
+int il_rx_queue_alloc(struct il_priv *il);
+void il_rx_queue_update_write_ptr(struct il_priv *il, struct il_rx_queue *q);
+int il_rx_queue_space(const struct il_rx_queue *q);
+void il_tx_cmd_complete(struct il_priv *il, struct il_rx_buf *rxb);
+/* Handlers */
+void il_hdl_spectrum_measurement(struct il_priv *il, struct il_rx_buf *rxb);
+void il_recover_from_stats(struct il_priv *il, struct il_rx_pkt *pkt);
+void il_chswitch_done(struct il_priv *il, bool is_success);
+void il_hdl_csa(struct il_priv *il, struct il_rx_buf *rxb);
+
+/* TX helpers */
+
+/*****************************************************
+* TX
+******************************************************/
+void il_txq_update_write_ptr(struct il_priv *il, struct il_tx_queue *txq);
+int il_tx_queue_init(struct il_priv *il, struct il_tx_queue *txq, int slots_num,
+                     u32 txq_id);
+void il_tx_queue_reset(struct il_priv *il, struct il_tx_queue *txq,
+                       int slots_num, u32 txq_id);
+void il_tx_queue_unmap(struct il_priv *il, int txq_id);
+void il_tx_queue_free(struct il_priv *il, int txq_id);
+void il_setup_watchdog(struct il_priv *il);
+/*****************************************************
+ * TX power
+ ****************************************************/
+int il_set_tx_power(struct il_priv *il, s8 tx_power, bool force);
+
+/*******************************************************************************
+ * Rate
+ ******************************************************************************/
+
+u8 il_get_lowest_plcp(struct il_priv *il, struct il_rxon_context *ctx);
+
+/*******************************************************************************
+ * Scanning
+ ******************************************************************************/
+void il_init_scan_params(struct il_priv *il);
+int il_scan_cancel(struct il_priv *il);
+int il_scan_cancel_timeout(struct il_priv *il, unsigned long ms);
+void il_force_scan_end(struct il_priv *il);
+int il_mac_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                   struct cfg80211_scan_request *req);
+void il_internal_short_hw_scan(struct il_priv *il);
+int il_force_reset(struct il_priv *il, bool external);
+u16 il_fill_probe_req(struct il_priv *il, struct ieee80211_mgmt *frame,
+                      const u8 *ta, const u8 *ie, int ie_len, int left);
+void il_setup_rx_scan_handlers(struct il_priv *il);
+u16 il_get_active_dwell_time(struct il_priv *il, enum ieee80211_band band,
+                             u8 n_probes);
+u16 il_get_passive_dwell_time(struct il_priv *il, enum ieee80211_band band,
+                              struct ieee80211_vif *vif);
+void il_setup_scan_deferred_work(struct il_priv *il);
+void il_cancel_scan_deferred_work(struct il_priv *il);
+
+/* For faster active scanning, scan will move to the next channel if fewer than
+ * PLCP_QUIET_THRESH packets are heard on this channel within
+ * ACTIVE_QUIET_TIME after sending probe request.  This shortens the dwell
+ * time if it's a quiet channel (nothing responded to our probe, and there's
+ * no other traffic).
+ * Disable "quiet" feature by setting PLCP_QUIET_THRESH to 0. */
+#define IL_ACTIVE_QUIET_TIME       cpu_to_le16(10)      /* msec */
+#define IL_PLCP_QUIET_THRESH       cpu_to_le16(1)       /* packets */
+
+#define IL_SCAN_CHECK_WATCHDOG          (HZ * 7)
+
+/*****************************************************
+ *   S e n d i n g     H o s t     C o m m a n d s   *
+ *****************************************************/
+
+const char *il_get_cmd_string(u8 cmd);
+int __must_check il_send_cmd_sync(struct il_priv *il, struct il_host_cmd *cmd);
+int il_send_cmd(struct il_priv *il, struct il_host_cmd *cmd);
+int __must_check il_send_cmd_pdu(struct il_priv *il, u8 id, u16 len,
+                                 const void *data);
+int il_send_cmd_pdu_async(struct il_priv *il, u8 id, u16 len, const void *data,
+                          void (*callback) (struct il_priv *il,
+                                            struct il_device_cmd *cmd,
+                                            struct il_rx_pkt *pkt));
+
+int il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd);
+
+/*****************************************************
+ * PCI                                               *
+ *****************************************************/
+
+static inline u16
+il_pcie_link_ctl(struct il_priv *il)
+{
+        int pos;
+        u16 pci_lnk_ctl;
+        pos = pci_pcie_cap(il->pci_dev);
+        pci_read_config_word(il->pci_dev, pos + PCI_EXP_LNKCTL, &pci_lnk_ctl);
+        return pci_lnk_ctl;
+}
+
+void il_bg_watchdog(unsigned long data);
+u32 il_usecs_to_beacons(struct il_priv *il, u32 usec, u32 beacon_interval);
+__le32 il_add_beacon_time(struct il_priv *il, u32 base, u32 addon,
+                          u32 beacon_interval);
+
+#ifdef CONFIG_PM
+int il_pci_suspend(struct device *device);
+int il_pci_resume(struct device *device);
+extern const struct dev_pm_ops il_pm_ops;
+
+#define IL_LEGACY_PM_OPS        (&il_pm_ops)
+
+#else /* !CONFIG_PM */
+
+#define IL_LEGACY_PM_OPS        NULL
+
+#endif /* !CONFIG_PM */
+
+/*****************************************************
+*  Error Handling Debugging
+******************************************************/
+void il4965_dump_nic_error_log(struct il_priv *il);
+#ifdef CONFIG_IWLEGACY_DEBUG
+void il_print_rx_config_cmd(struct il_priv *il, struct il_rxon_context *ctx);
+#else
+static inline void
+il_print_rx_config_cmd(struct il_priv *il, struct il_rxon_context *ctx)
+{
+}
+#endif
+
+void il_clear_isr_stats(struct il_priv *il);
+
+/*****************************************************
+*  GEOS
+******************************************************/
+int il_init_geos(struct il_priv *il);
+void il_free_geos(struct il_priv *il);
+
+/*************** DRIVER STATUS FUNCTIONS   *****/
+
+#define S_HCMD_ACTIVE   0       /* host command in progress */
+/* 1 is unused (used to be S_HCMD_SYNC_ACTIVE) */
+#define S_INT_ENABLED   2
+#define S_RF_KILL_HW    3
+#define S_CT_KILL               4
+#define S_INIT          5
+#define S_ALIVE         6
+#define S_READY         7
+#define S_TEMPERATURE   8
+#define S_GEO_CONFIGURED        9
+#define S_EXIT_PENDING  10
+#define S_STATS         12
+#define S_SCANNING              13
+#define S_SCAN_ABORTING 14
+#define S_SCAN_HW               15
+#define S_POWER_PMI     16
+#define S_FW_ERROR              17
+#define S_CHANNEL_SWITCH_PENDING 18
+
+static inline int
+il_is_ready(struct il_priv *il)
+{
+        /* The adapter is 'ready' if READY and GEO_CONFIGURED bits are
+         * set but EXIT_PENDING is not */
+        return test_bit(S_READY, &il->status) &&
+            test_bit(S_GEO_CONFIGURED, &il->status) &&
+            !test_bit(S_EXIT_PENDING, &il->status);
+}
+
+static inline int
+il_is_alive(struct il_priv *il)
+{
+        return test_bit(S_ALIVE, &il->status);
+}
+
+static inline int
+il_is_init(struct il_priv *il)
+{
+        return test_bit(S_INIT, &il->status);
+}
+
+static inline int
+il_is_rfkill_hw(struct il_priv *il)
+{
+        return test_bit(S_RF_KILL_HW, &il->status);
+}
+
+static inline int
+il_is_rfkill(struct il_priv *il)
+{
+        return il_is_rfkill_hw(il);
+}
+
+static inline int
+il_is_ctkill(struct il_priv *il)
+{
+        return test_bit(S_CT_KILL, &il->status);
+}
+
+static inline int
+il_is_ready_rf(struct il_priv *il)
+{
+
+        if (il_is_rfkill(il))
+                return 0;
+
+        return il_is_ready(il);
+}
+
+extern void il_send_bt_config(struct il_priv *il);
+extern int il_send_stats_request(struct il_priv *il, u8 flags, bool clear);
+void il_apm_stop(struct il_priv *il);
+int il_apm_init(struct il_priv *il);
+
+int il_send_rxon_timing(struct il_priv *il, struct il_rxon_context *ctx);
+static inline int
+il_send_rxon_assoc(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        return il->cfg->ops->hcmd->rxon_assoc(il, ctx);
+}
+
+static inline int
+il_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
+{
+        return il->cfg->ops->hcmd->commit_rxon(il, ctx);
+}
+
+static inline const struct ieee80211_supported_band *
+il_get_hw_mode(struct il_priv *il, enum ieee80211_band band)
+{
+        return il->hw->wiphy->bands[band];
+}
+
+/* mac80211 handlers */
+int il_mac_config(struct ieee80211_hw *hw, u32 changed);
+void il_mac_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
+void il_mac_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                             struct ieee80211_bss_conf *bss_conf, u32 changes);
+void il_tx_cmd_protection(struct il_priv *il, struct ieee80211_tx_info *info,
+                          __le16 fc, __le32 *tx_flags);
+
+irqreturn_t il_isr(int irq, void *data);
+
+#include <linux/io.h>
+
+static inline void
+_il_write8(struct il_priv *il, u32 ofs, u8 val)
+{
+        iowrite8(val, il->hw_base + ofs);
+}
+#define il_write8(il, ofs, val) _il_write8(il, ofs, val)
+
+static inline void
+_il_wr(struct il_priv *il, u32 ofs, u32 val)
+{
+        iowrite32(val, il->hw_base + ofs);
+}
+
+static inline u32
+_il_rd(struct il_priv *il, u32 ofs)
+{
+        return ioread32(il->hw_base + ofs);
+}
+
+#define IL_POLL_INTERVAL 10     /* microseconds */
+static inline int
+_il_poll_bit(struct il_priv *il, u32 addr, u32 bits, u32 mask, int timeout)
+{
+        int t = 0;
+
+        do {
+                if ((_il_rd(il, addr) & mask) == (bits & mask))
+                        return t;
+                udelay(IL_POLL_INTERVAL);
+                t += IL_POLL_INTERVAL;
+        } while (t < timeout);
+
+        return -ETIMEDOUT;
+}
+
+static inline void
+_il_set_bit(struct il_priv *il, u32 reg, u32 mask)
+{
+        _il_wr(il, reg, _il_rd(il, reg) | mask);
+}
+
+static inline void
+il_set_bit(struct il_priv *p, u32 r, u32 m)
+{
+        unsigned long reg_flags;
+
+        spin_lock_irqsave(&p->reg_lock, reg_flags);
+        _il_set_bit(p, r, m);
+        spin_unlock_irqrestore(&p->reg_lock, reg_flags);
+}
+
+static inline void
+_il_clear_bit(struct il_priv *il, u32 reg, u32 mask)
+{
+        _il_wr(il, reg, _il_rd(il, reg) & ~mask);
+}
+
+static inline void
+il_clear_bit(struct il_priv *p, u32 r, u32 m)
+{
+        unsigned long reg_flags;
+
+        spin_lock_irqsave(&p->reg_lock, reg_flags);
+        _il_clear_bit(p, r, m);
+        spin_unlock_irqrestore(&p->reg_lock, reg_flags);
+}
+
+static inline int
+_il_grab_nic_access(struct il_priv *il)
+{
+        int ret;
+        u32 val;
+
+        /* this bit wakes up the NIC */
+        _il_set_bit(il, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+
+        /*
+         * These bits say the device is running, and should keep running for
+         * at least a short while (at least as long as MAC_ACCESS_REQ stays 1),
+         * but they do not indicate that embedded SRAM is restored yet;
+         * 3945 and 4965 have volatile SRAM, and must save/restore contents
+         * to/from host DRAM when sleeping/waking for power-saving.
+         * Each direction takes approximately 1/4 millisecond; with this
+         * overhead, it's a good idea to grab and hold MAC_ACCESS_REQUEST if a
+         * series of register accesses are expected (e.g. reading Event Log),
+         * to keep device from sleeping.
+         *
+         * CSR_UCODE_DRV_GP1 register bit MAC_SLEEP == 0 indicates that
+         * SRAM is okay/restored.  We don't check that here because this call
+         * is just for hardware register access; but GP1 MAC_SLEEP check is a
+         * good idea before accessing 3945/4965 SRAM (e.g. reading Event Log).
+         *
+         */
+        ret =
+            _il_poll_bit(il, 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), 15000);
+        if (ret < 0) {
+                val = _il_rd(il, CSR_GP_CNTRL);
+                IL_ERR("MAC is in deep sleep!.  CSR_GP_CNTRL = 0x%08X\n", val);
+                _il_wr(il, CSR_RESET, CSR_RESET_REG_FLAG_FORCE_NMI);
+                return -EIO;
+        }
+
+        return 0;
+}
+
+static inline void
+_il_release_nic_access(struct il_priv *il)
+{
+        _il_clear_bit(il, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+}
+
+static inline u32
+il_rd(struct il_priv *il, u32 reg)
+{
+        u32 value;
+        unsigned long reg_flags;
+
+        spin_lock_irqsave(&il->reg_lock, reg_flags);
+        _il_grab_nic_access(il);
+        value = _il_rd(il, reg);
+        _il_release_nic_access(il);
+        spin_unlock_irqrestore(&il->reg_lock, reg_flags);
+        return value;
+
+}
+
+static inline void
+il_wr(struct il_priv *il, u32 reg, u32 value)
+{
+        unsigned long reg_flags;
+
+        spin_lock_irqsave(&il->reg_lock, reg_flags);
+        if (!_il_grab_nic_access(il)) {
+                _il_wr(il, reg, value);
+                _il_release_nic_access(il);
+        }
+        spin_unlock_irqrestore(&il->reg_lock, reg_flags);
+}
+
+static inline void
+il_write_reg_buf(struct il_priv *il, u32 reg, u32 len, u32 * values)
+{
+        u32 count = sizeof(u32);
+
+        if (il != NULL && values != NULL) {
+                for (; 0 < len; len -= count, reg += count, values++)
+                        il_wr(il, reg, *values);
+        }
+}
+
+static inline int
+il_poll_bit(struct il_priv *il, u32 addr, u32 mask, int timeout)
+{
+        int t = 0;
+
+        do {
+                if ((il_rd(il, addr) & mask) == mask)
+                        return t;
+                udelay(IL_POLL_INTERVAL);
+                t += IL_POLL_INTERVAL;
+        } while (t < timeout);
+
+        return -ETIMEDOUT;
+}
+
+static inline u32
+_il_rd_prph(struct il_priv *il, u32 reg)
+{
+        _il_wr(il, HBUS_TARG_PRPH_RADDR, reg | (3 << 24));
+        rmb();
+        return _il_rd(il, HBUS_TARG_PRPH_RDAT);
+}
+
+static inline u32
+il_rd_prph(struct il_priv *il, u32 reg)
+{
+        unsigned long reg_flags;
+        u32 val;
+
+        spin_lock_irqsave(&il->reg_lock, reg_flags);
+        _il_grab_nic_access(il);
+        val = _il_rd_prph(il, reg);
+        _il_release_nic_access(il);
+        spin_unlock_irqrestore(&il->reg_lock, reg_flags);
+        return val;
+}
+
+static inline void
+_il_wr_prph(struct il_priv *il, u32 addr, u32 val)
+{
+        _il_wr(il, HBUS_TARG_PRPH_WADDR, ((addr & 0x0000FFFF) | (3 << 24)));
+        wmb();
+        _il_wr(il, HBUS_TARG_PRPH_WDAT, val);
+}
+
+static inline void
+il_wr_prph(struct il_priv *il, u32 addr, u32 val)
+{
+        unsigned long reg_flags;
+
+        spin_lock_irqsave(&il->reg_lock, reg_flags);
+        if (!_il_grab_nic_access(il)) {
+                _il_wr_prph(il, addr, val);
+                _il_release_nic_access(il);
+        }
+        spin_unlock_irqrestore(&il->reg_lock, reg_flags);
+}
+
+#define _il_set_bits_prph(il, reg, mask) \
+_il_wr_prph(il, reg, (_il_rd_prph(il, reg) | mask))
+
+static inline void
+il_set_bits_prph(struct il_priv *il, u32 reg, u32 mask)
+{
+        unsigned long reg_flags;
+
+        spin_lock_irqsave(&il->reg_lock, reg_flags);
+        _il_grab_nic_access(il);
+        _il_set_bits_prph(il, reg, mask);
+        _il_release_nic_access(il);
+        spin_unlock_irqrestore(&il->reg_lock, reg_flags);
+}
+
+#define _il_set_bits_mask_prph(il, reg, bits, mask) \
+_il_wr_prph(il, reg,                            \
+                 ((_il_rd_prph(il, reg) & mask) | bits))
+
+static inline void
+il_set_bits_mask_prph(struct il_priv *il, u32 reg, u32 bits, u32 mask)
+{
+        unsigned long reg_flags;
+
+        spin_lock_irqsave(&il->reg_lock, reg_flags);
+        _il_grab_nic_access(il);
+        _il_set_bits_mask_prph(il, reg, bits, mask);
+        _il_release_nic_access(il);
+        spin_unlock_irqrestore(&il->reg_lock, reg_flags);
+}
+
+static inline void
+il_clear_bits_prph(struct il_priv *il, u32 reg, u32 mask)
+{
+        unsigned long reg_flags;
+        u32 val;
+
+        spin_lock_irqsave(&il->reg_lock, reg_flags);
+        _il_grab_nic_access(il);
+        val = _il_rd_prph(il, reg);
+        _il_wr_prph(il, reg, (val & ~mask));
+        _il_release_nic_access(il);
+        spin_unlock_irqrestore(&il->reg_lock, reg_flags);
+}
+
+static inline u32
+il_read_targ_mem(struct il_priv *il, u32 addr)
+{
+        unsigned long reg_flags;
+        u32 value;
+
+        spin_lock_irqsave(&il->reg_lock, reg_flags);
+        _il_grab_nic_access(il);
+
+        _il_wr(il, HBUS_TARG_MEM_RADDR, addr);
+        rmb();
+        value = _il_rd(il, HBUS_TARG_MEM_RDAT);
+
+        _il_release_nic_access(il);
+        spin_unlock_irqrestore(&il->reg_lock, reg_flags);
+        return value;
+}
+
+static inline void
+il_write_targ_mem(struct il_priv *il, u32 addr, u32 val)
+{
+        unsigned long reg_flags;
+
+        spin_lock_irqsave(&il->reg_lock, reg_flags);
+        if (!_il_grab_nic_access(il)) {
+                _il_wr(il, HBUS_TARG_MEM_WADDR, addr);
+                wmb();
+                _il_wr(il, HBUS_TARG_MEM_WDAT, val);
+                _il_release_nic_access(il);
+        }
+        spin_unlock_irqrestore(&il->reg_lock, reg_flags);
+}
+
+static inline void
+il_write_targ_mem_buf(struct il_priv *il, u32 addr, u32 len, u32 * values)
+{
+        unsigned long reg_flags;
+
+        spin_lock_irqsave(&il->reg_lock, reg_flags);
+        if (!_il_grab_nic_access(il)) {
+                _il_wr(il, HBUS_TARG_MEM_WADDR, addr);
+                wmb();
+                for (; 0 < len; len -= sizeof(u32), values++)
+                        _il_wr(il, HBUS_TARG_MEM_WDAT, *values);
+
+                _il_release_nic_access(il);
+        }
+        spin_unlock_irqrestore(&il->reg_lock, reg_flags);
+}
+
+#define HW_KEY_DYNAMIC 0
+#define HW_KEY_DEFAULT 1
+
+#define IL_STA_DRIVER_ACTIVE BIT(0)     /* driver entry is active */
+#define IL_STA_UCODE_ACTIVE  BIT(1)     /* ucode entry is active */
+#define IL_STA_UCODE_INPROGRESS  BIT(2) /* ucode entry is in process of
+                                           being activated */
+#define IL_STA_LOCAL BIT(3)     /* station state not directed by mac80211;
+                                   (this is for the IBSS BSSID stations) */
+#define IL_STA_BCAST BIT(4)     /* this station is the special bcast station */
+
+void il_restore_stations(struct il_priv *il, struct il_rxon_context *ctx);
+void il_clear_ucode_stations(struct il_priv *il, struct il_rxon_context *ctx);
+void il_dealloc_bcast_stations(struct il_priv *il);
+int il_get_free_ucode_key_idx(struct il_priv *il);
+int il_send_add_sta(struct il_priv *il, struct il_addsta_cmd *sta, u8 flags);
+int il_add_station_common(struct il_priv *il, struct il_rxon_context *ctx,
+                          const u8 *addr, bool is_ap,
+                          struct ieee80211_sta *sta, u8 *sta_id_r);
+int il_remove_station(struct il_priv *il, const u8 sta_id, const u8 * addr);
+int il_mac_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                      struct ieee80211_sta *sta);
+
+u8 il_prep_station(struct il_priv *il, struct il_rxon_context *ctx,
+                   const u8 *addr, bool is_ap, struct ieee80211_sta *sta);
+
+int il_send_lq_cmd(struct il_priv *il, struct il_rxon_context *ctx,
+                   struct il_link_quality_cmd *lq, u8 flags, bool init);
+
+/**
+ * il_clear_driver_stations - clear knowledge of all stations from driver
+ * @il: iwl il struct
+ *
+ * This is called during il_down() to make sure that in the case
+ * we're coming there from a hardware restart mac80211 will be
+ * able to reconfigure stations -- if we're getting there in the
+ * normal down flow then the stations will already be cleared.
+ */
+static inline void
+il_clear_driver_stations(struct il_priv *il)
+{
+        unsigned long flags;
+        struct il_rxon_context *ctx = &il->ctx;
+
+        spin_lock_irqsave(&il->sta_lock, flags);
+        memset(il->stations, 0, sizeof(il->stations));
+        il->num_stations = 0;
+
+        il->ucode_key_table = 0;
+
+        /*
+         * Remove all key information that is not stored as part
+         * of station information since mac80211 may not have had
+         * a chance to remove all the keys. When device is
+         * reconfigured by mac80211 after an error all keys will
+         * be reconfigured.
+         */
+        memset(ctx->wep_keys, 0, sizeof(ctx->wep_keys));
+        ctx->key_mapping_keys = 0;
+
+        spin_unlock_irqrestore(&il->sta_lock, flags);
+}
+
+static inline int
+il_sta_id(struct ieee80211_sta *sta)
+{
+        if (WARN_ON(!sta))
+                return IL_INVALID_STATION;
+
+        return ((struct il_station_priv_common *)sta->drv_priv)->sta_id;
+}
+
+/**
+ * il_sta_id_or_broadcast - return sta_id or broadcast sta
+ * @il: iwl il
+ * @context: the current context
+ * @sta: mac80211 station
+ *
+ * In certain circumstances mac80211 passes a station pointer
+ * that may be %NULL, for example during TX or key setup. In
+ * that case, we need to use the broadcast station, so this
+ * inline wraps that pattern.
+ */
+static inline int
+il_sta_id_or_broadcast(struct il_priv *il, struct il_rxon_context *context,
+                       struct ieee80211_sta *sta)
+{
+        int sta_id;
+
+        if (!sta)
+                return context->bcast_sta_id;
+
+        sta_id = il_sta_id(sta);
+
+        /*
+         * mac80211 should not be passing a partially
+         * initialised station!
+         */
+        WARN_ON(sta_id == IL_INVALID_STATION);
+
+        return sta_id;
+}
+
+/**
+ * il_queue_inc_wrap - increment queue idx, wrap back to beginning
+ * @idx -- current idx
+ * @n_bd -- total number of entries in queue (must be power of 2)
+ */
+static inline int
+il_queue_inc_wrap(int idx, int n_bd)
+{
+        return ++idx & (n_bd - 1);
+}
+
+/**
+ * il_queue_dec_wrap - decrement queue idx, wrap back to end
+ * @idx -- current idx
+ * @n_bd -- total number of entries in queue (must be power of 2)
+ */
+static inline int
+il_queue_dec_wrap(int idx, int n_bd)
+{
+        return --idx & (n_bd - 1);
+}
+
+/* TODO: Move fw_desc functions to iwl-pci.ko */
+static inline void
+il_free_fw_desc(struct pci_dev *pci_dev, struct fw_desc *desc)
+{
+        if (desc->v_addr)
+                dma_free_coherent(&pci_dev->dev, desc->len, desc->v_addr,
+                                  desc->p_addr);
+        desc->v_addr = NULL;
+        desc->len = 0;
+}
+
+static inline int
+il_alloc_fw_desc(struct pci_dev *pci_dev, struct fw_desc *desc)
+{
+        if (!desc->len) {
+                desc->v_addr = NULL;
+                return -EINVAL;
+        }
+
+        desc->v_addr =
+            dma_alloc_coherent(&pci_dev->dev, desc->len, &desc->p_addr,
+                               GFP_KERNEL);
+        return (desc->v_addr != NULL) ? 0 : -ENOMEM;
+}
+
+/*
+ * we have 8 bits used like this:
+ *
+ * 7 6 5 4 3 2 1 0
+ * | | | | | | | |
+ * | | | | | | +-+-------- AC queue (0-3)
+ * | | | | | |
+ * | +-+-+-+-+------------ HW queue ID
+ * |
+ * +---------------------- unused
+ */
+static inline void
+il_set_swq_id(struct il_tx_queue *txq, u8 ac, u8 hwq)
+{
+        BUG_ON(ac > 3);         /* only have 2 bits */
+        BUG_ON(hwq > 31);       /* only use 5 bits */
+
+        txq->swq_id = (hwq << 2) | ac;
+}
+
+static inline void
+il_wake_queue(struct il_priv *il, struct il_tx_queue *txq)
+{
+        u8 queue = txq->swq_id;
+        u8 ac = queue & 3;
+        u8 hwq = (queue >> 2) & 0x1f;
+
+        if (test_and_clear_bit(hwq, il->queue_stopped))
+                if (atomic_dec_return(&il->queue_stop_count[ac]) <= 0)
+                        ieee80211_wake_queue(il->hw, ac);
+}
+
+static inline void
+il_stop_queue(struct il_priv *il, struct il_tx_queue *txq)
+{
+        u8 queue = txq->swq_id;
+        u8 ac = queue & 3;
+        u8 hwq = (queue >> 2) & 0x1f;
+
+        if (!test_and_set_bit(hwq, il->queue_stopped))
+                if (atomic_inc_return(&il->queue_stop_count[ac]) > 0)
+                        ieee80211_stop_queue(il->hw, ac);
+}
+
+#ifdef ieee80211_stop_queue
+#undef ieee80211_stop_queue
+#endif
+
+#define ieee80211_stop_queue DO_NOT_USE_ieee80211_stop_queue
+
+#ifdef ieee80211_wake_queue
+#undef ieee80211_wake_queue
+#endif
+
+#define ieee80211_wake_queue DO_NOT_USE_ieee80211_wake_queue
+
+static inline void
+il_disable_interrupts(struct il_priv *il)
+{
+        clear_bit(S_INT_ENABLED, &il->status);
+
+        /* disable interrupts from uCode/NIC to host */
+        _il_wr(il, CSR_INT_MASK, 0x00000000);
+
+        /* acknowledge/clear/reset any interrupts still pending
+         * from uCode or flow handler (Rx/Tx DMA) */
+        _il_wr(il, CSR_INT, 0xffffffff);
+        _il_wr(il, CSR_FH_INT_STATUS, 0xffffffff);
+}
+
+static inline void
+il_enable_rfkill_int(struct il_priv *il)
+{
+        _il_wr(il, CSR_INT_MASK, CSR_INT_BIT_RF_KILL);
+}
+
+static inline void
+il_enable_interrupts(struct il_priv *il)
+{
+        set_bit(S_INT_ENABLED, &il->status);
+        _il_wr(il, CSR_INT_MASK, il->inta_mask);
+}
+
+/**
+ * il_beacon_time_mask_low - mask of lower 32 bit of beacon time
+ * @il -- pointer to il_priv data structure
+ * @tsf_bits -- number of bits need to shift for masking)
+ */
+static inline u32
+il_beacon_time_mask_low(struct il_priv *il, u16 tsf_bits)
+{
+        return (1 << tsf_bits) - 1;
+}
+
+/**
+ * il_beacon_time_mask_high - mask of higher 32 bit of beacon time
+ * @il -- pointer to il_priv data structure
+ * @tsf_bits -- number of bits need to shift for masking)
+ */
+static inline u32
+il_beacon_time_mask_high(struct il_priv *il, u16 tsf_bits)
+{
+        return ((1 << (32 - tsf_bits)) - 1) << tsf_bits;
+}
+
+/**
+ * struct il_rb_status - reseve buffer status host memory mapped FH registers
+ *
+ * @closed_rb_num [0:11] - Indicates the idx of the RB which was closed
+ * @closed_fr_num [0:11] - Indicates the idx of the RX Frame which was closed
+ * @finished_rb_num [0:11] - Indicates the idx of the current RB
+ *                           in which the last frame was written to
+ * @finished_fr_num [0:11] - Indicates the idx of the RX Frame
+ *                           which was transferred
+ */
+struct il_rb_status {
+        __le16 closed_rb_num;
+        __le16 closed_fr_num;
+        __le16 finished_rb_num;
+        __le16 finished_fr_nam;
+        __le32 __unused;        /* 3945 only */
+} __packed;
+
+#define TFD_QUEUE_SIZE_MAX      (256)
+#define TFD_QUEUE_SIZE_BC_DUP   (64)
+#define TFD_QUEUE_BC_SIZE       (TFD_QUEUE_SIZE_MAX + TFD_QUEUE_SIZE_BC_DUP)
+#define IL_TX_DMA_MASK        DMA_BIT_MASK(36)
+#define IL_NUM_OF_TBS           20
+
+static inline u8
+il_get_dma_hi_addr(dma_addr_t addr)
+{
+        return (sizeof(addr) > sizeof(u32) ? (addr >> 16) >> 16 : 0) & 0xF;
+}
+
+/**
+ * struct il_tfd_tb transmit buffer descriptor within transmit frame descriptor
+ *
+ * This structure contains dma address and length of transmission address
+ *
+ * @lo: low [31:0] portion of the dma address of TX buffer every even is
+ *      unaligned on 16 bit boundary
+ * @hi_n_len: 0-3 [35:32] portion of dma
+ *            4-15 length of the tx buffer
+ */
+struct il_tfd_tb {
+        __le32 lo;
+        __le16 hi_n_len;
+} __packed;
+
+/**
+ * struct il_tfd
+ *
+ * Transmit Frame Descriptor (TFD)
+ *
+ * @ __reserved1[3] reserved
+ * @ num_tbs 0-4 number of active tbs
+ *           5   reserved
+ *           6-7 padding (not used)
+ * @ tbs[20]    transmit frame buffer descriptors
+ * @ __pad      padding
+ *
+ * Each Tx queue uses a circular buffer of 256 TFDs stored in host DRAM.
+ * Both driver and device share these circular buffers, each of which must be
+ * contiguous 256 TFDs x 128 bytes-per-TFD = 32 KBytes
+ *
+ * Driver must indicate the physical address of the base of each
+ * circular buffer via the FH49_MEM_CBBC_QUEUE registers.
+ *
+ * Each TFD contains pointer/size information for up to 20 data buffers
+ * in host DRAM.  These buffers collectively contain the (one) frame described
+ * by the TFD.  Each buffer must be a single contiguous block of memory within
+ * itself, but buffers may be scattered in host DRAM.  Each buffer has max size
+ * of (4K - 4).  The concatenates all of a TFD's buffers into a single
+ * Tx frame, up to 8 KBytes in size.
+ *
+ * A maximum of 255 (not 256!) TFDs may be on a queue waiting for Tx.
+ */
+struct il_tfd {
+        u8 __reserved1[3];
+        u8 num_tbs;
+        struct il_tfd_tb tbs[IL_NUM_OF_TBS];
+        __le32 __pad;
+} __packed;
+/* PCI registers */
+#define PCI_CFG_RETRY_TIMEOUT   0x041
+
+/* PCI register values */
+#define PCI_CFG_LINK_CTRL_VAL_L0S_EN    0x01
+#define PCI_CFG_LINK_CTRL_VAL_L1_EN     0x02
+
+struct il_rate_info {
+        u8 plcp;                /* uCode API:  RATE_6M_PLCP, etc. */
+        u8 plcp_siso;           /* uCode API:  RATE_SISO_6M_PLCP, etc. */
+        u8 plcp_mimo2;          /* uCode API:  RATE_MIMO2_6M_PLCP, etc. */
+        u8 ieee;                /* MAC header:  RATE_6M_IEEE, etc. */
+        u8 prev_ieee;           /* previous rate in IEEE speeds */
+        u8 next_ieee;           /* next rate in IEEE speeds */
+        u8 prev_rs;             /* previous rate used in rs algo */
+        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 */
+};
+
+struct il3945_rate_info {
+        u8 plcp;                /* uCode API:  RATE_6M_PLCP, etc. */
+        u8 ieee;                /* MAC header:  RATE_6M_IEEE, etc. */
+        u8 prev_ieee;           /* previous rate in IEEE speeds */
+        u8 next_ieee;           /* next rate in IEEE speeds */
+        u8 prev_rs;             /* previous rate used in rs algo */
+        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_idx;        /* idx in rate scale table cmd */
+        u8 prev_table_rs;       /* prev in rate table cmd */
+};
+
+/*
+ * These serve as idxes into
+ * struct il_rate_info il_rates[RATE_COUNT];
+ */
+enum {
+        RATE_1M_IDX = 0,
+        RATE_2M_IDX,
+        RATE_5M_IDX,
+        RATE_11M_IDX,
+        RATE_6M_IDX,
+        RATE_9M_IDX,
+        RATE_12M_IDX,
+        RATE_18M_IDX,
+        RATE_24M_IDX,
+        RATE_36M_IDX,
+        RATE_48M_IDX,
+        RATE_54M_IDX,
+        RATE_60M_IDX,
+        RATE_COUNT,
+        RATE_COUNT_LEGACY = RATE_COUNT - 1,     /* Excluding 60M */
+        RATE_COUNT_3945 = RATE_COUNT - 1,
+        RATE_INVM_IDX = RATE_COUNT,
+        RATE_INVALID = RATE_COUNT,
+};
+
+enum {
+        RATE_6M_IDX_TBL = 0,
+        RATE_9M_IDX_TBL,
+        RATE_12M_IDX_TBL,
+        RATE_18M_IDX_TBL,
+        RATE_24M_IDX_TBL,
+        RATE_36M_IDX_TBL,
+        RATE_48M_IDX_TBL,
+        RATE_54M_IDX_TBL,
+        RATE_1M_IDX_TBL,
+        RATE_2M_IDX_TBL,
+        RATE_5M_IDX_TBL,
+        RATE_11M_IDX_TBL,
+        RATE_INVM_IDX_TBL = RATE_INVM_IDX - 1,
+};
+
+enum {
+        IL_FIRST_OFDM_RATE = RATE_6M_IDX,
+        IL39_LAST_OFDM_RATE = RATE_54M_IDX,
+        IL_LAST_OFDM_RATE = RATE_60M_IDX,
+        IL_FIRST_CCK_RATE = RATE_1M_IDX,
+        IL_LAST_CCK_RATE = RATE_11M_IDX,
+};
+
+/* #define vs. enum to keep from defaulting to 'large integer' */
+#define RATE_6M_MASK   (1 << RATE_6M_IDX)
+#define RATE_9M_MASK   (1 << RATE_9M_IDX)
+#define RATE_12M_MASK  (1 << RATE_12M_IDX)
+#define RATE_18M_MASK  (1 << RATE_18M_IDX)
+#define RATE_24M_MASK  (1 << RATE_24M_IDX)
+#define RATE_36M_MASK  (1 << RATE_36M_IDX)
+#define RATE_48M_MASK  (1 << RATE_48M_IDX)
+#define RATE_54M_MASK  (1 << RATE_54M_IDX)
+#define RATE_60M_MASK  (1 << RATE_60M_IDX)
+#define RATE_1M_MASK   (1 << RATE_1M_IDX)
+#define RATE_2M_MASK   (1 << RATE_2M_IDX)
+#define RATE_5M_MASK   (1 << RATE_5M_IDX)
+#define RATE_11M_MASK  (1 << RATE_11M_IDX)
+
+/* uCode API values for legacy bit rates, both OFDM and CCK */
+enum {
+        RATE_6M_PLCP = 13,
+        RATE_9M_PLCP = 15,
+        RATE_12M_PLCP = 5,
+        RATE_18M_PLCP = 7,
+        RATE_24M_PLCP = 9,
+        RATE_36M_PLCP = 11,
+        RATE_48M_PLCP = 1,
+        RATE_54M_PLCP = 3,
+        RATE_60M_PLCP = 3,      /*FIXME:RS:should be removed */
+        RATE_1M_PLCP = 10,
+        RATE_2M_PLCP = 20,
+        RATE_5M_PLCP = 55,
+        RATE_11M_PLCP = 110,
+        /*FIXME:RS:add RATE_LEGACY_INVM_PLCP = 0, */
+};
+
+/* uCode API values for OFDM high-throughput (HT) bit rates */
+enum {
+        RATE_SISO_6M_PLCP = 0,
+        RATE_SISO_12M_PLCP = 1,
+        RATE_SISO_18M_PLCP = 2,
+        RATE_SISO_24M_PLCP = 3,
+        RATE_SISO_36M_PLCP = 4,
+        RATE_SISO_48M_PLCP = 5,
+        RATE_SISO_54M_PLCP = 6,
+        RATE_SISO_60M_PLCP = 7,
+        RATE_MIMO2_6M_PLCP = 0x8,
+        RATE_MIMO2_12M_PLCP = 0x9,
+        RATE_MIMO2_18M_PLCP = 0xa,
+        RATE_MIMO2_24M_PLCP = 0xb,
+        RATE_MIMO2_36M_PLCP = 0xc,
+        RATE_MIMO2_48M_PLCP = 0xd,
+        RATE_MIMO2_54M_PLCP = 0xe,
+        RATE_MIMO2_60M_PLCP = 0xf,
+        RATE_SISO_INVM_PLCP,
+        RATE_MIMO2_INVM_PLCP = RATE_SISO_INVM_PLCP,
+};
+
+/* MAC header values for bit rates */
+enum {
+        RATE_6M_IEEE = 12,
+        RATE_9M_IEEE = 18,
+        RATE_12M_IEEE = 24,
+        RATE_18M_IEEE = 36,
+        RATE_24M_IEEE = 48,
+        RATE_36M_IEEE = 72,
+        RATE_48M_IEEE = 96,
+        RATE_54M_IEEE = 108,
+        RATE_60M_IEEE = 120,
+        RATE_1M_IEEE = 2,
+        RATE_2M_IEEE = 4,
+        RATE_5M_IEEE = 11,
+        RATE_11M_IEEE = 22,
+};
+
+#define IL_CCK_BASIC_RATES_MASK    \
+        (RATE_1M_MASK          | \
+        RATE_2M_MASK)
+
+#define IL_CCK_RATES_MASK          \
+        (IL_CCK_BASIC_RATES_MASK  | \
+        RATE_5M_MASK          | \
+        RATE_11M_MASK)
+
+#define IL_OFDM_BASIC_RATES_MASK   \
+        (RATE_6M_MASK         | \
+        RATE_12M_MASK         | \
+        RATE_24M_MASK)
+
+#define IL_OFDM_RATES_MASK         \
+        (IL_OFDM_BASIC_RATES_MASK | \
+        RATE_9M_MASK          | \
+        RATE_18M_MASK         | \
+        RATE_36M_MASK         | \
+        RATE_48M_MASK         | \
+        RATE_54M_MASK)
+
+#define IL_BASIC_RATES_MASK         \
+        (IL_OFDM_BASIC_RATES_MASK | \
+         IL_CCK_BASIC_RATES_MASK)
+
+#define RATES_MASK ((1 << RATE_COUNT) - 1)
+#define RATES_MASK_3945 ((1 << RATE_COUNT_3945) - 1)
+
+#define IL_INVALID_VALUE    -1
+
+#define IL_MIN_RSSI_VAL                 -100
+#define IL_MAX_RSSI_VAL                    0
+
+/* These values specify how many Tx frame attempts before
+ * searching for a new modulation mode */
+#define IL_LEGACY_FAILURE_LIMIT 160
+#define IL_LEGACY_SUCCESS_LIMIT 480
+#define IL_LEGACY_TBL_COUNT             160
+
+#define IL_NONE_LEGACY_FAILURE_LIMIT    400
+#define IL_NONE_LEGACY_SUCCESS_LIMIT    4500
+#define IL_NONE_LEGACY_TBL_COUNT        1500
+
+/* Success ratio (ACKed / attempted tx frames) values (perfect is 128 * 100) */
+#define IL_RS_GOOD_RATIO                12800   /* 100% */
+#define RATE_SCALE_SWITCH               10880   /*  85% */
+#define RATE_HIGH_TH            10880   /*  85% */
+#define RATE_INCREASE_TH                6400    /*  50% */
+#define RATE_DECREASE_TH                1920    /*  15% */
+
+/* possible actions when in legacy mode */
+#define IL_LEGACY_SWITCH_ANTENNA1      0
+#define IL_LEGACY_SWITCH_ANTENNA2      1
+#define IL_LEGACY_SWITCH_SISO          2
+#define IL_LEGACY_SWITCH_MIMO2_AB      3
+#define IL_LEGACY_SWITCH_MIMO2_AC      4
+#define IL_LEGACY_SWITCH_MIMO2_BC      5
+
+/* possible actions when in siso mode */
+#define IL_SISO_SWITCH_ANTENNA1        0
+#define IL_SISO_SWITCH_ANTENNA2        1
+#define IL_SISO_SWITCH_MIMO2_AB        2
+#define IL_SISO_SWITCH_MIMO2_AC        3
+#define IL_SISO_SWITCH_MIMO2_BC        4
+#define IL_SISO_SWITCH_GI              5
+
+/* possible actions when in mimo mode */
+#define IL_MIMO2_SWITCH_ANTENNA1       0
+#define IL_MIMO2_SWITCH_ANTENNA2       1
+#define IL_MIMO2_SWITCH_SISO_A         2
+#define IL_MIMO2_SWITCH_SISO_B         3
+#define IL_MIMO2_SWITCH_SISO_C         4
+#define IL_MIMO2_SWITCH_GI             5
+
+#define IL_MAX_SEARCH IL_MIMO2_SWITCH_GI
+
+#define IL_ACTION_LIMIT         3       /* # possible actions */
+
+#define LQ_SIZE         2       /* 2 mode tables:  "Active" and "Search" */
+
+/* load per tid defines for A-MPDU activation */
+#define IL_AGG_TPT_THREHOLD     0
+#define IL_AGG_LOAD_THRESHOLD   10
+#define IL_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 il_rate_info il_rates[RATE_COUNT];
+
+enum il_table_type {
+        LQ_NONE,
+        LQ_G,                   /* legacy types */
+        LQ_A,
+        LQ_SISO,                /* high-throughput types */
+        LQ_MIMO2,
+        LQ_MAX,
+};
+
+#define is_legacy(tbl) ((tbl) == LQ_G || (tbl) == LQ_A)
+#define is_siso(tbl) ((tbl) == LQ_SISO)
+#define is_mimo2(tbl) ((tbl) == LQ_MIMO2)
+#define is_mimo(tbl) (is_mimo2(tbl))
+#define is_Ht(tbl) (is_siso(tbl) || is_mimo(tbl))
+#define is_a_band(tbl) ((tbl) == LQ_A)
+#define is_g_and(tbl) ((tbl) == LQ_G)
+
+#define ANT_NONE        0x0
+#define ANT_A           BIT(0)
+#define ANT_B           BIT(1)
+#define ANT_AB          (ANT_A | ANT_B)
+#define ANT_C           BIT(2)
+#define ANT_AC          (ANT_A | ANT_C)
+#define ANT_BC          (ANT_B | ANT_C)
+#define ANT_ABC         (ANT_AB | ANT_C)
+
+#define IL_MAX_MCS_DISPLAY_SIZE 12
+
+struct il_rate_mcs_info {
+        char mbps[IL_MAX_MCS_DISPLAY_SIZE];
+        char mcs[IL_MAX_MCS_DISPLAY_SIZE];
+};
+
+/**
+ * struct il_rate_scale_data -- tx success history for one rate
+ */
+struct il_rate_scale_data {
+        u64 data;               /* bitmap of successful frames */
+        s32 success_counter;    /* number of frames successful */
+        s32 success_ratio;      /* per-cent * 128  */
+        s32 counter;            /* number of frames attempted */
+        s32 average_tpt;        /* success ratio * expected throughput */
+        unsigned long stamp;
+};
+
+/**
+ * struct il_scale_tbl_info -- tx params and success history for all rates
+ *
+ * There are two of these in struct il_lq_sta,
+ * one for "active", and one for "search".
+ */
+struct il_scale_tbl_info {
+        enum il_table_type lq_type;
+        u8 ant_type;
+        u8 is_SGI;              /* 1 = short guard interval */
+        u8 is_ht40;             /* 1 = 40 MHz channel width */
+        u8 is_dup;              /* 1 = duplicated data streams */
+        u8 action;              /* change modulation; IL_[LEGACY/SISO/MIMO]_SWITCH_* */
+        u8 max_search;          /* maximun number of tables we can search */
+        s32 *expected_tpt;      /* throughput metrics; expected_tpt_G, etc. */
+        u32 current_rate;       /* rate_n_flags, uCode API format */
+        struct il_rate_scale_data win[RATE_COUNT];      /* rate histories */
+};
+
+struct il_traffic_load {
+        unsigned long time_stamp;       /* age of the oldest stats */
+        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 */
+};
+
+/**
+ * struct il_lq_sta -- driver's rate scaling ilate structure
+ *
+ * Pointer to this gets passed back and forth between driver and mac80211.
+ */
+struct il_lq_sta {
+        u8 active_tbl;          /* idx of active table, range 0-1 */
+        u8 enable_counter;      /* indicates HT mode */
+        u8 stay_in_tbl;         /* 1: disallow, 0: allow search for new mode */
+        u8 search_better_tbl;   /* 1: currently trying alternate mode */
+        s32 last_tpt;
+
+        /* The following determine when to search for a new mode */
+        u32 table_count_limit;
+        u32 max_failure_limit;  /* # failed frames before new search */
+        u32 max_success_limit;  /* # successful frames before new search */
+        u32 table_count;
+        u32 total_failed;       /* total failed frames, any/all rates */
+        u32 total_success;      /* total successful frames, any/all rates */
+        u64 flush_timer;        /* time staying in mode before new search */
+
+        u8 action_counter;      /* # mode-switch actions tried */
+        u8 is_green;
+        u8 is_dup;
+        enum ieee80211_band band;
+
+        /* The following are bitmaps of rates; RATE_6M_MASK, etc. */
+        u32 supp_rates;
+        u16 active_legacy_rate;
+        u16 active_siso_rate;
+        u16 active_mimo2_rate;
+        s8 max_rate_idx;        /* Max rate set by user */
+        u8 missed_rate_counter;
+
+        struct il_link_quality_cmd lq;
+        struct il_scale_tbl_info lq_info[LQ_SIZE];      /* "active", "search" */
+        struct il_traffic_load load[TID_MAX_LOAD_COUNT];
+        u8 tx_agg_tid_en;
+#ifdef CONFIG_MAC80211_DEBUGFS
+        struct dentry *rs_sta_dbgfs_scale_table_file;
+        struct dentry *rs_sta_dbgfs_stats_table_file;
+        struct dentry *rs_sta_dbgfs_rate_scale_data_file;
+        struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;
+        u32 dbg_fixed_rate;
+#endif
+        struct il_priv *drv;
+
+        /* used to be in sta_info */
+        int last_txrate_idx;
+        /* last tx rate_n_flags */
+        u32 last_rate_n_flags;
+        /* packets destined for this STA are aggregated */
+        u8 is_agg;
+};
+
+/*
+ * il_station_priv: Driver's ilate station information
+ *
+ * When mac80211 creates a station it reserves some space (hw->sta_data_size)
+ * in the structure for use by driver. This structure is places in that
+ * space.
+ *
+ * The common struct MUST be first because it is shared between
+ * 3945 and 4965!
+ */
+struct il_station_priv {
+        struct il_station_priv_common common;
+        struct il_lq_sta lq_sta;
+        atomic_t pending_frames;
+        bool client;
+        bool asleep;
+};
+
+static inline u8
+il4965_num_of_ant(u8 m)
+{
+        return !!(m & ANT_A) + !!(m & ANT_B) + !!(m & ANT_C);
+}
+
+static inline u8
+il4965_first_antenna(u8 mask)
+{
+        if (mask & ANT_A)
+                return ANT_A;
+        if (mask & ANT_B)
+                return ANT_B;
+        return ANT_C;
+}
+
+/**
+ * il3945_rate_scale_init - Initialize the rate scale table based on assoc info
+ *
+ * The specific throughput table used is based on the type of network
+ * the associated with, including A, B, G, and G w/ TGG protection
+ */
+extern void il3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id);
+
+/* Initialize station's rate scaling information after adding station */
+extern void il4965_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta,
+                                u8 sta_id);
+extern void il3945_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta,
+                                u8 sta_id);
+
+/**
+ * il_rate_control_register - Register the rate control algorithm callbacks
+ *
+ * Since the rate control algorithm is hardware specific, there is no need
+ * or reason to place it as a stand alone module.  The driver can call
+ * il_rate_control_register in order to register the rate control callbacks
+ * with the mac80211 subsystem.  This should be performed prior to calling
+ * ieee80211_register_hw
+ *
+ */
+extern int il4965_rate_control_register(void);
+extern int il3945_rate_control_register(void);
+
+/**
+ * il_rate_control_unregister - Unregister the rate control callbacks
+ *
+ * This should be called after calling ieee80211_unregister_hw, but before
+ * the driver is unloaded.
+ */
+extern void il4965_rate_control_unregister(void);
+extern void il3945_rate_control_unregister(void);
+
+extern int il_power_update_mode(struct il_priv *il, bool force);
+extern void il_power_initialize(struct il_priv *il);
+
+extern u32 il_debug_level;
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+/*
+ * il_get_debug_level: Return active debug level for device
+ *
+ * Using sysfs it is possible to set per device debug level. This debug
+ * level will be used if set, otherwise the global debug level which can be
+ * set via module parameter is used.
+ */
+static inline u32
+il_get_debug_level(struct il_priv *il)
+{
+        if (il->debug_level)
+                return il->debug_level;
+        else
+                return il_debug_level;
+}
+#else
+static inline u32
+il_get_debug_level(struct il_priv *il)
+{
+        return il_debug_level;
+}
+#endif
+
+#define il_print_hex_error(il, p, len)                                  \
+do {                                                                    \
+        print_hex_dump(KERN_ERR, "iwl data: ",                          \
+                       DUMP_PREFIX_OFFSET, 16, 1, p, len, 1);           \
+} while (0)
+
+#ifdef CONFIG_IWLEGACY_DEBUG
+#define IL_DBG(level, fmt, args...)                                     \
+do {                                                                    \
+        if (il_get_debug_level(il) & level)                             \
+                dev_printk(KERN_ERR, &il->hw->wiphy->dev,               \
+                         "%c %s " fmt, in_interrupt() ? 'I' : 'U',      \
+                        __func__ , ## args);                            \
+} while (0)
+
+#define il_print_hex_dump(il, level, p, len)                            \
+do {                                                                    \
+        if (il_get_debug_level(il) & level)                             \
+                print_hex_dump(KERN_DEBUG, "iwl data: ",                \
+                               DUMP_PREFIX_OFFSET, 16, 1, p, len, 1);   \
+} while (0)
+
+#else
+#define IL_DBG(level, fmt, args...)
+static inline void
+il_print_hex_dump(struct il_priv *il, int level, const void *p, u32 len)
+{
+}
+#endif /* CONFIG_IWLEGACY_DEBUG */
+
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+int il_dbgfs_register(struct il_priv *il, const char *name);
+void il_dbgfs_unregister(struct il_priv *il);
+#else
+static inline int
+il_dbgfs_register(struct il_priv *il, const char *name)
+{
+        return 0;
+}
+
+static inline void
+il_dbgfs_unregister(struct il_priv *il)
+{
+}
+#endif /* CONFIG_IWLEGACY_DEBUGFS */
+
+/*
+ * To use the debug system:
+ *
+ * If you are defining a new debug classification, simply add it to the #define
+ * list here in the form of
+ *
+ * #define IL_DL_xxxx VALUE
+ *
+ * where xxxx should be the name of the classification (for example, WEP).
+ *
+ * You then need to either add a IL_xxxx_DEBUG() macro definition for your
+ * classification, or use IL_DBG(IL_DL_xxxx, ...) whenever you want
+ * to send output to that classification.
+ *
+ * The active debug levels can be accessed via files
+ *
+ *      /sys/module/iwl4965/parameters/debug
+ *      /sys/module/iwl3945/parameters/debug
+ *      /sys/class/net/wlan0/device/debug_level
+ *
+ * when CONFIG_IWLEGACY_DEBUG=y.
+ */
+
+/* 0x0000000F - 0x00000001 */
+#define IL_DL_INFO              (1 << 0)
+#define IL_DL_MAC80211          (1 << 1)
+#define IL_DL_HCMD              (1 << 2)
+#define IL_DL_STATE             (1 << 3)
+/* 0x000000F0 - 0x00000010 */
+#define IL_DL_MACDUMP           (1 << 4)
+#define IL_DL_HCMD_DUMP         (1 << 5)
+#define IL_DL_EEPROM            (1 << 6)
+#define IL_DL_RADIO             (1 << 7)
+/* 0x00000F00 - 0x00000100 */
+#define IL_DL_POWER             (1 << 8)
+#define IL_DL_TEMP              (1 << 9)
+#define IL_DL_NOTIF             (1 << 10)
+#define IL_DL_SCAN              (1 << 11)
+/* 0x0000F000 - 0x00001000 */
+#define IL_DL_ASSOC             (1 << 12)
+#define IL_DL_DROP              (1 << 13)
+#define IL_DL_TXPOWER           (1 << 14)
+#define IL_DL_AP                (1 << 15)
+/* 0x000F0000 - 0x00010000 */
+#define IL_DL_FW                (1 << 16)
+#define IL_DL_RF_KILL           (1 << 17)
+#define IL_DL_FW_ERRORS         (1 << 18)
+#define IL_DL_LED               (1 << 19)
+/* 0x00F00000 - 0x00100000 */
+#define IL_DL_RATE              (1 << 20)
+#define IL_DL_CALIB             (1 << 21)
+#define IL_DL_WEP               (1 << 22)
+#define IL_DL_TX                (1 << 23)
+/* 0x0F000000 - 0x01000000 */
+#define IL_DL_RX                (1 << 24)
+#define IL_DL_ISR               (1 << 25)
+#define IL_DL_HT                (1 << 26)
+/* 0xF0000000 - 0x10000000 */
+#define IL_DL_11H               (1 << 28)
+#define IL_DL_STATS             (1 << 29)
+#define IL_DL_TX_REPLY          (1 << 30)
+#define IL_DL_QOS               (1 << 31)
+
+#define D_INFO(f, a...)         IL_DBG(IL_DL_INFO, f, ## a)
+#define D_MAC80211(f, a...)     IL_DBG(IL_DL_MAC80211, f, ## a)
+#define D_MACDUMP(f, a...)      IL_DBG(IL_DL_MACDUMP, f, ## a)
+#define D_TEMP(f, a...)         IL_DBG(IL_DL_TEMP, f, ## a)
+#define D_SCAN(f, a...)         IL_DBG(IL_DL_SCAN, f, ## a)
+#define D_RX(f, a...)           IL_DBG(IL_DL_RX, f, ## a)
+#define D_TX(f, a...)           IL_DBG(IL_DL_TX, f, ## a)
+#define D_ISR(f, a...)          IL_DBG(IL_DL_ISR, f, ## a)
+#define D_LED(f, a...)          IL_DBG(IL_DL_LED, f, ## a)
+#define D_WEP(f, a...)          IL_DBG(IL_DL_WEP, f, ## a)
+#define D_HC(f, a...)           IL_DBG(IL_DL_HCMD, f, ## a)
+#define D_HC_DUMP(f, a...)      IL_DBG(IL_DL_HCMD_DUMP, f, ## a)
+#define D_EEPROM(f, a...)       IL_DBG(IL_DL_EEPROM, f, ## a)
+#define D_CALIB(f, a...)        IL_DBG(IL_DL_CALIB, f, ## a)
+#define D_FW(f, a...)           IL_DBG(IL_DL_FW, f, ## a)
+#define D_RF_KILL(f, a...)      IL_DBG(IL_DL_RF_KILL, f, ## a)
+#define D_DROP(f, a...)         IL_DBG(IL_DL_DROP, f, ## a)
+#define D_AP(f, a...)           IL_DBG(IL_DL_AP, f, ## a)
+#define D_TXPOWER(f, a...)      IL_DBG(IL_DL_TXPOWER, f, ## a)
+#define D_RATE(f, a...)         IL_DBG(IL_DL_RATE, f, ## a)
+#define D_NOTIF(f, a...)        IL_DBG(IL_DL_NOTIF, f, ## a)
+#define D_ASSOC(f, a...)        IL_DBG(IL_DL_ASSOC, f, ## a)
+#define D_HT(f, a...)           IL_DBG(IL_DL_HT, f, ## a)
+#define D_STATS(f, a...)        IL_DBG(IL_DL_STATS, f, ## a)
+#define D_TX_REPLY(f, a...)     IL_DBG(IL_DL_TX_REPLY, f, ## a)
+#define D_QOS(f, a...)          IL_DBG(IL_DL_QOS, f, ## a)
+#define D_RADIO(f, a...)        IL_DBG(IL_DL_RADIO, f, ## a)
+#define D_POWER(f, a...)        IL_DBG(IL_DL_POWER, f, ## a)
+#define D_11H(f, a...)          IL_DBG(IL_DL_11H, f, ## a)
+
+#endif /* __il_core_h__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-csr.h b/drivers/net/wireless/iwlegacy/csr.h
index 668a9616c269..9138e15004fa 100644
--- a/drivers/net/wireless/iwlegacy/iwl-csr.h
+++ b/drivers/net/wireless/iwlegacy/csr.h
@@ -60,8 +60,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *****************************************************************************/
-#ifndef __iwl_legacy_csr_h__
-#define __iwl_legacy_csr_h__
+#ifndef __il_csr_h__
+#define __il_csr_h__
 /*
  * CSR (control and status registers)
  *
@@ -70,9 +70,9 @@
  * low power states due to driver-invoked device resets
  * (e.g. CSR_RESET_REG_FLAG_SW_RESET) or uCode-driven power-saving modes.
  *
- * Use iwl_write32() and iwl_read32() family to access these registers;
+ * Use _il_wr() and _il_rd() family to access these registers;
  * these provide simple PCI bus access, without waking up the MAC.
- * Do not use iwl_legacy_write_direct32() family for these registers;
+ * Do not use il_wr() family for these registers;
  * no need to "grab nic access" via CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ.
  * The MAC (uCode processor, etc.) does not need to be powered up for accessing
  * the CSR registers.
@@ -82,16 +82,16 @@
  */
 #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_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)
 
-/* 2nd byte of CSR_INT_COALESCING, not accessible via iwl_write32()! */
+/* 2nd byte of CSR_INT_COALESCING, not accessible via _il_wr()! */
 #define CSR_INT_PERIODIC_REG    (CSR_BASE+0x005)
 
 /*
@@ -166,26 +166,26 @@
 
 #define CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A   (0x00080000)
 #define CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM (0x00200000)
-#define CSR_HW_IF_CONFIG_REG_BIT_NIC_READY      (0x00400000) /* PCI_OWN_SEM */
-#define CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE (0x02000000) /* ME_OWN */
-#define CSR_HW_IF_CONFIG_REG_PREPARE              (0x08000000) /* WAKE_ME */
+#define CSR_HW_IF_CONFIG_REG_BIT_NIC_READY      (0x00400000)    /* PCI_OWN_SEM */
+#define CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE (0x02000000)  /* ME_OWN */
+#define CSR_HW_IF_CONFIG_REG_PREPARE              (0x08000000)  /* WAKE_ME */
 
-#define CSR_INT_PERIODIC_DIS                    (0x00) /* disable periodic int*/
-#define CSR_INT_PERIODIC_ENA                    (0xFF) /* 255*32 usec ~ 8 msec*/
+#define CSR_INT_PERIODIC_DIS                    (0x00)  /* disable periodic int */
+#define CSR_INT_PERIODIC_ENA                    (0xFF)  /* 255*32 usec ~ 8 msec */
 
 /* 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_RX_PERIODIC  (1 << 28) /* Rx periodic */
-#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_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_RX_PERIODIC  (1 << 28)      /* Rx periodic */
+#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  | \
@@ -197,21 +197,20 @@
                                  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 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)
@@ -285,7 +284,6 @@
 #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)
@@ -293,19 +291,18 @@
 #define CSR_EEPROM_REG_MSK_DATA         (0xFFFF0000)
 
 /* EEPROM GP */
-#define CSR_EEPROM_GP_VALID_MSK         (0x00000007) /* signature */
+#define CSR_EEPROM_GP_VALID_MSK         (0x00000007)    /* signature */
 #define CSR_EEPROM_GP_IF_OWNER_MSK      (0x00000180)
 #define CSR_EEPROM_GP_GOOD_SIG_EEP_LESS_THAN_4K         (0x00000002)
 #define CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K         (0x00000004)
 
 /* GP REG */
-#define CSR_GP_REG_POWER_SAVE_STATUS_MSK            (0x03000000) /* bit 24/25 */
+#define CSR_GP_REG_POWER_SAVE_STATUS_MSK            (0x03000000)        /* bit 24/25 */
 #define CSR_GP_REG_NO_POWER_SAVE            (0x00000000)
 #define CSR_GP_REG_MAC_POWER_SAVE           (0x01000000)
 #define CSR_GP_REG_PHY_POWER_SAVE           (0x02000000)
 #define CSR_GP_REG_POWER_SAVE_ERROR         (0x03000000)
 
-
 /* CSR GIO */
 #define CSR_GIO_REG_VAL_L0S_ENABLED     (0x00000002)
 
@@ -357,7 +354,7 @@
 /* HPET MEM debug */
 #define CSR_DBG_HPET_MEM_REG_VAL        (0xFFFF0000)
 
-/* DRAM INT TABLE */
+/* DRAM INT TBL */
 #define CSR_DRAM_INT_TBL_ENABLE         (1 << 31)
 #define CSR_DRAM_INIT_TBL_WRAP_CHECK    (1 << 27)
 
@@ -368,13 +365,13 @@
  * to indirectly access device's internal memory or registers that
  * may be powered-down.
  *
- * Use iwl_legacy_write_direct32()/iwl_legacy_read_direct32() family
+ * Use il_wr()/il_rd() family
  * for these registers;
  * host must "grab nic access" via CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ
  * to make sure the MAC (uCode processor, etc.) is powered up for accessing
  * internal resources.
  *
- * Do not use iwl_write32()/iwl_read32() family to access these registers;
+ * Do not use _il_wr()/_il_rd() family to access these registers;
  * these provide only simple PCI bus access, without waking up the MAC.
  */
 #define HBUS_BASE       (0x400)
@@ -411,12 +408,12 @@
 #define HBUS_TARG_PRPH_RDAT     (HBUS_BASE+0x050)
 
 /*
- * Per-Tx-queue write pointer (index, really!)
- * Indicates index to next TFD that driver will fill (1 past latest filled).
+ * Per-Tx-queue write pointer (idx, really!)
+ * Indicates idx to next TFD that driver will fill (1 past latest filled).
  * Bit usage:
- *  0-7:  queue write index
+ *  0-7:  queue write idx
  * 11-8:  queue selector
  */
 #define HBUS_TARG_WRPTR         (HBUS_BASE+0x060)
 
-#endif /* !__iwl_legacy_csr_h__ */
+#endif /* !__il_csr_h__ */
diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/iwlegacy/debug.c
new file mode 100644
index 000000000000..b1b8926a9c7b
--- /dev/null
+++ b/drivers/net/wireless/iwlegacy/debug.c
@@ -0,0 +1,1411 @@
+/******************************************************************************
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2011 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:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *****************************************************************************/
+#include <linux/ieee80211.h>
+#include <linux/export.h>
+#include <net/mac80211.h>
+
+#include "common.h"
+
+/* create and remove of files */
+#define DEBUGFS_ADD_FILE(name, parent, mode) do {                       \
+        if (!debugfs_create_file(#name, mode, parent, il,               \
+                         &il_dbgfs_##name##_ops))               \
+                goto err;                                               \
+} while (0)
+
+#define DEBUGFS_ADD_BOOL(name, parent, ptr) do {                        \
+        struct dentry *__tmp;                                           \
+        __tmp = debugfs_create_bool(#name, S_IWUSR | S_IRUSR,           \
+                                    parent, ptr);                       \
+        if (IS_ERR(__tmp) || !__tmp)                                    \
+                goto err;                                               \
+} while (0)
+
+#define DEBUGFS_ADD_X32(name, parent, ptr) do {                         \
+        struct dentry *__tmp;                                           \
+        __tmp = debugfs_create_x32(#name, S_IWUSR | S_IRUSR,            \
+                                   parent, ptr);                        \
+        if (IS_ERR(__tmp) || !__tmp)                                    \
+                goto err;                                               \
+} while (0)
+
+/* file operation */
+#define DEBUGFS_READ_FUNC(name)                                         \
+static ssize_t il_dbgfs_##name##_read(struct file *file,               \
+                                        char __user *user_buf,          \
+                                        size_t count, loff_t *ppos);
+
+#define DEBUGFS_WRITE_FUNC(name)                                        \
+static ssize_t il_dbgfs_##name##_write(struct file *file,              \
+                                        const char __user *user_buf,    \
+                                        size_t count, loff_t *ppos);
+
+static int
+il_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 il_dbgfs_##name##_ops = {   \
+        .read = il_dbgfs_##name##_read,                         \
+        .open = il_dbgfs_open_file_generic,                     \
+        .llseek = generic_file_llseek,                          \
+};
+
+#define DEBUGFS_WRITE_FILE_OPS(name)                            \
+        DEBUGFS_WRITE_FUNC(name);                               \
+static const struct file_operations il_dbgfs_##name##_ops = {   \
+        .write = il_dbgfs_##name##_write,                       \
+        .open = il_dbgfs_open_file_generic,                     \
+        .llseek = generic_file_llseek,                          \
+};
+
+#define DEBUGFS_READ_WRITE_FILE_OPS(name)                       \
+        DEBUGFS_READ_FUNC(name);                                \
+        DEBUGFS_WRITE_FUNC(name);                               \
+static const struct file_operations il_dbgfs_##name##_ops = {   \
+        .write = il_dbgfs_##name##_write,                       \
+        .read = il_dbgfs_##name##_read,                         \
+        .open = il_dbgfs_open_file_generic,                     \
+        .llseek = generic_file_llseek,                          \
+};
+
+static ssize_t
+il_dbgfs_tx_stats_read(struct file *file, char __user *user_buf, size_t count,
+                       loff_t *ppos)
+{
+
+        struct il_priv *il = file->private_data;
+        char *buf;
+        int pos = 0;
+
+        int cnt;
+        ssize_t ret;
+        const size_t bufsz =
+            100 + sizeof(char) * 50 * (MANAGEMENT_MAX + CONTROL_MAX);
+        buf = kzalloc(bufsz, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+        pos += scnprintf(buf + pos, bufsz - pos, "Management:\n");
+        for (cnt = 0; cnt < MANAGEMENT_MAX; cnt++) {
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos, "\t%25s\t\t: %u\n",
+                              il_get_mgmt_string(cnt), il->tx_stats.mgmt[cnt]);
+        }
+        pos += scnprintf(buf + pos, bufsz - pos, "Control\n");
+        for (cnt = 0; cnt < CONTROL_MAX; cnt++) {
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos, "\t%25s\t\t: %u\n",
+                              il_get_ctrl_string(cnt), il->tx_stats.ctrl[cnt]);
+        }
+        pos += scnprintf(buf + pos, bufsz - pos, "Data:\n");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "\tcnt: %u\n",
+                      il->tx_stats.data_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "\tbytes: %llu\n",
+                      il->tx_stats.data_bytes);
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
+
+static ssize_t
+il_dbgfs_clear_traffic_stats_write(struct file *file,
+                                   const char __user *user_buf, size_t count,
+                                   loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        u32 clear_flag;
+        char buf[8];
+        int buf_size;
+
+        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", &clear_flag) != 1)
+                return -EFAULT;
+        il_clear_traffic_stats(il);
+
+        return count;
+}
+
+static ssize_t
+il_dbgfs_rx_stats_read(struct file *file, char __user *user_buf, size_t count,
+                       loff_t *ppos)
+{
+
+        struct il_priv *il = file->private_data;
+        char *buf;
+        int pos = 0;
+        int cnt;
+        ssize_t ret;
+        const size_t bufsz =
+            100 + sizeof(char) * 50 * (MANAGEMENT_MAX + CONTROL_MAX);
+        buf = kzalloc(bufsz, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        pos += scnprintf(buf + pos, bufsz - pos, "Management:\n");
+        for (cnt = 0; cnt < MANAGEMENT_MAX; cnt++) {
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos, "\t%25s\t\t: %u\n",
+                              il_get_mgmt_string(cnt), il->rx_stats.mgmt[cnt]);
+        }
+        pos += scnprintf(buf + pos, bufsz - pos, "Control:\n");
+        for (cnt = 0; cnt < CONTROL_MAX; cnt++) {
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos, "\t%25s\t\t: %u\n",
+                              il_get_ctrl_string(cnt), il->rx_stats.ctrl[cnt]);
+        }
+        pos += scnprintf(buf + pos, bufsz - pos, "Data:\n");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "\tcnt: %u\n",
+                      il->rx_stats.data_cnt);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "\tbytes: %llu\n",
+                      il->rx_stats.data_bytes);
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
+
+#define BYTE1_MASK 0x000000ff;
+#define BYTE2_MASK 0x0000ffff;
+#define BYTE3_MASK 0x00ffffff;
+static ssize_t
+il_dbgfs_sram_read(struct file *file, char __user *user_buf, size_t count,
+                   loff_t *ppos)
+{
+        u32 val;
+        char *buf;
+        ssize_t ret;
+        int i;
+        int pos = 0;
+        struct il_priv *il = file->private_data;
+        size_t bufsz;
+
+        /* default is to dump the entire data segment */
+        if (!il->dbgfs_sram_offset && !il->dbgfs_sram_len) {
+                il->dbgfs_sram_offset = 0x800000;
+                if (il->ucode_type == UCODE_INIT)
+                        il->dbgfs_sram_len = il->ucode_init_data.len;
+                else
+                        il->dbgfs_sram_len = il->ucode_data.len;
+        }
+        bufsz = 30 + il->dbgfs_sram_len * sizeof(char) * 10;
+        buf = kmalloc(bufsz, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "sram_len: 0x%x\n",
+                      il->dbgfs_sram_len);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "sram_offset: 0x%x\n",
+                      il->dbgfs_sram_offset);
+        for (i = il->dbgfs_sram_len; i > 0; i -= 4) {
+                val =
+                    il_read_targ_mem(il,
+                                     il->dbgfs_sram_offset +
+                                     il->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;
+                        }
+                }
+                if (!(i % 16))
+                        pos += scnprintf(buf + pos, bufsz - pos, "\n");
+                pos += scnprintf(buf + pos, bufsz - pos, "0x%08x ", val);
+        }
+        pos += scnprintf(buf + pos, bufsz - pos, "\n");
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
+
+static ssize_t
+il_dbgfs_sram_write(struct file *file, const char __user *user_buf,
+                    size_t count, loff_t *ppos)
+{
+        struct il_priv *il = 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) {
+                il->dbgfs_sram_offset = offset;
+                il->dbgfs_sram_len = len;
+        } else {
+                il->dbgfs_sram_offset = 0;
+                il->dbgfs_sram_len = 0;
+        }
+
+        return count;
+}
+
+static ssize_t
+il_dbgfs_stations_read(struct file *file, char __user *user_buf, size_t count,
+                       loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        struct il_station_entry *station;
+        int max_sta = il->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 * (il->num_stations);
+
+        buf = kmalloc(bufsz, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "num of stations: %d\n\n",
+                      il->num_stations);
+
+        for (i = 0; i < max_sta; i++) {
+                station = &il->stations[i];
+                if (!station->used)
+                        continue;
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos,
+                              "station %d - addr: %pM, flags: %#x\n", i,
+                              station->sta.sta.addr,
+                              station->sta.station_flags_msk);
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos,
+                              "TID\tseq_num\ttxq_id\tframes\ttfds\t");
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos,
+                              "start_idx\tbitmap\t\t\trate_n_flags\n");
+
+                for (j = 0; j < MAX_TID_COUNT; j++) {
+                        pos +=
+                            scnprintf(buf + pos, bufsz - pos,
+                                      "%d:\t%#x\t%#x\t%u\t%u\t%u\t\t%#.16llx\t%#x",
+                                      j, station->tid[j].seq_number,
+                                      station->tid[j].agg.txq_id,
+                                      station->tid[j].agg.frame_count,
+                                      station->tid[j].tfds_in_queue,
+                                      station->tid[j].agg.start_idx,
+                                      station->tid[j].agg.bitmap,
+                                      station->tid[j].agg.rate_n_flags);
+
+                        if (station->tid[j].agg.wait_for_ba)
+                                pos +=
+                                    scnprintf(buf + pos, bufsz - pos,
+                                              " - waitforba");
+                        pos += scnprintf(buf + pos, bufsz - pos, "\n");
+                }
+
+                pos += scnprintf(buf + pos, bufsz - pos, "\n");
+        }
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
+
+static ssize_t
+il_dbgfs_nvm_read(struct file *file, char __user *user_buf, size_t count,
+                  loff_t *ppos)
+{
+        ssize_t ret;
+        struct il_priv *il = file->private_data;
+        int pos = 0, ofs = 0, buf_size = 0;
+        const u8 *ptr;
+        char *buf;
+        u16 eeprom_ver;
+        size_t eeprom_len = il->cfg->base_params->eeprom_size;
+        buf_size = 4 * eeprom_len + 256;
+
+        if (eeprom_len % 16) {
+                IL_ERR("NVM size is not multiple of 16.\n");
+                return -ENODATA;
+        }
+
+        ptr = il->eeprom;
+        if (!ptr) {
+                IL_ERR("Invalid EEPROM memory\n");
+                return -ENOMEM;
+        }
+
+        /* 4 characters for byte 0xYY */
+        buf = kzalloc(buf_size, GFP_KERNEL);
+        if (!buf) {
+                IL_ERR("Can not allocate Buffer\n");
+                return -ENOMEM;
+        }
+        eeprom_ver = il_eeprom_query16(il, EEPROM_VERSION);
+        pos +=
+            scnprintf(buf + pos, buf_size - pos, "EEPROM " "version: 0x%x\n",
+                      eeprom_ver);
+        for (ofs = 0; ofs < eeprom_len; ofs += 16) {
+                pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x ", ofs);
+                hex_dump_to_buffer(ptr + ofs, 16, 16, 2, buf + pos,
+                                   buf_size - pos, 0);
+                pos += strlen(buf + pos);
+                if (buf_size - pos > 0)
+                        buf[pos++] = '\n';
+        }
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
+
+static ssize_t
+il_dbgfs_channels_read(struct file *file, char __user *user_buf, size_t count,
+                       loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        struct ieee80211_channel *channels = NULL;
+        const struct ieee80211_supported_band *supp_band = NULL;
+        int pos = 0, i, bufsz = PAGE_SIZE;
+        char *buf;
+        ssize_t ret;
+
+        if (!test_bit(S_GEO_CONFIGURED, &il->status))
+                return -EAGAIN;
+
+        buf = kzalloc(bufsz, GFP_KERNEL);
+        if (!buf) {
+                IL_ERR("Can not allocate Buffer\n");
+                return -ENOMEM;
+        }
+
+        supp_band = il_get_hw_mode(il, IEEE80211_BAND_2GHZ);
+        if (supp_band) {
+                channels = supp_band->channels;
+
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos,
+                              "Displaying %d channels in 2.4GHz band 802.11bg):\n",
+                              supp_band->n_channels);
+
+                for (i = 0; i < supp_band->n_channels; i++)
+                        pos +=
+                            scnprintf(buf + pos, bufsz - pos,
+                                      "%d: %ddBm: BSS%s%s, %s.\n",
+                                      channels[i].hw_value,
+                                      channels[i].max_power,
+                                      channels[i].
+                                      flags & IEEE80211_CHAN_RADAR ?
+                                      " (IEEE 802.11h required)" : "",
+                                      ((channels[i].
+                                        flags & IEEE80211_CHAN_NO_IBSS) ||
+                                       (channels[i].
+                                        flags & IEEE80211_CHAN_RADAR)) ? "" :
+                                      ", IBSS",
+                                      channels[i].
+                                      flags & IEEE80211_CHAN_PASSIVE_SCAN ?
+                                      "passive only" : "active/passive");
+        }
+        supp_band = il_get_hw_mode(il, IEEE80211_BAND_5GHZ);
+        if (supp_band) {
+                channels = supp_band->channels;
+
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos,
+                              "Displaying %d channels in 5.2GHz band (802.11a)\n",
+                              supp_band->n_channels);
+
+                for (i = 0; i < supp_band->n_channels; i++)
+                        pos +=
+                            scnprintf(buf + pos, bufsz - pos,
+                                      "%d: %ddBm: BSS%s%s, %s.\n",
+                                      channels[i].hw_value,
+                                      channels[i].max_power,
+                                      channels[i].
+                                      flags & IEEE80211_CHAN_RADAR ?
+                                      " (IEEE 802.11h required)" : "",
+                                      ((channels[i].
+                                        flags & IEEE80211_CHAN_NO_IBSS) ||
+                                       (channels[i].
+                                        flags & IEEE80211_CHAN_RADAR)) ? "" :
+                                      ", IBSS",
+                                      channels[i].
+                                      flags & IEEE80211_CHAN_PASSIVE_SCAN ?
+                                      "passive only" : "active/passive");
+        }
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
+
+static ssize_t
+il_dbgfs_status_read(struct file *file, char __user *user_buf, size_t count,
+                     loff_t *ppos)
+{
+
+        struct il_priv *il = file->private_data;
+        char buf[512];
+        int pos = 0;
+        const size_t bufsz = sizeof(buf);
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "S_HCMD_ACTIVE:\t %d\n",
+                      test_bit(S_HCMD_ACTIVE, &il->status));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "S_INT_ENABLED:\t %d\n",
+                      test_bit(S_INT_ENABLED, &il->status));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "S_RF_KILL_HW:\t %d\n",
+                      test_bit(S_RF_KILL_HW, &il->status));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "S_CT_KILL:\t\t %d\n",
+                      test_bit(S_CT_KILL, &il->status));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "S_INIT:\t\t %d\n",
+                      test_bit(S_INIT, &il->status));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "S_ALIVE:\t\t %d\n",
+                      test_bit(S_ALIVE, &il->status));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "S_READY:\t\t %d\n",
+                      test_bit(S_READY, &il->status));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "S_TEMPERATURE:\t %d\n",
+                      test_bit(S_TEMPERATURE, &il->status));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "S_GEO_CONFIGURED:\t %d\n",
+                      test_bit(S_GEO_CONFIGURED, &il->status));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "S_EXIT_PENDING:\t %d\n",
+                      test_bit(S_EXIT_PENDING, &il->status));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "S_STATS:\t %d\n",
+                      test_bit(S_STATS, &il->status));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "S_SCANNING:\t %d\n",
+                      test_bit(S_SCANNING, &il->status));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "S_SCAN_ABORTING:\t %d\n",
+                      test_bit(S_SCAN_ABORTING, &il->status));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "S_SCAN_HW:\t\t %d\n",
+                      test_bit(S_SCAN_HW, &il->status));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "S_POWER_PMI:\t %d\n",
+                      test_bit(S_POWER_PMI, &il->status));
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "S_FW_ERROR:\t %d\n",
+                      test_bit(S_FW_ERROR, &il->status));
+        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+}
+
+static ssize_t
+il_dbgfs_interrupt_read(struct file *file, char __user *user_buf, size_t count,
+                        loff_t *ppos)
+{
+
+        struct il_priv *il = file->private_data;
+        int pos = 0;
+        int cnt = 0;
+        char *buf;
+        int bufsz = 24 * 64;    /* 24 items * 64 char per item */
+        ssize_t ret;
+
+        buf = kzalloc(bufsz, GFP_KERNEL);
+        if (!buf) {
+                IL_ERR("Can not allocate Buffer\n");
+                return -ENOMEM;
+        }
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "Interrupt Statistics Report:\n");
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "HW Error:\t\t\t %u\n",
+                      il->isr_stats.hw);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "SW Error:\t\t\t %u\n",
+                      il->isr_stats.sw);
+        if (il->isr_stats.sw || il->isr_stats.hw) {
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos,
+                              "\tLast Restarting Code:  0x%X\n",
+                              il->isr_stats.err_code);
+        }
+#ifdef CONFIG_IWLEGACY_DEBUG
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "Frame transmitted:\t\t %u\n",
+                      il->isr_stats.sch);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "Alive interrupt:\t\t %u\n",
+                      il->isr_stats.alive);
+#endif
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "HW RF KILL switch toggled:\t %u\n",
+                      il->isr_stats.rfkill);
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "CT KILL:\t\t\t %u\n",
+                      il->isr_stats.ctkill);
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "Wakeup Interrupt:\t\t %u\n",
+                      il->isr_stats.wakeup);
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "Rx command responses:\t\t %u\n",
+                      il->isr_stats.rx);
+        for (cnt = 0; cnt < IL_CN_MAX; cnt++) {
+                if (il->isr_stats.handlers[cnt] > 0)
+                        pos +=
+                            scnprintf(buf + pos, bufsz - pos,
+                                      "\tRx handler[%36s]:\t\t %u\n",
+                                      il_get_cmd_string(cnt),
+                                      il->isr_stats.handlers[cnt]);
+        }
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "Tx/FH interrupt:\t\t %u\n",
+                      il->isr_stats.tx);
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "Unexpected INTA:\t\t %u\n",
+                      il->isr_stats.unhandled);
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
+
+static ssize_t
+il_dbgfs_interrupt_write(struct file *file, const char __user *user_buf,
+                         size_t count, loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        char buf[8];
+        int buf_size;
+        u32 reset_flag;
+
+        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", &reset_flag) != 1)
+                return -EFAULT;
+        if (reset_flag == 0)
+                il_clear_isr_stats(il);
+
+        return count;
+}
+
+static ssize_t
+il_dbgfs_qos_read(struct file *file, char __user *user_buf, size_t count,
+                  loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        struct il_rxon_context *ctx = &il->ctx;
+        int pos = 0, i;
+        char buf[256];
+        const size_t bufsz = sizeof(buf);
+
+        pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n", ctx->ctxid);
+        for (i = 0; i < AC_NUM; i++) {
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos,
+                              "\tcw_min\tcw_max\taifsn\ttxop\n");
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos,
+                              "AC[%d]\t%u\t%u\t%u\t%u\n", i,
+                              ctx->qos_data.def_qos_parm.ac[i].cw_min,
+                              ctx->qos_data.def_qos_parm.ac[i].cw_max,
+                              ctx->qos_data.def_qos_parm.ac[i].aifsn,
+                              ctx->qos_data.def_qos_parm.ac[i].edca_txop);
+        }
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+}
+
+static ssize_t
+il_dbgfs_disable_ht40_write(struct file *file, const char __user *user_buf,
+                            size_t count, loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        char buf[8];
+        int buf_size;
+        int ht40;
+
+        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, "%d", &ht40) != 1)
+                return -EFAULT;
+        if (!il_is_any_associated(il))
+                il->disable_ht40 = ht40 ? true : false;
+        else {
+                IL_ERR("Sta associated with AP - "
+                       "Change to 40MHz channel support is not allowed\n");
+                return -EINVAL;
+        }
+
+        return count;
+}
+
+static ssize_t
+il_dbgfs_disable_ht40_read(struct file *file, char __user *user_buf,
+                           size_t count, loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        char buf[100];
+        int pos = 0;
+        const size_t bufsz = sizeof(buf);
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "11n 40MHz Mode: %s\n",
+                      il->disable_ht40 ? "Disabled" : "Enabled");
+        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+}
+
+DEBUGFS_READ_WRITE_FILE_OPS(sram);
+DEBUGFS_READ_FILE_OPS(nvm);
+DEBUGFS_READ_FILE_OPS(stations);
+DEBUGFS_READ_FILE_OPS(channels);
+DEBUGFS_READ_FILE_OPS(status);
+DEBUGFS_READ_WRITE_FILE_OPS(interrupt);
+DEBUGFS_READ_FILE_OPS(qos);
+DEBUGFS_READ_WRITE_FILE_OPS(disable_ht40);
+
+static ssize_t
+il_dbgfs_traffic_log_read(struct file *file, char __user *user_buf,
+                          size_t count, loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        int pos = 0, ofs = 0;
+        int cnt = 0, entry;
+        struct il_tx_queue *txq;
+        struct il_queue *q;
+        struct il_rx_queue *rxq = &il->rxq;
+        char *buf;
+        int bufsz =
+            ((IL_TRAFFIC_ENTRIES * IL_TRAFFIC_ENTRY_SIZE * 64) * 2) +
+            (il->cfg->base_params->num_of_queues * 32 * 8) + 400;
+        const u8 *ptr;
+        ssize_t ret;
+
+        if (!il->txq) {
+                IL_ERR("txq not ready\n");
+                return -EAGAIN;
+        }
+        buf = kzalloc(bufsz, GFP_KERNEL);
+        if (!buf) {
+                IL_ERR("Can not allocate buffer\n");
+                return -ENOMEM;
+        }
+        pos += scnprintf(buf + pos, bufsz - pos, "Tx Queue\n");
+        for (cnt = 0; cnt < il->hw_params.max_txq_num; cnt++) {
+                txq = &il->txq[cnt];
+                q = &txq->q;
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos,
+                              "q[%d]: read_ptr: %u, write_ptr: %u\n", cnt,
+                              q->read_ptr, q->write_ptr);
+        }
+        if (il->tx_traffic && (il_debug_level & IL_DL_TX)) {
+                ptr = il->tx_traffic;
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos, "Tx Traffic idx: %u\n",
+                              il->tx_traffic_idx);
+                for (cnt = 0, ofs = 0; cnt < IL_TRAFFIC_ENTRIES; cnt++) {
+                        for (entry = 0; entry < IL_TRAFFIC_ENTRY_SIZE / 16;
+                             entry++, ofs += 16) {
+                                pos +=
+                                    scnprintf(buf + pos, bufsz - pos, "0x%.4x ",
+                                              ofs);
+                                hex_dump_to_buffer(ptr + ofs, 16, 16, 2,
+                                                   buf + pos, bufsz - pos, 0);
+                                pos += strlen(buf + pos);
+                                if (bufsz - pos > 0)
+                                        buf[pos++] = '\n';
+                        }
+                }
+        }
+
+        pos += scnprintf(buf + pos, bufsz - pos, "Rx Queue\n");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "read: %u, write: %u\n",
+                      rxq->read, rxq->write);
+
+        if (il->rx_traffic && (il_debug_level & IL_DL_RX)) {
+                ptr = il->rx_traffic;
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos, "Rx Traffic idx: %u\n",
+                              il->rx_traffic_idx);
+                for (cnt = 0, ofs = 0; cnt < IL_TRAFFIC_ENTRIES; cnt++) {
+                        for (entry = 0; entry < IL_TRAFFIC_ENTRY_SIZE / 16;
+                             entry++, ofs += 16) {
+                                pos +=
+                                    scnprintf(buf + pos, bufsz - pos, "0x%.4x ",
+                                              ofs);
+                                hex_dump_to_buffer(ptr + ofs, 16, 16, 2,
+                                                   buf + pos, bufsz - pos, 0);
+                                pos += strlen(buf + pos);
+                                if (bufsz - pos > 0)
+                                        buf[pos++] = '\n';
+                        }
+                }
+        }
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
+
+static ssize_t
+il_dbgfs_traffic_log_write(struct file *file, const char __user *user_buf,
+                           size_t count, loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        char buf[8];
+        int buf_size;
+        int traffic_log;
+
+        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, "%d", &traffic_log) != 1)
+                return -EFAULT;
+        if (traffic_log == 0)
+                il_reset_traffic_log(il);
+
+        return count;
+}
+
+static ssize_t
+il_dbgfs_tx_queue_read(struct file *file, char __user *user_buf, size_t count,
+                       loff_t *ppos)
+{
+
+        struct il_priv *il = file->private_data;
+        struct il_tx_queue *txq;
+        struct il_queue *q;
+        char *buf;
+        int pos = 0;
+        int cnt;
+        int ret;
+        const size_t bufsz =
+            sizeof(char) * 64 * il->cfg->base_params->num_of_queues;
+
+        if (!il->txq) {
+                IL_ERR("txq not ready\n");
+                return -EAGAIN;
+        }
+        buf = kzalloc(bufsz, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        for (cnt = 0; cnt < il->hw_params.max_txq_num; cnt++) {
+                txq = &il->txq[cnt];
+                q = &txq->q;
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos,
+                              "hwq %.2d: read=%u write=%u stop=%d"
+                              " swq_id=%#.2x (ac %d/hwq %d)\n", cnt,
+                              q->read_ptr, q->write_ptr,
+                              !!test_bit(cnt, il->queue_stopped),
+                              txq->swq_id, txq->swq_id & 3,
+                              (txq->swq_id >> 2) & 0x1f);
+                if (cnt >= 4)
+                        continue;
+                /* for the ACs, display the stop count too */
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos,
+                              "        stop-count: %d\n",
+                              atomic_read(&il->queue_stop_count[cnt]));
+        }
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
+
+static ssize_t
+il_dbgfs_rx_queue_read(struct file *file, char __user *user_buf, size_t count,
+                       loff_t *ppos)
+{
+
+        struct il_priv *il = file->private_data;
+        struct il_rx_queue *rxq = &il->rxq;
+        char buf[256];
+        int pos = 0;
+        const size_t bufsz = sizeof(buf);
+
+        pos += scnprintf(buf + pos, bufsz - pos, "read: %u\n", rxq->read);
+        pos += scnprintf(buf + pos, bufsz - pos, "write: %u\n", rxq->write);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "free_count: %u\n",
+                      rxq->free_count);
+        if (rxq->rb_stts) {
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos, "closed_rb_num: %u\n",
+                              le16_to_cpu(rxq->rb_stts->
+                                          closed_rb_num) & 0x0FFF);
+        } else {
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos,
+                              "closed_rb_num: Not Allocated\n");
+        }
+        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+}
+
+static ssize_t
+il_dbgfs_ucode_rx_stats_read(struct file *file, char __user *user_buf,
+                             size_t count, loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        return il->cfg->ops->lib->debugfs_ops.rx_stats_read(file, user_buf,
+                                                            count, ppos);
+}
+
+static ssize_t
+il_dbgfs_ucode_tx_stats_read(struct file *file, char __user *user_buf,
+                             size_t count, loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        return il->cfg->ops->lib->debugfs_ops.tx_stats_read(file, user_buf,
+                                                            count, ppos);
+}
+
+static ssize_t
+il_dbgfs_ucode_general_stats_read(struct file *file, char __user *user_buf,
+                                  size_t count, loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        return il->cfg->ops->lib->debugfs_ops.general_stats_read(file, user_buf,
+                                                                 count, ppos);
+}
+
+static ssize_t
+il_dbgfs_sensitivity_read(struct file *file, char __user *user_buf,
+                          size_t count, loff_t *ppos)
+{
+
+        struct il_priv *il = file->private_data;
+        int pos = 0;
+        int cnt = 0;
+        char *buf;
+        int bufsz = sizeof(struct il_sensitivity_data) * 4 + 100;
+        ssize_t ret;
+        struct il_sensitivity_data *data;
+
+        data = &il->sensitivity_data;
+        buf = kzalloc(bufsz, GFP_KERNEL);
+        if (!buf) {
+                IL_ERR("Can not allocate Buffer\n");
+                return -ENOMEM;
+        }
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "auto_corr_ofdm:\t\t\t %u\n",
+                      data->auto_corr_ofdm);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "auto_corr_ofdm_mrc:\t\t %u\n",
+                      data->auto_corr_ofdm_mrc);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "auto_corr_ofdm_x1:\t\t %u\n",
+                      data->auto_corr_ofdm_x1);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "auto_corr_ofdm_mrc_x1:\t\t %u\n",
+                      data->auto_corr_ofdm_mrc_x1);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "auto_corr_cck:\t\t\t %u\n",
+                      data->auto_corr_cck);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "auto_corr_cck_mrc:\t\t %u\n",
+                      data->auto_corr_cck_mrc);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "last_bad_plcp_cnt_ofdm:\t\t %u\n",
+                      data->last_bad_plcp_cnt_ofdm);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "last_fa_cnt_ofdm:\t\t %u\n",
+                      data->last_fa_cnt_ofdm);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "last_bad_plcp_cnt_cck:\t\t %u\n",
+                      data->last_bad_plcp_cnt_cck);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "last_fa_cnt_cck:\t\t %u\n",
+                      data->last_fa_cnt_cck);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "nrg_curr_state:\t\t\t %u\n",
+                      data->nrg_curr_state);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "nrg_prev_state:\t\t\t %u\n",
+                      data->nrg_prev_state);
+        pos += scnprintf(buf + pos, bufsz - pos, "nrg_value:\t\t\t");
+        for (cnt = 0; cnt < 10; cnt++) {
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos, " %u",
+                              data->nrg_value[cnt]);
+        }
+        pos += scnprintf(buf + pos, bufsz - pos, "\n");
+        pos += scnprintf(buf + pos, bufsz - pos, "nrg_silence_rssi:\t\t");
+        for (cnt = 0; cnt < NRG_NUM_PREV_STAT_L; cnt++) {
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos, " %u",
+                              data->nrg_silence_rssi[cnt]);
+        }
+        pos += scnprintf(buf + pos, bufsz - pos, "\n");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "nrg_silence_ref:\t\t %u\n",
+                      data->nrg_silence_ref);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "nrg_energy_idx:\t\t\t %u\n",
+                      data->nrg_energy_idx);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "nrg_silence_idx:\t\t %u\n",
+                      data->nrg_silence_idx);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "nrg_th_cck:\t\t\t %u\n",
+                      data->nrg_th_cck);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "nrg_auto_corr_silence_diff:\t %u\n",
+                      data->nrg_auto_corr_silence_diff);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "num_in_cck_no_fa:\t\t %u\n",
+                      data->num_in_cck_no_fa);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "nrg_th_ofdm:\t\t\t %u\n",
+                      data->nrg_th_ofdm);
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
+
+static ssize_t
+il_dbgfs_chain_noise_read(struct file *file, char __user *user_buf,
+                          size_t count, loff_t *ppos)
+{
+
+        struct il_priv *il = file->private_data;
+        int pos = 0;
+        int cnt = 0;
+        char *buf;
+        int bufsz = sizeof(struct il_chain_noise_data) * 4 + 100;
+        ssize_t ret;
+        struct il_chain_noise_data *data;
+
+        data = &il->chain_noise_data;
+        buf = kzalloc(bufsz, GFP_KERNEL);
+        if (!buf) {
+                IL_ERR("Can not allocate Buffer\n");
+                return -ENOMEM;
+        }
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "active_chains:\t\t\t %u\n",
+                      data->active_chains);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "chain_noise_a:\t\t\t %u\n",
+                      data->chain_noise_a);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "chain_noise_b:\t\t\t %u\n",
+                      data->chain_noise_b);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "chain_noise_c:\t\t\t %u\n",
+                      data->chain_noise_c);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "chain_signal_a:\t\t\t %u\n",
+                      data->chain_signal_a);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "chain_signal_b:\t\t\t %u\n",
+                      data->chain_signal_b);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "chain_signal_c:\t\t\t %u\n",
+                      data->chain_signal_c);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "beacon_count:\t\t\t %u\n",
+                      data->beacon_count);
+
+        pos += scnprintf(buf + pos, bufsz - pos, "disconn_array:\t\t\t");
+        for (cnt = 0; cnt < NUM_RX_CHAINS; cnt++) {
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos, " %u",
+                              data->disconn_array[cnt]);
+        }
+        pos += scnprintf(buf + pos, bufsz - pos, "\n");
+        pos += scnprintf(buf + pos, bufsz - pos, "delta_gain_code:\t\t");
+        for (cnt = 0; cnt < NUM_RX_CHAINS; cnt++) {
+                pos +=
+                    scnprintf(buf + pos, bufsz - pos, " %u",
+                              data->delta_gain_code[cnt]);
+        }
+        pos += scnprintf(buf + pos, bufsz - pos, "\n");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "radio_write:\t\t\t %u\n",
+                      data->radio_write);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "state:\t\t\t\t %u\n",
+                      data->state);
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+        kfree(buf);
+        return ret;
+}
+
+static ssize_t
+il_dbgfs_power_save_status_read(struct file *file, char __user *user_buf,
+                                size_t count, loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        char buf[60];
+        int pos = 0;
+        const size_t bufsz = sizeof(buf);
+        u32 pwrsave_status;
+
+        pwrsave_status =
+            _il_rd(il, CSR_GP_CNTRL) & CSR_GP_REG_POWER_SAVE_STATUS_MSK;
+
+        pos += scnprintf(buf + pos, bufsz - pos, "Power Save Status: ");
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "%s\n",
+                      (pwrsave_status == CSR_GP_REG_NO_POWER_SAVE) ? "none" :
+                      (pwrsave_status == CSR_GP_REG_MAC_POWER_SAVE) ? "MAC" :
+                      (pwrsave_status == CSR_GP_REG_PHY_POWER_SAVE) ? "PHY" :
+                      "error");
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+}
+
+static ssize_t
+il_dbgfs_clear_ucode_stats_write(struct file *file,
+                                 const char __user *user_buf, size_t count,
+                                 loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        char buf[8];
+        int buf_size;
+        int clear;
+
+        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, "%d", &clear) != 1)
+                return -EFAULT;
+
+        /* make request to uCode to retrieve stats information */
+        mutex_lock(&il->mutex);
+        il_send_stats_request(il, CMD_SYNC, true);
+        mutex_unlock(&il->mutex);
+
+        return count;
+}
+
+static ssize_t
+il_dbgfs_rxon_flags_read(struct file *file, char __user *user_buf,
+                         size_t count, loff_t *ppos)
+{
+
+        struct il_priv *il = file->private_data;
+        int len = 0;
+        char buf[20];
+
+        len = sprintf(buf, "0x%04X\n", le32_to_cpu(il->ctx.active.flags));
+        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+static ssize_t
+il_dbgfs_rxon_filter_flags_read(struct file *file, char __user *user_buf,
+                                size_t count, loff_t *ppos)
+{
+
+        struct il_priv *il = file->private_data;
+        int len = 0;
+        char buf[20];
+
+        len =
+            sprintf(buf, "0x%04X\n", le32_to_cpu(il->ctx.active.filter_flags));
+        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+static ssize_t
+il_dbgfs_fh_reg_read(struct file *file, char __user *user_buf, size_t count,
+                     loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        char *buf;
+        int pos = 0;
+        ssize_t ret = -EFAULT;
+
+        if (il->cfg->ops->lib->dump_fh) {
+                ret = pos = il->cfg->ops->lib->dump_fh(il, &buf, true);
+                if (buf) {
+                        ret =
+                            simple_read_from_buffer(user_buf, count, ppos, buf,
+                                                    pos);
+                        kfree(buf);
+                }
+        }
+
+        return ret;
+}
+
+static ssize_t
+il_dbgfs_missed_beacon_read(struct file *file, char __user *user_buf,
+                            size_t count, loff_t *ppos)
+{
+
+        struct il_priv *il = file->private_data;
+        int pos = 0;
+        char buf[12];
+        const size_t bufsz = sizeof(buf);
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "%d\n",
+                      il->missed_beacon_threshold);
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+}
+
+static ssize_t
+il_dbgfs_missed_beacon_write(struct file *file, const char __user *user_buf,
+                             size_t count, loff_t *ppos)
+{
+        struct il_priv *il = file->private_data;
+        char buf[8];
+        int buf_size;
+        int missed;
+
+        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, "%d", &missed) != 1)
+                return -EINVAL;
+
+        if (missed < IL_MISSED_BEACON_THRESHOLD_MIN ||
+            missed > IL_MISSED_BEACON_THRESHOLD_MAX)
+                il->missed_beacon_threshold = IL_MISSED_BEACON_THRESHOLD_DEF;
+        else
+                il->missed_beacon_threshold = missed;
+
+        return count;
+}
+
+static ssize_t
+il_dbgfs_force_reset_read(struct file *file, char __user *user_buf,
+                          size_t count, loff_t *ppos)
+{
+
+        struct il_priv *il = file->private_data;
+        int pos = 0;
+        char buf[300];
+        const size_t bufsz = sizeof(buf);
+        struct il_force_reset *force_reset;
+
+        force_reset = &il->force_reset;
+
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "\tnumber of reset request: %d\n",
+                      force_reset->reset_request_count);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "\tnumber of reset request success: %d\n",
+                      force_reset->reset_success_count);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos,
+                      "\tnumber of reset request reject: %d\n",
+                      force_reset->reset_reject_count);
+        pos +=
+            scnprintf(buf + pos, bufsz - pos, "\treset duration: %lu\n",
+                      force_reset->reset_duration);
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+}
+
+static ssize_t
+il_dbgfs_force_reset_write(struct file *file, const char __user *user_buf,
+                           size_t count, loff_t *ppos)
+{
+
+        int ret;
+        struct il_priv *il = file->private_data;
+
+        ret = il_force_reset(il, true);
+
+        return ret ? ret : count;
+}
+
+static ssize_t
+il_dbgfs_wd_timeout_write(struct file *file, const char __user *user_buf,
+                          size_t count, loff_t *ppos)
+{
+
+        struct il_priv *il = file->private_data;
+        char buf[8];
+        int buf_size;
+        int timeout;
+
+        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, "%d", &timeout) != 1)
+                return -EINVAL;
+        if (timeout < 0 || timeout > IL_MAX_WD_TIMEOUT)
+                timeout = IL_DEF_WD_TIMEOUT;
+
+        il->cfg->base_params->wd_timeout = timeout;
+        il_setup_watchdog(il);
+        return count;
+}
+
+DEBUGFS_READ_FILE_OPS(rx_stats);
+DEBUGFS_READ_FILE_OPS(tx_stats);
+DEBUGFS_READ_WRITE_FILE_OPS(traffic_log);
+DEBUGFS_READ_FILE_OPS(rx_queue);
+DEBUGFS_READ_FILE_OPS(tx_queue);
+DEBUGFS_READ_FILE_OPS(ucode_rx_stats);
+DEBUGFS_READ_FILE_OPS(ucode_tx_stats);
+DEBUGFS_READ_FILE_OPS(ucode_general_stats);
+DEBUGFS_READ_FILE_OPS(sensitivity);
+DEBUGFS_READ_FILE_OPS(chain_noise);
+DEBUGFS_READ_FILE_OPS(power_save_status);
+DEBUGFS_WRITE_FILE_OPS(clear_ucode_stats);
+DEBUGFS_WRITE_FILE_OPS(clear_traffic_stats);
+DEBUGFS_READ_FILE_OPS(fh_reg);
+DEBUGFS_READ_WRITE_FILE_OPS(missed_beacon);
+DEBUGFS_READ_WRITE_FILE_OPS(force_reset);
+DEBUGFS_READ_FILE_OPS(rxon_flags);
+DEBUGFS_READ_FILE_OPS(rxon_filter_flags);
+DEBUGFS_WRITE_FILE_OPS(wd_timeout);
+
+/*
+ * Create the debugfs files and directories
+ *
+ */
+int
+il_dbgfs_register(struct il_priv *il, const char *name)
+{
+        struct dentry *phyd = il->hw->wiphy->debugfsdir;
+        struct dentry *dir_drv, *dir_data, *dir_rf, *dir_debug;
+
+        dir_drv = debugfs_create_dir(name, phyd);
+        if (!dir_drv)
+                return -ENOMEM;
+
+        il->debugfs_dir = dir_drv;
+
+        dir_data = debugfs_create_dir("data", dir_drv);
+        if (!dir_data)
+                goto err;
+        dir_rf = debugfs_create_dir("rf", dir_drv);
+        if (!dir_rf)
+                goto err;
+        dir_debug = debugfs_create_dir("debug", dir_drv);
+        if (!dir_debug)
+                goto err;
+
+        DEBUGFS_ADD_FILE(nvm, dir_data, S_IRUSR);
+        DEBUGFS_ADD_FILE(sram, dir_data, S_IWUSR | S_IRUSR);
+        DEBUGFS_ADD_FILE(stations, dir_data, S_IRUSR);
+        DEBUGFS_ADD_FILE(channels, dir_data, S_IRUSR);
+        DEBUGFS_ADD_FILE(status, dir_data, S_IRUSR);
+        DEBUGFS_ADD_FILE(interrupt, dir_data, S_IWUSR | S_IRUSR);
+        DEBUGFS_ADD_FILE(qos, dir_data, S_IRUSR);
+        DEBUGFS_ADD_FILE(disable_ht40, dir_data, S_IWUSR | S_IRUSR);
+        DEBUGFS_ADD_FILE(rx_stats, dir_debug, S_IRUSR);
+        DEBUGFS_ADD_FILE(tx_stats, dir_debug, S_IRUSR);
+        DEBUGFS_ADD_FILE(traffic_log, dir_debug, S_IWUSR | S_IRUSR);
+        DEBUGFS_ADD_FILE(rx_queue, dir_debug, S_IRUSR);
+        DEBUGFS_ADD_FILE(tx_queue, dir_debug, S_IRUSR);
+        DEBUGFS_ADD_FILE(power_save_status, dir_debug, S_IRUSR);
+        DEBUGFS_ADD_FILE(clear_ucode_stats, dir_debug, S_IWUSR);
+        DEBUGFS_ADD_FILE(clear_traffic_stats, dir_debug, S_IWUSR);
+        DEBUGFS_ADD_FILE(fh_reg, dir_debug, S_IRUSR);
+        DEBUGFS_ADD_FILE(missed_beacon, dir_debug, S_IWUSR);
+        DEBUGFS_ADD_FILE(force_reset, dir_debug, S_IWUSR | S_IRUSR);
+        DEBUGFS_ADD_FILE(ucode_rx_stats, dir_debug, S_IRUSR);
+        DEBUGFS_ADD_FILE(ucode_tx_stats, dir_debug, S_IRUSR);
+        DEBUGFS_ADD_FILE(ucode_general_stats, dir_debug, S_IRUSR);
+
+        if (il->cfg->base_params->sensitivity_calib_by_driver)
+                DEBUGFS_ADD_FILE(sensitivity, dir_debug, S_IRUSR);
+        if (il->cfg->base_params->chain_noise_calib_by_driver)
+                DEBUGFS_ADD_FILE(chain_noise, dir_debug, S_IRUSR);
+        DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR);
+        DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR);
+        DEBUGFS_ADD_FILE(wd_timeout, dir_debug, S_IWUSR);
+        if (il->cfg->base_params->sensitivity_calib_by_driver)
+                DEBUGFS_ADD_BOOL(disable_sensitivity, dir_rf,
+                                 &il->disable_sens_cal);
+        if (il->cfg->base_params->chain_noise_calib_by_driver)
+                DEBUGFS_ADD_BOOL(disable_chain_noise, dir_rf,
+                                 &il->disable_chain_noise_cal);
+        DEBUGFS_ADD_BOOL(disable_tx_power, dir_rf, &il->disable_tx_power_cal);
+        return 0;
+
+err:
+        IL_ERR("Can't create the debugfs directory\n");
+        il_dbgfs_unregister(il);
+        return -ENOMEM;
+}
+EXPORT_SYMBOL(il_dbgfs_register);
+
+/**
+ * Remove the debugfs files and directories
+ *
+ */
+void
+il_dbgfs_unregister(struct il_priv *il)
+{
+        if (!il->debugfs_dir)
+                return;
+
+        debugfs_remove_recursive(il->debugfs_dir);
+        il->debugfs_dir = NULL;
+}
+EXPORT_SYMBOL(il_dbgfs_unregister);
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c b/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c
deleted file mode 100644
index cfabb38793ab..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c
+++ /dev/null
@@ -1,523 +0,0 @@
-/******************************************************************************
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *****************************************************************************/
-
-#include "iwl-3945-debugfs.h"
-
-
-static int iwl3945_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
-{
-        int p = 0;
-
-        p += scnprintf(buf + p, bufsz - p, "Statistics Flag(0x%X):\n",
-                       le32_to_cpu(priv->_3945.statistics.flag));
-        if (le32_to_cpu(priv->_3945.statistics.flag) &
-                        UCODE_STATISTICS_CLEAR_MSK)
-                p += scnprintf(buf + p, bufsz - p,
-                               "\tStatistics have been cleared\n");
-        p += scnprintf(buf + p, bufsz - p, "\tOperational Frequency: %s\n",
-                       (le32_to_cpu(priv->_3945.statistics.flag) &
-                        UCODE_STATISTICS_FREQUENCY_MSK)
-                        ? "2.4 GHz" : "5.2 GHz");
-        p += scnprintf(buf + p, bufsz - p, "\tTGj Narrow Band: %s\n",
-                       (le32_to_cpu(priv->_3945.statistics.flag) &
-                        UCODE_STATISTICS_NARROW_BAND_MSK)
-                        ? "enabled" : "disabled");
-        return p;
-}
-
-ssize_t iwl3945_ucode_rx_stats_read(struct file *file,
-                                    char __user *user_buf,
-                                    size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        int pos = 0;
-        char *buf;
-        int bufsz = sizeof(struct iwl39_statistics_rx_phy) * 40 +
-                    sizeof(struct iwl39_statistics_rx_non_phy) * 40 + 400;
-        ssize_t ret;
-        struct iwl39_statistics_rx_phy *ofdm, *accum_ofdm, *delta_ofdm,
-                                        *max_ofdm;
-        struct iwl39_statistics_rx_phy *cck, *accum_cck, *delta_cck, *max_cck;
-        struct iwl39_statistics_rx_non_phy *general, *accum_general;
-        struct iwl39_statistics_rx_non_phy *delta_general, *max_general;
-
-        if (!iwl_legacy_is_alive(priv))
-                return -EAGAIN;
-
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
-                return -ENOMEM;
-        }
-
-        /*
-         * The statistic information display here is based on
-         * the last statistics notification from uCode
-         * might not reflect the current uCode activity
-         */
-        ofdm = &priv->_3945.statistics.rx.ofdm;
-        cck = &priv->_3945.statistics.rx.cck;
-        general = &priv->_3945.statistics.rx.general;
-        accum_ofdm = &priv->_3945.accum_statistics.rx.ofdm;
-        accum_cck = &priv->_3945.accum_statistics.rx.cck;
-        accum_general = &priv->_3945.accum_statistics.rx.general;
-        delta_ofdm = &priv->_3945.delta_statistics.rx.ofdm;
-        delta_cck = &priv->_3945.delta_statistics.rx.cck;
-        delta_general = &priv->_3945.delta_statistics.rx.general;
-        max_ofdm = &priv->_3945.max_delta.rx.ofdm;
-        max_cck = &priv->_3945.max_delta.rx.cck;
-        max_general = &priv->_3945.max_delta.rx.general;
-
-        pos += iwl3945_statistics_flag(priv, buf, bufsz);
-        pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"
-                         "acumulative       delta         max\n",
-                         "Statistics_Rx - OFDM:");
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "ina_cnt:", le32_to_cpu(ofdm->ina_cnt),
-                         accum_ofdm->ina_cnt,
-                         delta_ofdm->ina_cnt, max_ofdm->ina_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "fina_cnt:",
-                         le32_to_cpu(ofdm->fina_cnt), accum_ofdm->fina_cnt,
-                         delta_ofdm->fina_cnt, max_ofdm->fina_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n", "plcp_err:",
-                         le32_to_cpu(ofdm->plcp_err), accum_ofdm->plcp_err,
-                         delta_ofdm->plcp_err, max_ofdm->plcp_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",  "crc32_err:",
-                         le32_to_cpu(ofdm->crc32_err), accum_ofdm->crc32_err,
-                         delta_ofdm->crc32_err, max_ofdm->crc32_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n", "overrun_err:",
-                         le32_to_cpu(ofdm->overrun_err),
-                         accum_ofdm->overrun_err, delta_ofdm->overrun_err,
-                         max_ofdm->overrun_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "early_overrun_err:",
-                         le32_to_cpu(ofdm->early_overrun_err),
-                         accum_ofdm->early_overrun_err,
-                         delta_ofdm->early_overrun_err,
-                         max_ofdm->early_overrun_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "crc32_good:", le32_to_cpu(ofdm->crc32_good),
-                         accum_ofdm->crc32_good, delta_ofdm->crc32_good,
-                         max_ofdm->crc32_good);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n", "false_alarm_cnt:",
-                         le32_to_cpu(ofdm->false_alarm_cnt),
-                         accum_ofdm->false_alarm_cnt,
-                         delta_ofdm->false_alarm_cnt,
-                         max_ofdm->false_alarm_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "fina_sync_err_cnt:",
-                         le32_to_cpu(ofdm->fina_sync_err_cnt),
-                         accum_ofdm->fina_sync_err_cnt,
-                         delta_ofdm->fina_sync_err_cnt,
-                         max_ofdm->fina_sync_err_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "sfd_timeout:",
-                         le32_to_cpu(ofdm->sfd_timeout),
-                         accum_ofdm->sfd_timeout,
-                         delta_ofdm->sfd_timeout,
-                         max_ofdm->sfd_timeout);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "fina_timeout:",
-                         le32_to_cpu(ofdm->fina_timeout),
-                         accum_ofdm->fina_timeout,
-                         delta_ofdm->fina_timeout,
-                         max_ofdm->fina_timeout);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "unresponded_rts:",
-                         le32_to_cpu(ofdm->unresponded_rts),
-                         accum_ofdm->unresponded_rts,
-                         delta_ofdm->unresponded_rts,
-                         max_ofdm->unresponded_rts);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "rxe_frame_lmt_ovrun:",
-                         le32_to_cpu(ofdm->rxe_frame_limit_overrun),
-                         accum_ofdm->rxe_frame_limit_overrun,
-                         delta_ofdm->rxe_frame_limit_overrun,
-                         max_ofdm->rxe_frame_limit_overrun);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "sent_ack_cnt:",
-                         le32_to_cpu(ofdm->sent_ack_cnt),
-                         accum_ofdm->sent_ack_cnt,
-                         delta_ofdm->sent_ack_cnt,
-                         max_ofdm->sent_ack_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "sent_cts_cnt:",
-                         le32_to_cpu(ofdm->sent_cts_cnt),
-                         accum_ofdm->sent_cts_cnt,
-                         delta_ofdm->sent_cts_cnt, max_ofdm->sent_cts_cnt);
-
-        pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"
-                         "acumulative       delta         max\n",
-                         "Statistics_Rx - CCK:");
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "ina_cnt:",
-                         le32_to_cpu(cck->ina_cnt), accum_cck->ina_cnt,
-                         delta_cck->ina_cnt, max_cck->ina_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "fina_cnt:",
-                         le32_to_cpu(cck->fina_cnt), accum_cck->fina_cnt,
-                         delta_cck->fina_cnt, max_cck->fina_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "plcp_err:",
-                         le32_to_cpu(cck->plcp_err), accum_cck->plcp_err,
-                         delta_cck->plcp_err, max_cck->plcp_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "crc32_err:",
-                         le32_to_cpu(cck->crc32_err), accum_cck->crc32_err,
-                         delta_cck->crc32_err, max_cck->crc32_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "overrun_err:",
-                         le32_to_cpu(cck->overrun_err),
-                         accum_cck->overrun_err,
-                         delta_cck->overrun_err, max_cck->overrun_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "early_overrun_err:",
-                         le32_to_cpu(cck->early_overrun_err),
-                         accum_cck->early_overrun_err,
-                         delta_cck->early_overrun_err,
-                         max_cck->early_overrun_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "crc32_good:",
-                         le32_to_cpu(cck->crc32_good), accum_cck->crc32_good,
-                         delta_cck->crc32_good,
-                         max_cck->crc32_good);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "false_alarm_cnt:",
-                         le32_to_cpu(cck->false_alarm_cnt),
-                         accum_cck->false_alarm_cnt,
-                         delta_cck->false_alarm_cnt, max_cck->false_alarm_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "fina_sync_err_cnt:",
-                         le32_to_cpu(cck->fina_sync_err_cnt),
-                         accum_cck->fina_sync_err_cnt,
-                         delta_cck->fina_sync_err_cnt,
-                         max_cck->fina_sync_err_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "sfd_timeout:",
-                         le32_to_cpu(cck->sfd_timeout),
-                         accum_cck->sfd_timeout,
-                         delta_cck->sfd_timeout, max_cck->sfd_timeout);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "fina_timeout:",
-                         le32_to_cpu(cck->fina_timeout),
-                         accum_cck->fina_timeout,
-                         delta_cck->fina_timeout, max_cck->fina_timeout);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "unresponded_rts:",
-                         le32_to_cpu(cck->unresponded_rts),
-                         accum_cck->unresponded_rts,
-                         delta_cck->unresponded_rts,
-                         max_cck->unresponded_rts);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "rxe_frame_lmt_ovrun:",
-                         le32_to_cpu(cck->rxe_frame_limit_overrun),
-                         accum_cck->rxe_frame_limit_overrun,
-                         delta_cck->rxe_frame_limit_overrun,
-                         max_cck->rxe_frame_limit_overrun);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "sent_ack_cnt:",
-                         le32_to_cpu(cck->sent_ack_cnt),
-                         accum_cck->sent_ack_cnt,
-                         delta_cck->sent_ack_cnt,
-                         max_cck->sent_ack_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "sent_cts_cnt:",
-                         le32_to_cpu(cck->sent_cts_cnt),
-                         accum_cck->sent_cts_cnt,
-                         delta_cck->sent_cts_cnt,
-                         max_cck->sent_cts_cnt);
-
-        pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"
-                         "acumulative       delta         max\n",
-                         "Statistics_Rx - GENERAL:");
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "bogus_cts:",
-                         le32_to_cpu(general->bogus_cts),
-                         accum_general->bogus_cts,
-                         delta_general->bogus_cts, max_general->bogus_cts);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "bogus_ack:",
-                         le32_to_cpu(general->bogus_ack),
-                         accum_general->bogus_ack,
-                         delta_general->bogus_ack, max_general->bogus_ack);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "non_bssid_frames:",
-                         le32_to_cpu(general->non_bssid_frames),
-                         accum_general->non_bssid_frames,
-                         delta_general->non_bssid_frames,
-                         max_general->non_bssid_frames);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "filtered_frames:",
-                         le32_to_cpu(general->filtered_frames),
-                         accum_general->filtered_frames,
-                         delta_general->filtered_frames,
-                         max_general->filtered_frames);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "non_channel_beacons:",
-                         le32_to_cpu(general->non_channel_beacons),
-                         accum_general->non_channel_beacons,
-                         delta_general->non_channel_beacons,
-                         max_general->non_channel_beacons);
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-ssize_t iwl3945_ucode_tx_stats_read(struct file *file,
-                                    char __user *user_buf,
-                                    size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        int pos = 0;
-        char *buf;
-        int bufsz = (sizeof(struct iwl39_statistics_tx) * 48) + 250;
-        ssize_t ret;
-        struct iwl39_statistics_tx *tx, *accum_tx, *delta_tx, *max_tx;
-
-        if (!iwl_legacy_is_alive(priv))
-                return -EAGAIN;
-
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
-                return -ENOMEM;
-        }
-
-        /*
-         * The statistic information display here is based on
-         * the last statistics notification from uCode
-         * might not reflect the current uCode activity
-         */
-        tx = &priv->_3945.statistics.tx;
-        accum_tx = &priv->_3945.accum_statistics.tx;
-        delta_tx = &priv->_3945.delta_statistics.tx;
-        max_tx = &priv->_3945.max_delta.tx;
-        pos += iwl3945_statistics_flag(priv, buf, bufsz);
-        pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"
-                         "acumulative       delta         max\n",
-                         "Statistics_Tx:");
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "preamble:",
-                         le32_to_cpu(tx->preamble_cnt),
-                         accum_tx->preamble_cnt,
-                         delta_tx->preamble_cnt, max_tx->preamble_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "rx_detected_cnt:",
-                         le32_to_cpu(tx->rx_detected_cnt),
-                         accum_tx->rx_detected_cnt,
-                         delta_tx->rx_detected_cnt, max_tx->rx_detected_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "bt_prio_defer_cnt:",
-                         le32_to_cpu(tx->bt_prio_defer_cnt),
-                         accum_tx->bt_prio_defer_cnt,
-                         delta_tx->bt_prio_defer_cnt,
-                         max_tx->bt_prio_defer_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "bt_prio_kill_cnt:",
-                         le32_to_cpu(tx->bt_prio_kill_cnt),
-                         accum_tx->bt_prio_kill_cnt,
-                         delta_tx->bt_prio_kill_cnt,
-                         max_tx->bt_prio_kill_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "few_bytes_cnt:",
-                         le32_to_cpu(tx->few_bytes_cnt),
-                         accum_tx->few_bytes_cnt,
-                         delta_tx->few_bytes_cnt, max_tx->few_bytes_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "cts_timeout:",
-                         le32_to_cpu(tx->cts_timeout), accum_tx->cts_timeout,
-                         delta_tx->cts_timeout, max_tx->cts_timeout);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "ack_timeout:",
-                         le32_to_cpu(tx->ack_timeout),
-                         accum_tx->ack_timeout,
-                         delta_tx->ack_timeout, max_tx->ack_timeout);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "expected_ack_cnt:",
-                         le32_to_cpu(tx->expected_ack_cnt),
-                         accum_tx->expected_ack_cnt,
-                         delta_tx->expected_ack_cnt,
-                         max_tx->expected_ack_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "actual_ack_cnt:",
-                         le32_to_cpu(tx->actual_ack_cnt),
-                         accum_tx->actual_ack_cnt,
-                         delta_tx->actual_ack_cnt,
-                         max_tx->actual_ack_cnt);
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-ssize_t iwl3945_ucode_general_stats_read(struct file *file,
-                                         char __user *user_buf,
-                                         size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        int pos = 0;
-        char *buf;
-        int bufsz = sizeof(struct iwl39_statistics_general) * 10 + 300;
-        ssize_t ret;
-        struct iwl39_statistics_general *general, *accum_general;
-        struct iwl39_statistics_general *delta_general, *max_general;
-        struct statistics_dbg *dbg, *accum_dbg, *delta_dbg, *max_dbg;
-        struct iwl39_statistics_div *div, *accum_div, *delta_div, *max_div;
-
-        if (!iwl_legacy_is_alive(priv))
-                return -EAGAIN;
-
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
-                return -ENOMEM;
-        }
-
-        /*
-         * The statistic information display here is based on
-         * the last statistics notification from uCode
-         * might not reflect the current uCode activity
-         */
-        general = &priv->_3945.statistics.general;
-        dbg = &priv->_3945.statistics.general.dbg;
-        div = &priv->_3945.statistics.general.div;
-        accum_general = &priv->_3945.accum_statistics.general;
-        delta_general = &priv->_3945.delta_statistics.general;
-        max_general = &priv->_3945.max_delta.general;
-        accum_dbg = &priv->_3945.accum_statistics.general.dbg;
-        delta_dbg = &priv->_3945.delta_statistics.general.dbg;
-        max_dbg = &priv->_3945.max_delta.general.dbg;
-        accum_div = &priv->_3945.accum_statistics.general.div;
-        delta_div = &priv->_3945.delta_statistics.general.div;
-        max_div = &priv->_3945.max_delta.general.div;
-        pos += iwl3945_statistics_flag(priv, buf, bufsz);
-        pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"
-                         "acumulative       delta         max\n",
-                         "Statistics_General:");
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "burst_check:",
-                         le32_to_cpu(dbg->burst_check),
-                         accum_dbg->burst_check,
-                         delta_dbg->burst_check, max_dbg->burst_check);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "burst_count:",
-                         le32_to_cpu(dbg->burst_count),
-                         accum_dbg->burst_count,
-                         delta_dbg->burst_count, max_dbg->burst_count);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "sleep_time:",
-                         le32_to_cpu(general->sleep_time),
-                         accum_general->sleep_time,
-                         delta_general->sleep_time, max_general->sleep_time);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "slots_out:",
-                         le32_to_cpu(general->slots_out),
-                         accum_general->slots_out,
-                         delta_general->slots_out, max_general->slots_out);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "slots_idle:",
-                         le32_to_cpu(general->slots_idle),
-                         accum_general->slots_idle,
-                         delta_general->slots_idle, max_general->slots_idle);
-        pos += scnprintf(buf + pos, bufsz - pos, "ttl_timestamp:\t\t\t%u\n",
-                         le32_to_cpu(general->ttl_timestamp));
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "tx_on_a:",
-                         le32_to_cpu(div->tx_on_a), accum_div->tx_on_a,
-                         delta_div->tx_on_a, max_div->tx_on_a);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "tx_on_b:",
-                         le32_to_cpu(div->tx_on_b), accum_div->tx_on_b,
-                         delta_div->tx_on_b, max_div->tx_on_b);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "exec_time:",
-                         le32_to_cpu(div->exec_time), accum_div->exec_time,
-                         delta_div->exec_time, max_div->exec_time);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         "  %-30s %10u  %10u  %10u  %10u\n",
-                         "probe_time:",
-                         le32_to_cpu(div->probe_time), accum_div->probe_time,
-                         delta_div->probe_time, max_div->probe_time);
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h b/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h
deleted file mode 100644
index 8fef4b32b447..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/******************************************************************************
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *****************************************************************************/
-
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-debug.h"
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
-ssize_t iwl3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,
-                                    size_t count, loff_t *ppos);
-ssize_t iwl3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,
-                                    size_t count, loff_t *ppos);
-ssize_t iwl3945_ucode_general_stats_read(struct file *file,
-                                         char __user *user_buf, size_t count,
-                                         loff_t *ppos);
-#else
-static ssize_t iwl3945_ucode_rx_stats_read(struct file *file,
-                                           char __user *user_buf, size_t count,
-                                           loff_t *ppos)
-{
-        return 0;
-}
-static ssize_t iwl3945_ucode_tx_stats_read(struct file *file,
-                                           char __user *user_buf, size_t count,
-                                           loff_t *ppos)
-{
-        return 0;
-}
-static ssize_t iwl3945_ucode_general_stats_read(struct file *file,
-                                                char __user *user_buf,
-                                                size_t count, loff_t *ppos)
-{
-        return 0;
-}
-#endif
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-fh.h b/drivers/net/wireless/iwlegacy/iwl-3945-fh.h
deleted file mode 100644
index 836c9919f82e..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-3945-fh.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/******************************************************************************
- *
- * 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 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2011 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_fh_h__
-#define __iwl_3945_fh_h__
-
-/************************************/
-/* iwl3945 Flow Handler Definitions */
-/************************************/
-
-/**
- * This I/O area is directly read/writable by driver (e.g. Linux uses writel())
- * Addresses are offsets from device's PCI hardware base address.
- */
-#define FH39_MEM_LOWER_BOUND                   (0x0800)
-#define FH39_MEM_UPPER_BOUND                   (0x1000)
-
-#define FH39_CBCC_TABLE         (FH39_MEM_LOWER_BOUND + 0x140)
-#define FH39_TFDB_TABLE         (FH39_MEM_LOWER_BOUND + 0x180)
-#define FH39_RCSR_TABLE         (FH39_MEM_LOWER_BOUND + 0x400)
-#define FH39_RSSR_TABLE         (FH39_MEM_LOWER_BOUND + 0x4c0)
-#define FH39_TCSR_TABLE         (FH39_MEM_LOWER_BOUND + 0x500)
-#define FH39_TSSR_TABLE         (FH39_MEM_LOWER_BOUND + 0x680)
-
-/* TFDB (Transmit Frame Buffer Descriptor) */
-#define FH39_TFDB(_ch, buf)                     (FH39_TFDB_TABLE + \
-                                                 ((_ch) * 2 + (buf)) * 0x28)
-#define FH39_TFDB_CHNL_BUF_CTRL_REG(_ch)        (FH39_TFDB_TABLE + 0x50 * (_ch))
-
-/* CBCC channel is [0,2] */
-#define FH39_CBCC(_ch)          (FH39_CBCC_TABLE + (_ch) * 0x8)
-#define FH39_CBCC_CTRL(_ch)     (FH39_CBCC(_ch) + 0x00)
-#define FH39_CBCC_BASE(_ch)     (FH39_CBCC(_ch) + 0x04)
-
-/* RCSR channel is [0,2] */
-#define FH39_RCSR(_ch)                  (FH39_RCSR_TABLE + (_ch) * 0x40)
-#define FH39_RCSR_CONFIG(_ch)           (FH39_RCSR(_ch) + 0x00)
-#define FH39_RCSR_RBD_BASE(_ch)         (FH39_RCSR(_ch) + 0x04)
-#define FH39_RCSR_WPTR(_ch)             (FH39_RCSR(_ch) + 0x20)
-#define FH39_RCSR_RPTR_ADDR(_ch)        (FH39_RCSR(_ch) + 0x24)
-
-#define FH39_RSCSR_CHNL0_WPTR           (FH39_RCSR_WPTR(0))
-
-/* RSSR */
-#define FH39_RSSR_CTRL                  (FH39_RSSR_TABLE + 0x000)
-#define FH39_RSSR_STATUS                (FH39_RSSR_TABLE + 0x004)
-
-/* TCSR */
-#define FH39_TCSR(_ch)                  (FH39_TCSR_TABLE + (_ch) * 0x20)
-#define FH39_TCSR_CONFIG(_ch)           (FH39_TCSR(_ch) + 0x00)
-#define FH39_TCSR_CREDIT(_ch)           (FH39_TCSR(_ch) + 0x04)
-#define FH39_TCSR_BUFF_STTS(_ch)        (FH39_TCSR(_ch) + 0x08)
-
-/* TSSR */
-#define FH39_TSSR_CBB_BASE        (FH39_TSSR_TABLE + 0x000)
-#define FH39_TSSR_MSG_CONFIG      (FH39_TSSR_TABLE + 0x008)
-#define FH39_TSSR_TX_STATUS       (FH39_TSSR_TABLE + 0x010)
-
-
-/* DBM */
-
-#define FH39_SRVC_CHNL                            (6)
-
-#define FH39_RCSR_RX_CONFIG_REG_POS_RBDC_SIZE     (20)
-#define FH39_RCSR_RX_CONFIG_REG_POS_IRQ_RBTH      (4)
-
-#define FH39_RCSR_RX_CONFIG_REG_BIT_WR_STTS_EN    (0x08000000)
-
-#define FH39_RCSR_RX_CONFIG_REG_VAL_DMA_CHNL_EN_ENABLE        (0x80000000)
-
-#define FH39_RCSR_RX_CONFIG_REG_VAL_RDRBD_EN_ENABLE           (0x20000000)
-
-#define FH39_RCSR_RX_CONFIG_REG_VAL_MAX_FRAG_SIZE_128           (0x01000000)
-
-#define FH39_RCSR_RX_CONFIG_REG_VAL_IRQ_DEST_INT_HOST           (0x00001000)
-
-#define FH39_RCSR_RX_CONFIG_REG_VAL_MSG_MODE_FH                 (0x00000000)
-
-#define FH39_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_TXF                (0x00000000)
-#define FH39_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_DRIVER             (0x00000001)
-
-#define FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE_VAL      (0x00000000)
-#define FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE_VAL       (0x00000008)
-
-#define FH39_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_IFTFD             (0x00200000)
-
-#define FH39_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_NOINT              (0x00000000)
-
-#define FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE              (0x00000000)
-#define FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE             (0x80000000)
-
-#define FH39_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_VALID            (0x00004000)
-
-#define FH39_TCSR_CHNL_TX_BUF_STS_REG_BIT_TFDB_WPTR             (0x00000001)
-
-#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_SNOOP_RD_TXPD_ON        (0xFF000000)
-#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RD_TXPD_ON        (0x00FF0000)
-
-#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_MAX_FRAG_SIZE_128B      (0x00000400)
-
-#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_SNOOP_RD_TFD_ON         (0x00000100)
-#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RD_CBB_ON         (0x00000080)
-
-#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RSP_WAIT_TH       (0x00000020)
-#define FH39_TSSR_TX_MSG_CONFIG_REG_VAL_RSP_WAIT_TH             (0x00000005)
-
-#define FH39_TSSR_TX_STATUS_REG_BIT_BUFS_EMPTY(_ch)     (BIT(_ch) << 24)
-#define FH39_TSSR_TX_STATUS_REG_BIT_NO_PEND_REQ(_ch)    (BIT(_ch) << 16)
-
-#define FH39_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(_ch) \
-        (FH39_TSSR_TX_STATUS_REG_BIT_BUFS_EMPTY(_ch) | \
-         FH39_TSSR_TX_STATUS_REG_BIT_NO_PEND_REQ(_ch))
-
-#define FH39_RSSR_CHNL0_RX_STATUS_CHNL_IDLE                     (0x01000000)
-
-struct iwl3945_tfd_tb {
-        __le32 addr;
-        __le32 len;
-} __packed;
-
-struct iwl3945_tfd {
-        __le32 control_flags;
-        struct iwl3945_tfd_tb tbs[4];
-        u8 __pad[28];
-} __packed;
-
-
-#endif /* __iwl_3945_fh_h__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-hw.h b/drivers/net/wireless/iwlegacy/iwl-3945-hw.h
deleted file mode 100644
index 5c3a68d3af12..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-3945-hw.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/******************************************************************************
- *
- * 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 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2011 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.
- *
- *****************************************************************************/
-/*
- * Please use this file (iwl-3945-hw.h) only for hardware-related definitions.
- * Please use iwl-commands.h for uCode API definitions.
- * Please use iwl-3945.h for driver implementation definitions.
- */
-
-#ifndef __iwl_3945_hw__
-#define __iwl_3945_hw__
-
-#include "iwl-eeprom.h"
-
-/* RSSI to dBm */
-#define IWL39_RSSI_OFFSET       95
-
-/*
- * EEPROM related constants, enums, and structures.
- */
-#define EEPROM_SKU_CAP_OP_MODE_MRC                      (1 << 7)
-
-/*
- * Mapping of a Tx power level, at factory calibration temperature,
- *   to a radio/DSP gain table index.
- * One for each of 5 "sample" power levels in each band.
- * v_det is measured at the factory, using the 3945's built-in power amplifier
- *   (PA) output voltage detector.  This same detector is used during Tx of
- *   long packets in normal operation to provide feedback as to proper output
- *   level.
- * Data copied from EEPROM.
- * DO NOT ALTER THIS STRUCTURE!!!
- */
-struct iwl3945_eeprom_txpower_sample {
-        u8 gain_index;          /* index into power (gain) setup table ... */
-        s8 power;               /* ... for this pwr level for this chnl group */
-        u16 v_det;              /* PA output voltage */
-} __packed;
-
-/*
- * Mappings of Tx power levels -> nominal radio/DSP gain table indexes.
- * One for each channel group (a.k.a. "band") (1 for BG, 4 for A).
- * Tx power setup code interpolates between the 5 "sample" power levels
- *    to determine the nominal setup for a requested power level.
- * Data copied from EEPROM.
- * DO NOT ALTER THIS STRUCTURE!!!
- */
-struct iwl3945_eeprom_txpower_group {
-        struct iwl3945_eeprom_txpower_sample samples[5];  /* 5 power levels */
-        s32 a, b, c, d, e;      /* coefficients for voltage->power
-                                 * formula (signed) */
-        s32 Fa, Fb, Fc, Fd, Fe; /* these modify coeffs based on
-                                 * frequency (signed) */
-        s8 saturation_power;    /* highest power possible by h/w in this
-                                 * band */
-        u8 group_channel;       /* "representative" channel # in this band */
-        s16 temperature;        /* h/w temperature at factory calib this band
-                                 * (signed) */
-} __packed;
-
-/*
- * Temperature-based Tx-power compensation data, not band-specific.
- * These coefficients are use to modify a/b/c/d/e coeffs based on
- *   difference between current temperature and factory calib temperature.
- * Data copied from EEPROM.
- */
-struct iwl3945_eeprom_temperature_corr {
-        u32 Ta;
-        u32 Tb;
-        u32 Tc;
-        u32 Td;
-        u32 Te;
-} __packed;
-
-/*
- * EEPROM map
- */
-struct iwl3945_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[42];
-        u8 sku_id[4];           /* abs.ofs: 192 */
-
-/*
- * Per-channel regulatory data.
- *
- * Each channel that *might* be supported by 3945 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.
- *
- * 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 iwl_eeprom_channel band_1_channels[14];  /* abs.ofs: 198 */
-
-/*
- * 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 iwl_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 iwl_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 iwl_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 iwl_eeprom_channel band_5_channels[6];  /* abs.ofs: 306 */
-
-        u8 reserved9[194];
-
-/*
- * 3945 Txpower calibration data.
- */
-#define IWL_NUM_TX_CALIB_GROUPS 5
-        struct iwl3945_eeprom_txpower_group groups[IWL_NUM_TX_CALIB_GROUPS];
-/* abs.ofs: 512 */
-        struct iwl3945_eeprom_temperature_corr corrections;  /* abs.ofs: 832 */
-        u8 reserved16[172];     /* fill out to full 1024 byte block */
-} __packed;
-
-#define IWL3945_EEPROM_IMG_SIZE 1024
-
-/* End of EEPROM */
-
-#define PCI_CFG_REV_ID_BIT_BASIC_SKU                (0x40)      /* bit 6    */
-#define PCI_CFG_REV_ID_BIT_RTP                      (0x80)      /* bit 7    */
-
-/* 4 DATA + 1 CMD. There are 2 HCCA queues that are not used. */
-#define IWL39_NUM_QUEUES        5
-#define IWL39_CMD_QUEUE_NUM     4
-
-#define IWL_DEFAULT_TX_RETRY  15
-
-/*********************************************/
-
-#define RFD_SIZE                              4
-#define NUM_TFD_CHUNKS                        4
-
-#define RX_QUEUE_SIZE                         256
-#define RX_QUEUE_MASK                         255
-#define RX_QUEUE_SIZE_LOG                     8
-
-#define U32_PAD(n)              ((4-(n))&0x3)
-
-#define TFD_CTL_COUNT_SET(n)       (n << 24)
-#define TFD_CTL_COUNT_GET(ctl)     ((ctl >> 24) & 7)
-#define TFD_CTL_PAD_SET(n)         (n << 28)
-#define TFD_CTL_PAD_GET(ctl)       (ctl >> 28)
-
-/* Sizes and addresses for instruction and data memory (SRAM) in
- * 3945's embedded processor.  Driver access is via HBUS_TARG_MEM_* regs. */
-#define IWL39_RTC_INST_LOWER_BOUND              (0x000000)
-#define IWL39_RTC_INST_UPPER_BOUND              (0x014000)
-
-#define IWL39_RTC_DATA_LOWER_BOUND              (0x800000)
-#define IWL39_RTC_DATA_UPPER_BOUND              (0x808000)
-
-#define IWL39_RTC_INST_SIZE (IWL39_RTC_INST_UPPER_BOUND - \
-                                IWL39_RTC_INST_LOWER_BOUND)
-#define IWL39_RTC_DATA_SIZE (IWL39_RTC_DATA_UPPER_BOUND - \
-                                IWL39_RTC_DATA_LOWER_BOUND)
-
-#define IWL39_MAX_INST_SIZE IWL39_RTC_INST_SIZE
-#define IWL39_MAX_DATA_SIZE IWL39_RTC_DATA_SIZE
-
-/* Size of uCode instruction memory in bootstrap state machine */
-#define IWL39_MAX_BSM_SIZE IWL39_RTC_INST_SIZE
-
-static inline int iwl3945_hw_valid_rtc_data_addr(u32 addr)
-{
-        return (addr >= IWL39_RTC_DATA_LOWER_BOUND) &&
-               (addr < IWL39_RTC_DATA_UPPER_BOUND);
-}
-
-/* Base physical address of iwl3945_shared is provided to FH_TSSR_CBB_BASE
- * and &iwl3945_shared.rx_read_ptr[0] is provided to FH_RCSR_RPTR_ADDR(0) */
-struct iwl3945_shared {
-        __le32 tx_base_ptr[8];
-} __packed;
-
-static inline u8 iwl3945_hw_get_rate(__le16 rate_n_flags)
-{
-        return le16_to_cpu(rate_n_flags) & 0xFF;
-}
-
-static inline u16 iwl3945_hw_get_rate_n_flags(__le16 rate_n_flags)
-{
-        return le16_to_cpu(rate_n_flags);
-}
-
-static inline __le16 iwl3945_hw_set_rate_n_flags(u8 rate, u16 flags)
-{
-        return cpu_to_le16((u16)rate|flags);
-}
-#endif
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-led.c b/drivers/net/wireless/iwlegacy/iwl-3945-led.c
deleted file mode 100644
index 7a7f0f38c8ab..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-3945-led.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@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/init.h>
-#include <linux/pci.h>
-#include <linux/dma-mapping.h>
-#include <linux/delay.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <net/mac80211.h>
-#include <linux/etherdevice.h>
-#include <asm/unaligned.h>
-
-#include "iwl-commands.h"
-#include "iwl-3945.h"
-#include "iwl-core.h"
-#include "iwl-dev.h"
-#include "iwl-3945-led.h"
-
-
-/* Send led command */
-static int iwl3945_send_led_cmd(struct iwl_priv *priv,
-                                struct iwl_led_cmd *led_cmd)
-{
-        struct iwl_host_cmd cmd = {
-                .id = REPLY_LEDS_CMD,
-                .len = sizeof(struct iwl_led_cmd),
-                .data = led_cmd,
-                .flags = CMD_ASYNC,
-                .callback = NULL,
-        };
-
-        return iwl_legacy_send_cmd(priv, &cmd);
-}
-
-const struct iwl_led_ops iwl3945_led_ops = {
-        .cmd = iwl3945_send_led_cmd,
-};
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-led.h b/drivers/net/wireless/iwlegacy/iwl-3945-led.h
deleted file mode 100644
index 96716276eb0d..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-3945-led.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-
-#ifndef __iwl_3945_led_h__
-#define __iwl_3945_led_h__
-
-extern const struct iwl_led_ops iwl3945_led_ops;
-
-#endif /* __iwl_3945_led_h__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-rs.c b/drivers/net/wireless/iwlegacy/iwl-3945-rs.c
deleted file mode 100644
index 8faeaf2dddec..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-3945-rs.c
+++ /dev/null
@@ -1,996 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2005 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/skbuff.h>
-#include <linux/slab.h>
-#include <net/mac80211.h>
-
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/delay.h>
-
-#include <linux/workqueue.h>
-
-#include "iwl-commands.h"
-#include "iwl-3945.h"
-#include "iwl-sta.h"
-
-#define RS_NAME "iwl-3945-rs"
-
-static s32 iwl3945_expected_tpt_g[IWL_RATE_COUNT_3945] = {
-        7, 13, 35, 58, 0, 0, 76, 104, 130, 168, 191, 202
-};
-
-static s32 iwl3945_expected_tpt_g_prot[IWL_RATE_COUNT_3945] = {
-        7, 13, 35, 58, 0, 0, 0, 80, 93, 113, 123, 125
-};
-
-static s32 iwl3945_expected_tpt_a[IWL_RATE_COUNT_3945] = {
-        0, 0, 0, 0, 40, 57, 72, 98, 121, 154, 177, 186
-};
-
-static s32 iwl3945_expected_tpt_b[IWL_RATE_COUNT_3945] = {
-        7, 13, 35, 58, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-struct iwl3945_tpt_entry {
-        s8 min_rssi;
-        u8 index;
-};
-
-static struct iwl3945_tpt_entry iwl3945_tpt_table_a[] = {
-        {-60, IWL_RATE_54M_INDEX},
-        {-64, IWL_RATE_48M_INDEX},
-        {-72, IWL_RATE_36M_INDEX},
-        {-80, IWL_RATE_24M_INDEX},
-        {-84, IWL_RATE_18M_INDEX},
-        {-85, IWL_RATE_12M_INDEX},
-        {-87, IWL_RATE_9M_INDEX},
-        {-89, IWL_RATE_6M_INDEX}
-};
-
-static struct iwl3945_tpt_entry iwl3945_tpt_table_g[] = {
-        {-60, IWL_RATE_54M_INDEX},
-        {-64, IWL_RATE_48M_INDEX},
-        {-68, IWL_RATE_36M_INDEX},
-        {-80, IWL_RATE_24M_INDEX},
-        {-84, IWL_RATE_18M_INDEX},
-        {-85, IWL_RATE_12M_INDEX},
-        {-86, IWL_RATE_11M_INDEX},
-        {-88, IWL_RATE_5M_INDEX},
-        {-90, IWL_RATE_2M_INDEX},
-        {-92, IWL_RATE_1M_INDEX}
-};
-
-#define IWL_RATE_MAX_WINDOW          62
-#define IWL_RATE_FLUSH          (3*HZ)
-#define IWL_RATE_WIN_FLUSH       (HZ/2)
-#define IWL39_RATE_HIGH_TH          11520
-#define IWL_SUCCESS_UP_TH          8960
-#define IWL_SUCCESS_DOWN_TH       10880
-#define IWL_RATE_MIN_FAILURE_TH       6
-#define IWL_RATE_MIN_SUCCESS_TH       8
-#define IWL_RATE_DECREASE_TH       1920
-#define IWL_RATE_RETRY_TH            15
-
-static u8 iwl3945_get_rate_index_by_rssi(s32 rssi, enum ieee80211_band band)
-{
-        u32 index = 0;
-        u32 table_size = 0;
-        struct iwl3945_tpt_entry *tpt_table = NULL;
-
-        if ((rssi < IWL_MIN_RSSI_VAL) || (rssi > IWL_MAX_RSSI_VAL))
-                rssi = IWL_MIN_RSSI_VAL;
-
-        switch (band) {
-        case IEEE80211_BAND_2GHZ:
-                tpt_table = iwl3945_tpt_table_g;
-                table_size = ARRAY_SIZE(iwl3945_tpt_table_g);
-                break;
-
-        case IEEE80211_BAND_5GHZ:
-                tpt_table = iwl3945_tpt_table_a;
-                table_size = ARRAY_SIZE(iwl3945_tpt_table_a);
-                break;
-
-        default:
-                BUG();
-                break;
-        }
-
-        while ((index < table_size) && (rssi < tpt_table[index].min_rssi))
-                index++;
-
-        index = min(index, (table_size - 1));
-
-        return tpt_table[index].index;
-}
-
-static void iwl3945_clear_window(struct iwl3945_rate_scale_data *window)
-{
-        window->data = 0;
-        window->success_counter = 0;
-        window->success_ratio = -1;
-        window->counter = 0;
-        window->average_tpt = IWL_INVALID_VALUE;
-        window->stamp = 0;
-}
-
-/**
- * iwl3945_rate_scale_flush_windows - flush out the rate scale windows
- *
- * Returns the number of windows that have gathered data but were
- * not flushed.  If there were any that were not flushed, then
- * reschedule the rate flushing routine.
- */
-static int iwl3945_rate_scale_flush_windows(struct iwl3945_rs_sta *rs_sta)
-{
-        int unflushed = 0;
-        int i;
-        unsigned long flags;
-        struct iwl_priv *priv __maybe_unused = rs_sta->priv;
-
-        /*
-         * For each rate, if we have collected data on that rate
-         * and it has been more than IWL_RATE_WIN_FLUSH
-         * since we flushed, clear out the gathered statistics
-         */
-        for (i = 0; i < IWL_RATE_COUNT_3945; i++) {
-                if (!rs_sta->win[i].counter)
-                        continue;
-
-                spin_lock_irqsave(&rs_sta->lock, flags);
-                if (time_after(jiffies, rs_sta->win[i].stamp +
-                               IWL_RATE_WIN_FLUSH)) {
-                        IWL_DEBUG_RATE(priv, "flushing %d samples of rate "
-                                       "index %d\n",
-                                       rs_sta->win[i].counter, i);
-                        iwl3945_clear_window(&rs_sta->win[i]);
-                } else
-                        unflushed++;
-                spin_unlock_irqrestore(&rs_sta->lock, flags);
-        }
-
-        return unflushed;
-}
-
-#define IWL_RATE_FLUSH_MAX              5000    /* msec */
-#define IWL_RATE_FLUSH_MIN              50      /* msec */
-#define IWL_AVERAGE_PACKETS             1500
-
-static void iwl3945_bg_rate_scale_flush(unsigned long data)
-{
-        struct iwl3945_rs_sta *rs_sta = (void *)data;
-        struct iwl_priv *priv __maybe_unused = rs_sta->priv;
-        int unflushed = 0;
-        unsigned long flags;
-        u32 packet_count, duration, pps;
-
-        IWL_DEBUG_RATE(priv, "enter\n");
-
-        unflushed = iwl3945_rate_scale_flush_windows(rs_sta);
-
-        spin_lock_irqsave(&rs_sta->lock, flags);
-
-        /* Number of packets Rx'd since last time this timer ran */
-        packet_count = (rs_sta->tx_packets - rs_sta->last_tx_packets) + 1;
-
-        rs_sta->last_tx_packets = rs_sta->tx_packets + 1;
-
-        if (unflushed) {
-                duration =
-                    jiffies_to_msecs(jiffies - rs_sta->last_partial_flush);
-
-                IWL_DEBUG_RATE(priv, "Tx'd %d packets in %dms\n",
-                               packet_count, duration);
-
-                /* Determine packets per second */
-                if (duration)
-                        pps = (packet_count * 1000) / duration;
-                else
-                        pps = 0;
-
-                if (pps) {
-                        duration = (IWL_AVERAGE_PACKETS * 1000) / pps;
-                        if (duration < IWL_RATE_FLUSH_MIN)
-                                duration = IWL_RATE_FLUSH_MIN;
-                        else if (duration > IWL_RATE_FLUSH_MAX)
-                                duration = IWL_RATE_FLUSH_MAX;
-                } else
-                        duration = IWL_RATE_FLUSH_MAX;
-
-                rs_sta->flush_time = msecs_to_jiffies(duration);
-
-                IWL_DEBUG_RATE(priv, "new flush period: %d msec ave %d\n",
-                               duration, packet_count);
-
-                mod_timer(&rs_sta->rate_scale_flush, jiffies +
-                          rs_sta->flush_time);
-
-                rs_sta->last_partial_flush = jiffies;
-        } else {
-                rs_sta->flush_time = IWL_RATE_FLUSH;
-                rs_sta->flush_pending = 0;
-        }
-        /* If there weren't any unflushed entries, we don't schedule the timer
-         * to run again */
-
-        rs_sta->last_flush = jiffies;
-
-        spin_unlock_irqrestore(&rs_sta->lock, flags);
-
-        IWL_DEBUG_RATE(priv, "leave\n");
-}
-
-/**
- * iwl3945_collect_tx_data - Update the success/failure sliding window
- *
- * We keep a sliding window of the last 64 packets transmitted
- * at this rate.  window->data contains the bitmask of successful
- * packets.
- */
-static void iwl3945_collect_tx_data(struct iwl3945_rs_sta *rs_sta,
-                                struct iwl3945_rate_scale_data *window,
-                                int success, int retries, int index)
-{
-        unsigned long flags;
-        s32 fail_count;
-        struct iwl_priv *priv __maybe_unused = rs_sta->priv;
-
-        if (!retries) {
-                IWL_DEBUG_RATE(priv, "leave: retries == 0 -- should be at least 1\n");
-                return;
-        }
-
-        spin_lock_irqsave(&rs_sta->lock, flags);
-
-        /*
-         * Keep track of only the latest 62 tx frame attempts in this rate's
-         * history window; anything older isn't really relevant any more.
-         * If we have filled up the sliding window, drop the oldest attempt;
-         * if the oldest attempt (highest bit in bitmap) shows "success",
-         * subtract "1" from the success counter (this is the main reason
-         * we keep these bitmaps!).
-         * */
-        while (retries > 0) {
-                if (window->counter >= IWL_RATE_MAX_WINDOW) {
-
-                        /* remove earliest */
-                        window->counter = IWL_RATE_MAX_WINDOW - 1;
-
-                        if (window->data & (1ULL << (IWL_RATE_MAX_WINDOW - 1))) {
-                                window->data &= ~(1ULL << (IWL_RATE_MAX_WINDOW - 1));
-                                window->success_counter--;
-                        }
-                }
-
-                /* 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. */
-                window->data <<= 1;
-                if (success > 0) {
-                        window->success_counter++;
-                        window->data |= 0x1;
-                        success--;
-                }
-
-                retries--;
-        }
-
-        /* Calculate current success ratio, avoid divide-by-0! */
-        if (window->counter > 0)
-                window->success_ratio = 128 * (100 * window->success_counter)
-                                        / window->counter;
-        else
-                window->success_ratio = IWL_INVALID_VALUE;
-
-        fail_count = window->counter - window->success_counter;
-
-        /* Calculate average throughput, if we have enough history. */
-        if ((fail_count >= IWL_RATE_MIN_FAILURE_TH) ||
-            (window->success_counter >= IWL_RATE_MIN_SUCCESS_TH))
-                window->average_tpt = ((window->success_ratio *
-                                rs_sta->expected_tpt[index] + 64) / 128);
-        else
-                window->average_tpt = IWL_INVALID_VALUE;
-
-        /* Tag this window as having been updated */
-        window->stamp = jiffies;
-
-        spin_unlock_irqrestore(&rs_sta->lock, flags);
-
-}
-
-/*
- * Called after adding a new station to initialize rate scaling
- */
-void iwl3945_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_id)
-{
-        struct ieee80211_hw *hw = priv->hw;
-        struct ieee80211_conf *conf = &priv->hw->conf;
-        struct iwl3945_sta_priv *psta;
-        struct iwl3945_rs_sta *rs_sta;
-        struct ieee80211_supported_band *sband;
-        int i;
-
-        IWL_DEBUG_INFO(priv, "enter\n");
-        if (sta_id == priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id)
-                goto out;
-
-        psta = (struct iwl3945_sta_priv *) sta->drv_priv;
-        rs_sta = &psta->rs_sta;
-        sband = hw->wiphy->bands[conf->channel->band];
-
-        rs_sta->priv = priv;
-
-        rs_sta->start_rate = IWL_RATE_INVALID;
-
-        /* default to just 802.11b */
-        rs_sta->expected_tpt = iwl3945_expected_tpt_b;
-
-        rs_sta->last_partial_flush = jiffies;
-        rs_sta->last_flush = jiffies;
-        rs_sta->flush_time = IWL_RATE_FLUSH;
-        rs_sta->last_tx_packets = 0;
-
-        rs_sta->rate_scale_flush.data = (unsigned long)rs_sta;
-        rs_sta->rate_scale_flush.function = iwl3945_bg_rate_scale_flush;
-
-        for (i = 0; i < IWL_RATE_COUNT_3945; i++)
-                iwl3945_clear_window(&rs_sta->win[i]);
-
-        /* TODO: what is a good starting rate for STA? About middle? Maybe not
-         * the lowest or the highest rate.. Could consider using RSSI from
-         * previous packets? Need to have IEEE 802.1X auth succeed immediately
-         * after assoc.. */
-
-        for (i = sband->n_bitrates - 1; i >= 0; i--) {
-                if (sta->supp_rates[sband->band] & (1 << i)) {
-                        rs_sta->last_txrate_idx = i;
-                        break;
-                }
-        }
-
-        priv->_3945.sta_supp_rates = sta->supp_rates[sband->band];
-        /* For 5 GHz band it start at IWL_FIRST_OFDM_RATE */
-        if (sband->band == IEEE80211_BAND_5GHZ) {
-                rs_sta->last_txrate_idx += IWL_FIRST_OFDM_RATE;
-                priv->_3945.sta_supp_rates = priv->_3945.sta_supp_rates <<
-                                                IWL_FIRST_OFDM_RATE;
-        }
-
-out:
-        priv->stations[sta_id].used &= ~IWL_STA_UCODE_INPROGRESS;
-
-        IWL_DEBUG_INFO(priv, "leave\n");
-}
-
-static void *iwl3945_rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
-{
-        return hw->priv;
-}
-
-/* rate scale requires free function to be implemented */
-static void iwl3945_rs_free(void *priv)
-{
-        return;
-}
-
-static void *iwl3945_rs_alloc_sta(void *iwl_priv, struct ieee80211_sta *sta, gfp_t gfp)
-{
-        struct iwl3945_rs_sta *rs_sta;
-        struct iwl3945_sta_priv *psta = (void *) sta->drv_priv;
-        struct iwl_priv *priv __maybe_unused = iwl_priv;
-
-        IWL_DEBUG_RATE(priv, "enter\n");
-
-        rs_sta = &psta->rs_sta;
-
-        spin_lock_init(&rs_sta->lock);
-        init_timer(&rs_sta->rate_scale_flush);
-
-        IWL_DEBUG_RATE(priv, "leave\n");
-
-        return rs_sta;
-}
-
-static void iwl3945_rs_free_sta(void *iwl_priv, struct ieee80211_sta *sta,
-                        void *priv_sta)
-{
-        struct iwl3945_rs_sta *rs_sta = priv_sta;
-
-        /*
-         * Be careful not to use any members of iwl3945_rs_sta (like trying
-         * to use iwl_priv to print out debugging) since it may not be fully
-         * initialized at this point.
-         */
-        del_timer_sync(&rs_sta->rate_scale_flush);
-}
-
-
-/**
- * iwl3945_rs_tx_status - Update rate control values based on Tx results
- *
- * NOTE: Uses iwl_priv->retry_rate for the # of retries attempted by
- * the hardware for each rate.
- */
-static void iwl3945_rs_tx_status(void *priv_rate, struct ieee80211_supported_band *sband,
-                         struct ieee80211_sta *sta, void *priv_sta,
-                         struct sk_buff *skb)
-{
-        s8 retries = 0, current_count;
-        int scale_rate_index, first_index, last_index;
-        unsigned long flags;
-        struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
-        struct iwl3945_rs_sta *rs_sta = priv_sta;
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-
-        IWL_DEBUG_RATE(priv, "enter\n");
-
-        retries = info->status.rates[0].count;
-        /* Sanity Check for retries */
-        if (retries > IWL_RATE_RETRY_TH)
-                retries = IWL_RATE_RETRY_TH;
-
-        first_index = sband->bitrates[info->status.rates[0].idx].hw_value;
-        if ((first_index < 0) || (first_index >= IWL_RATE_COUNT_3945)) {
-                IWL_DEBUG_RATE(priv, "leave: Rate out of bounds: %d\n", first_index);
-                return;
-        }
-
-        if (!priv_sta) {
-                IWL_DEBUG_RATE(priv, "leave: No STA priv data to update!\n");
-                return;
-        }
-
-        /* Treat uninitialized rate scaling data same as non-existing. */
-        if (!rs_sta->priv) {
-                IWL_DEBUG_RATE(priv, "leave: STA priv data uninitialized!\n");
-                return;
-        }
-
-
-        rs_sta->tx_packets++;
-
-        scale_rate_index = first_index;
-        last_index = first_index;
-
-        /*
-         * Update the window for each rate.  We determine which rates
-         * were Tx'd based on the total number of retries vs. the number
-         * of retries configured for each rate -- currently set to the
-         * priv value 'retry_rate' vs. rate specific
-         *
-         * On exit from this while loop last_index indicates the rate
-         * at which the frame was finally transmitted (or failed if no
-         * ACK)
-         */
-        while (retries > 1) {
-                if ((retries - 1) < priv->retry_rate) {
-                        current_count = (retries - 1);
-                        last_index = scale_rate_index;
-                } else {
-                        current_count = priv->retry_rate;
-                        last_index = iwl3945_rs_next_rate(priv,
-                                                         scale_rate_index);
-                }
-
-                /* Update this rate accounting for as many retries
-                 * as was used for it (per current_count) */
-                iwl3945_collect_tx_data(rs_sta,
-                                    &rs_sta->win[scale_rate_index],
-                                    0, current_count, scale_rate_index);
-                IWL_DEBUG_RATE(priv, "Update rate %d for %d retries.\n",
-                               scale_rate_index, current_count);
-
-                retries -= current_count;
-
-                scale_rate_index = last_index;
-        }
-
-
-        /* Update the last index window with success/failure based on ACK */
-        IWL_DEBUG_RATE(priv, "Update rate %d with %s.\n",
-                       last_index,
-                       (info->flags & IEEE80211_TX_STAT_ACK) ?
-                       "success" : "failure");
-        iwl3945_collect_tx_data(rs_sta,
-                            &rs_sta->win[last_index],
-                            info->flags & IEEE80211_TX_STAT_ACK, 1, last_index);
-
-        /* We updated the rate scale window -- if its been more than
-         * flush_time since the last run, schedule the flush
-         * again */
-        spin_lock_irqsave(&rs_sta->lock, flags);
-
-        if (!rs_sta->flush_pending &&
-            time_after(jiffies, rs_sta->last_flush +
-                       rs_sta->flush_time)) {
-
-                rs_sta->last_partial_flush = jiffies;
-                rs_sta->flush_pending = 1;
-                mod_timer(&rs_sta->rate_scale_flush,
-                          jiffies + rs_sta->flush_time);
-        }
-
-        spin_unlock_irqrestore(&rs_sta->lock, flags);
-
-        IWL_DEBUG_RATE(priv, "leave\n");
-}
-
-static u16 iwl3945_get_adjacent_rate(struct iwl3945_rs_sta *rs_sta,
-                                 u8 index, u16 rate_mask, enum ieee80211_band band)
-{
-        u8 high = IWL_RATE_INVALID;
-        u8 low = IWL_RATE_INVALID;
-        struct iwl_priv *priv __maybe_unused = rs_sta->priv;
-
-        /* 802.11A walks to the next literal adjacent rate in
-         * the rate table */
-        if (unlikely(band == IEEE80211_BAND_5GHZ)) {
-                int i;
-                u32 mask;
-
-                /* Find the previous rate that is in the rate mask */
-                i = index - 1;
-                for (mask = (1 << i); i >= 0; i--, mask >>= 1) {
-                        if (rate_mask & mask) {
-                                low = i;
-                                break;
-                        }
-                }
-
-                /* Find the next rate that is in the rate mask */
-                i = index + 1;
-                for (mask = (1 << i); i < IWL_RATE_COUNT_3945;
-                     i++, mask <<= 1) {
-                        if (rate_mask & mask) {
-                                high = i;
-                                break;
-                        }
-                }
-
-                return (high << 8) | low;
-        }
-
-        low = index;
-        while (low != IWL_RATE_INVALID) {
-                if (rs_sta->tgg)
-                        low = iwl3945_rates[low].prev_rs_tgg;
-                else
-                        low = iwl3945_rates[low].prev_rs;
-                if (low == IWL_RATE_INVALID)
-                        break;
-                if (rate_mask & (1 << low))
-                        break;
-                IWL_DEBUG_RATE(priv, "Skipping masked lower rate: %d\n", low);
-        }
-
-        high = index;
-        while (high != IWL_RATE_INVALID) {
-                if (rs_sta->tgg)
-                        high = iwl3945_rates[high].next_rs_tgg;
-                else
-                        high = iwl3945_rates[high].next_rs;
-                if (high == IWL_RATE_INVALID)
-                        break;
-                if (rate_mask & (1 << high))
-                        break;
-                IWL_DEBUG_RATE(priv, "Skipping masked higher rate: %d\n", high);
-        }
-
-        return (high << 8) | low;
-}
-
-/**
- * iwl3945_rs_get_rate - find the rate for the requested packet
- *
- * Returns the ieee80211_rate structure allocated by the driver.
- *
- * The rate control algorithm has no internal mapping between hw_mode's
- * rate ordering and the rate ordering used by the rate control algorithm.
- *
- * The rate control algorithm uses a single table of rates that goes across
- * the entire A/B/G spectrum vs. being limited to just one particular
- * hw_mode.
- *
- * As such, we can't convert the index obtained below into the hw_mode's
- * rate table and must reference the driver allocated rate table
- *
- */
-static void iwl3945_rs_get_rate(void *priv_r, struct ieee80211_sta *sta,
-                        void *priv_sta, struct ieee80211_tx_rate_control *txrc)
-{
-        struct ieee80211_supported_band *sband = txrc->sband;
-        struct sk_buff *skb = txrc->skb;
-        u8 low = IWL_RATE_INVALID;
-        u8 high = IWL_RATE_INVALID;
-        u16 high_low;
-        int index;
-        struct iwl3945_rs_sta *rs_sta = priv_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;
-        u32 fail_count;
-        s8 scale_action = 0;
-        unsigned long flags;
-        u16 rate_mask;
-        s8 max_rate_idx = -1;
-        struct iwl_priv *priv __maybe_unused = (struct iwl_priv *)priv_r;
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-
-        IWL_DEBUG_RATE(priv, "enter\n");
-
-        /* Treat uninitialized rate scaling data same as non-existing. */
-        if (rs_sta && !rs_sta->priv) {
-                IWL_DEBUG_RATE(priv, "Rate scaling information not initialized yet.\n");
-                priv_sta = NULL;
-        }
-
-        if (rate_control_send_low(sta, priv_sta, txrc))
-                return;
-
-        rate_mask = sta->supp_rates[sband->band];
-
-        /* get user max rate if set */
-        max_rate_idx = txrc->max_rate_idx;
-        if ((sband->band == IEEE80211_BAND_5GHZ) && (max_rate_idx != -1))
-                max_rate_idx += IWL_FIRST_OFDM_RATE;
-        if ((max_rate_idx < 0) || (max_rate_idx >= IWL_RATE_COUNT))
-                max_rate_idx = -1;
-
-        index = min(rs_sta->last_txrate_idx & 0xffff, IWL_RATE_COUNT_3945 - 1);
-
-        if (sband->band == IEEE80211_BAND_5GHZ)
-                rate_mask = rate_mask << IWL_FIRST_OFDM_RATE;
-
-        spin_lock_irqsave(&rs_sta->lock, flags);
-
-        /* for recent assoc, choose best rate regarding
-         * to rssi value
-         */
-        if (rs_sta->start_rate != IWL_RATE_INVALID) {
-                if (rs_sta->start_rate < index &&
-                   (rate_mask & (1 << rs_sta->start_rate)))
-                        index = rs_sta->start_rate;
-                rs_sta->start_rate = IWL_RATE_INVALID;
-        }
-
-        /* force user max rate if set by user */
-        if ((max_rate_idx != -1) && (max_rate_idx < index)) {
-                if (rate_mask & (1 << max_rate_idx))
-                        index = max_rate_idx;
-        }
-
-        window = &(rs_sta->win[index]);
-
-        fail_count = window->counter - window->success_counter;
-
-        if (((fail_count < IWL_RATE_MIN_FAILURE_TH) &&
-             (window->success_counter < IWL_RATE_MIN_SUCCESS_TH))) {
-                spin_unlock_irqrestore(&rs_sta->lock, flags);
-
-                IWL_DEBUG_RATE(priv, "Invalid average_tpt on rate %d: "
-                               "counter: %d, success_counter: %d, "
-                               "expected_tpt is %sNULL\n",
-                               index,
-                               window->counter,
-                               window->success_counter,
-                               rs_sta->expected_tpt ? "not " : "");
-
-           /* Can't calculate this yet; not enough history */
-                window->average_tpt = IWL_INVALID_VALUE;
-                goto out;
-
-        }
-
-        current_tpt = window->average_tpt;
-
-        high_low = iwl3945_get_adjacent_rate(rs_sta, index, rate_mask,
-                                             sband->band);
-        low = high_low & 0xff;
-        high = (high_low >> 8) & 0xff;
-
-        /* If user set max rate, dont allow higher than user constrain */
-        if ((max_rate_idx != -1) && (max_rate_idx < high))
-                high = IWL_RATE_INVALID;
-
-        /* Collect Measured throughputs of adjacent rates */
-        if (low != IWL_RATE_INVALID)
-                low_tpt = rs_sta->win[low].average_tpt;
-
-        if (high != IWL_RATE_INVALID)
-                high_tpt = rs_sta->win[high].average_tpt;
-
-        spin_unlock_irqrestore(&rs_sta->lock, flags);
-
-        scale_action = 0;
-
-        /* Low success ratio , need to drop the rate */
-        if ((window->success_ratio < IWL_RATE_DECREASE_TH) || !current_tpt) {
-                IWL_DEBUG_RATE(priv, "decrease rate because of low success_ratio\n");
-                scale_action = -1;
-        /* No throughput measured yet for adjacent rates,
-         * try increase */
-        } else if ((low_tpt == IWL_INVALID_VALUE) &&
-                   (high_tpt == IWL_INVALID_VALUE)) {
-
-                if (high != IWL_RATE_INVALID && window->success_ratio >= IWL_RATE_INCREASE_TH)
-                        scale_action = 1;
-                else if (low != IWL_RATE_INVALID)
-                        scale_action = 0;
-
-        /* Both adjacent throughputs are measured, but neither one has
-         * better throughput; we're using the best rate, don't change
-         * it! */
-        } else if ((low_tpt != IWL_INVALID_VALUE) &&
-                 (high_tpt != IWL_INVALID_VALUE) &&
-                 (low_tpt < current_tpt) && (high_tpt < current_tpt)) {
-
-                IWL_DEBUG_RATE(priv, "No action -- low [%d] & high [%d] < "
-                               "current_tpt [%d]\n",
-                               low_tpt, high_tpt, current_tpt);
-                scale_action = 0;
-
-        /* At least one of the rates has better throughput */
-        } else {
-                if (high_tpt != IWL_INVALID_VALUE) {
-
-                        /* High rate has better throughput, Increase
-                         * rate */
-                        if (high_tpt > current_tpt &&
-                                window->success_ratio >= IWL_RATE_INCREASE_TH)
-                                scale_action = 1;
-                        else {
-                                IWL_DEBUG_RATE(priv,
-                                    "decrease rate because of high tpt\n");
-                                scale_action = 0;
-                        }
-                } else if (low_tpt != IWL_INVALID_VALUE) {
-                        if (low_tpt > current_tpt) {
-                                IWL_DEBUG_RATE(priv,
-                                    "decrease rate because of low tpt\n");
-                                scale_action = -1;
-                        } else if (window->success_ratio >= IWL_RATE_INCREASE_TH) {
-                                /* Lower rate has better
-                                 * throughput,decrease rate */
-                                scale_action = 1;
-                        }
-                }
-        }
-
-        /* Sanity check; asked for decrease, but success rate or throughput
-         * has been good at old rate.  Don't change it. */
-        if ((scale_action == -1) && (low != IWL_RATE_INVALID) &&
-                    ((window->success_ratio > IWL_RATE_HIGH_TH) ||
-                     (current_tpt > (100 * rs_sta->expected_tpt[low]))))
-                scale_action = 0;
-
-        switch (scale_action) {
-        case -1:
-
-                /* Decrese rate */
-                if (low != IWL_RATE_INVALID)
-                        index = low;
-                break;
-
-        case 1:
-                /* Increase rate */
-                if (high != IWL_RATE_INVALID)
-                        index = high;
-
-                break;
-
-        case 0:
-        default:
-                /* No change */
-                break;
-        }
-
-        IWL_DEBUG_RATE(priv, "Selected %d (action %d) - low %d high %d\n",
-                       index, scale_action, low, high);
-
- out:
-
-        if (sband->band == IEEE80211_BAND_5GHZ) {
-                if (WARN_ON_ONCE(index < IWL_FIRST_OFDM_RATE))
-                        index = IWL_FIRST_OFDM_RATE;
-                rs_sta->last_txrate_idx = index;
-                info->control.rates[0].idx = index - IWL_FIRST_OFDM_RATE;
-        } else {
-                rs_sta->last_txrate_idx = index;
-                info->control.rates[0].idx = rs_sta->last_txrate_idx;
-        }
-
-        IWL_DEBUG_RATE(priv, "leave: %d\n", index);
-}
-
-#ifdef CONFIG_MAC80211_DEBUGFS
-static int iwl3945_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
-static ssize_t iwl3945_sta_dbgfs_stats_table_read(struct file *file,
-                                                  char __user *user_buf,
-                                                  size_t count, loff_t *ppos)
-{
-        char *buff;
-        int desc = 0;
-        int j;
-        ssize_t ret;
-        struct iwl3945_rs_sta *lq_sta = file->private_data;
-
-        buff = kmalloc(1024, GFP_KERNEL);
-        if (!buff)
-                return -ENOMEM;
-
-        desc += sprintf(buff + desc, "tx packets=%d last rate index=%d\n"
-                        "rate=0x%X flush time %d\n",
-                        lq_sta->tx_packets,
-                        lq_sta->last_txrate_idx,
-                        lq_sta->start_rate, jiffies_to_msecs(lq_sta->flush_time));
-        for (j = 0; j < IWL_RATE_COUNT_3945; j++) {
-                desc += sprintf(buff+desc,
-                                "counter=%d success=%d %%=%d\n",
-                                lq_sta->win[j].counter,
-                                lq_sta->win[j].success_counter,
-                                lq_sta->win[j].success_ratio);
-        }
-        ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);
-        kfree(buff);
-        return ret;
-}
-
-static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
-        .read = iwl3945_sta_dbgfs_stats_table_read,
-        .open = iwl3945_open_file_generic,
-        .llseek = default_llseek,
-};
-
-static void iwl3945_add_debugfs(void *priv, void *priv_sta,
-                                struct dentry *dir)
-{
-        struct iwl3945_rs_sta *lq_sta = 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);
-
-}
-
-static void iwl3945_remove_debugfs(void *priv, void *priv_sta)
-{
-        struct iwl3945_rs_sta *lq_sta = priv_sta;
-        debugfs_remove(lq_sta->rs_sta_dbgfs_stats_table_file);
-}
-#endif
-
-/*
- * Initialization of rate scaling information is done by driver after
- * the station is added. Since mac80211 calls this function before a
- * station is added we ignore it.
- */
-static void iwl3945_rs_rate_init_stub(void *priv_r,
-                                struct ieee80211_supported_band *sband,
-                              struct ieee80211_sta *sta, void *priv_sta)
-{
-}
-
-static struct rate_control_ops rs_ops = {
-        .module = NULL,
-        .name = RS_NAME,
-        .tx_status = iwl3945_rs_tx_status,
-        .get_rate = iwl3945_rs_get_rate,
-        .rate_init = iwl3945_rs_rate_init_stub,
-        .alloc = iwl3945_rs_alloc,
-        .free = iwl3945_rs_free,
-        .alloc_sta = iwl3945_rs_alloc_sta,
-        .free_sta = iwl3945_rs_free_sta,
-#ifdef CONFIG_MAC80211_DEBUGFS
-        .add_sta_debugfs = iwl3945_add_debugfs,
-        .remove_sta_debugfs = iwl3945_remove_debugfs,
-#endif
-
-};
-void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
-{
-        struct iwl_priv *priv = hw->priv;
-        s32 rssi = 0;
-        unsigned long flags;
-        struct iwl3945_rs_sta *rs_sta;
-        struct ieee80211_sta *sta;
-        struct iwl3945_sta_priv *psta;
-
-        IWL_DEBUG_RATE(priv, "enter\n");
-
-        rcu_read_lock();
-
-        sta = ieee80211_find_sta(priv->contexts[IWL_RXON_CTX_BSS].vif,
-                                 priv->stations[sta_id].sta.sta.addr);
-        if (!sta) {
-                IWL_DEBUG_RATE(priv, "Unable to find station to initialize rate scaling.\n");
-                rcu_read_unlock();
-                return;
-        }
-
-        psta = (void *) sta->drv_priv;
-        rs_sta = &psta->rs_sta;
-
-        spin_lock_irqsave(&rs_sta->lock, flags);
-
-        rs_sta->tgg = 0;
-        switch (priv->band) {
-        case IEEE80211_BAND_2GHZ:
-                /* TODO: this always does G, not a regression */
-                if (priv->contexts[IWL_RXON_CTX_BSS].active.flags &
-                                                RXON_FLG_TGG_PROTECT_MSK) {
-                        rs_sta->tgg = 1;
-                        rs_sta->expected_tpt = iwl3945_expected_tpt_g_prot;
-                } else
-                        rs_sta->expected_tpt = iwl3945_expected_tpt_g;
-                break;
-
-        case IEEE80211_BAND_5GHZ:
-                rs_sta->expected_tpt = iwl3945_expected_tpt_a;
-                break;
-        case IEEE80211_NUM_BANDS:
-                BUG();
-                break;
-        }
-
-        spin_unlock_irqrestore(&rs_sta->lock, flags);
-
-        rssi = priv->_3945.last_rx_rssi;
-        if (rssi == 0)
-                rssi = IWL_MIN_RSSI_VAL;
-
-        IWL_DEBUG_RATE(priv, "Network RSSI: %d\n", rssi);
-
-        rs_sta->start_rate = iwl3945_get_rate_index_by_rssi(rssi, priv->band);
-
-        IWL_DEBUG_RATE(priv, "leave: rssi %d assign rate index: "
-                       "%d (plcp 0x%x)\n", rssi, rs_sta->start_rate,
-                       iwl3945_rates[rs_sta->start_rate].plcp);
-        rcu_read_unlock();
-}
-
-int iwl3945_rate_control_register(void)
-{
-        return ieee80211_rate_control_register(&rs_ops);
-}
-
-void iwl3945_rate_control_unregister(void)
-{
-        ieee80211_rate_control_unregister(&rs_ops);
-}
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945.c b/drivers/net/wireless/iwlegacy/iwl-3945.c
deleted file mode 100644
index f7c0a7438476..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-3945.c
+++ /dev/null
@@ -1,2741 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@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/init.h>
-#include <linux/slab.h>
-#include <linux/pci.h>
-#include <linux/dma-mapping.h>
-#include <linux/delay.h>
-#include <linux/sched.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <linux/firmware.h>
-#include <linux/etherdevice.h>
-#include <asm/unaligned.h>
-#include <net/mac80211.h>
-
-#include "iwl-fh.h"
-#include "iwl-3945-fh.h"
-#include "iwl-commands.h"
-#include "iwl-sta.h"
-#include "iwl-3945.h"
-#include "iwl-eeprom.h"
-#include "iwl-core.h"
-#include "iwl-helpers.h"
-#include "iwl-led.h"
-#include "iwl-3945-led.h"
-#include "iwl-3945-debugfs.h"
-
-#define IWL_DECLARE_RATE_INFO(r, ip, in, rp, rn, pp, np)    \
-        [IWL_RATE_##r##M_INDEX] = { IWL_RATE_##r##M_PLCP,   \
-                                    IWL_RATE_##r##M_IEEE,   \
-                                    IWL_RATE_##ip##M_INDEX, \
-                                    IWL_RATE_##in##M_INDEX, \
-                                    IWL_RATE_##rp##M_INDEX, \
-                                    IWL_RATE_##rn##M_INDEX, \
-                                    IWL_RATE_##pp##M_INDEX, \
-                                    IWL_RATE_##np##M_INDEX, \
-                                    IWL_RATE_##r##M_INDEX_TABLE, \
-                                    IWL_RATE_##ip##M_INDEX_TABLE }
-
-/*
- * Parameter order:
- *   rate, prev rate, next rate, prev tgg rate, next tgg rate
- *
- * If there isn't a valid next or previous rate then INV is used which
- * maps to IWL_RATE_INVALID
- *
- */
-const struct iwl3945_rate_info iwl3945_rates[IWL_RATE_COUNT_3945] = {
-        IWL_DECLARE_RATE_INFO(1, INV, 2, INV, 2, INV, 2),    /*  1mbps */
-        IWL_DECLARE_RATE_INFO(2, 1, 5, 1, 5, 1, 5),          /*  2mbps */
-        IWL_DECLARE_RATE_INFO(5, 2, 6, 2, 11, 2, 11),        /*5.5mbps */
-        IWL_DECLARE_RATE_INFO(11, 9, 12, 5, 12, 5, 18),      /* 11mbps */
-        IWL_DECLARE_RATE_INFO(6, 5, 9, 5, 11, 5, 11),        /*  6mbps */
-        IWL_DECLARE_RATE_INFO(9, 6, 11, 5, 11, 5, 11),       /*  9mbps */
-        IWL_DECLARE_RATE_INFO(12, 11, 18, 11, 18, 11, 18),   /* 12mbps */
-        IWL_DECLARE_RATE_INFO(18, 12, 24, 12, 24, 11, 24),   /* 18mbps */
-        IWL_DECLARE_RATE_INFO(24, 18, 36, 18, 36, 18, 36),   /* 24mbps */
-        IWL_DECLARE_RATE_INFO(36, 24, 48, 24, 48, 24, 48),   /* 36mbps */
-        IWL_DECLARE_RATE_INFO(48, 36, 54, 36, 54, 36, 54),   /* 48mbps */
-        IWL_DECLARE_RATE_INFO(54, 48, INV, 48, INV, 48, INV),/* 54mbps */
-};
-
-static inline u8 iwl3945_get_prev_ieee_rate(u8 rate_index)
-{
-        u8 rate = iwl3945_rates[rate_index].prev_ieee;
-
-        if (rate == IWL_RATE_INVALID)
-                rate = rate_index;
-        return rate;
-}
-
-/* 1 = enable the iwl3945_disable_events() function */
-#define IWL_EVT_DISABLE (0)
-#define IWL_EVT_DISABLE_SIZE (1532/32)
-
-/**
- * iwl3945_disable_events - Disable selected events in uCode event log
- *
- * Disable an event by writing "1"s into "disable"
- *   bitmap in SRAM.  Bit position corresponds to Event # (id/type).
- *   Default values of 0 enable uCode events to be logged.
- * Use for only special debugging.  This function is just a placeholder as-is,
- *   you'll need to provide the special bits! ...
- *   ... and set IWL_EVT_DISABLE to 1. */
-void iwl3945_disable_events(struct iwl_priv *priv)
-{
-        int i;
-        u32 base;               /* SRAM address of event log header */
-        u32 disable_ptr;        /* SRAM address of event-disable bitmap array */
-        u32 array_size;         /* # of u32 entries in array */
-        static const u32 evt_disable[IWL_EVT_DISABLE_SIZE] = {
-                0x00000000,     /*   31 -    0  Event id numbers */
-                0x00000000,     /*   63 -   32 */
-                0x00000000,     /*   95 -   64 */
-                0x00000000,     /*  127 -   96 */
-                0x00000000,     /*  159 -  128 */
-                0x00000000,     /*  191 -  160 */
-                0x00000000,     /*  223 -  192 */
-                0x00000000,     /*  255 -  224 */
-                0x00000000,     /*  287 -  256 */
-                0x00000000,     /*  319 -  288 */
-                0x00000000,     /*  351 -  320 */
-                0x00000000,     /*  383 -  352 */
-                0x00000000,     /*  415 -  384 */
-                0x00000000,     /*  447 -  416 */
-                0x00000000,     /*  479 -  448 */
-                0x00000000,     /*  511 -  480 */
-                0x00000000,     /*  543 -  512 */
-                0x00000000,     /*  575 -  544 */
-                0x00000000,     /*  607 -  576 */
-                0x00000000,     /*  639 -  608 */
-                0x00000000,     /*  671 -  640 */
-                0x00000000,     /*  703 -  672 */
-                0x00000000,     /*  735 -  704 */
-                0x00000000,     /*  767 -  736 */
-                0x00000000,     /*  799 -  768 */
-                0x00000000,     /*  831 -  800 */
-                0x00000000,     /*  863 -  832 */
-                0x00000000,     /*  895 -  864 */
-                0x00000000,     /*  927 -  896 */
-                0x00000000,     /*  959 -  928 */
-                0x00000000,     /*  991 -  960 */
-                0x00000000,     /* 1023 -  992 */
-                0x00000000,     /* 1055 - 1024 */
-                0x00000000,     /* 1087 - 1056 */
-                0x00000000,     /* 1119 - 1088 */
-                0x00000000,     /* 1151 - 1120 */
-                0x00000000,     /* 1183 - 1152 */
-                0x00000000,     /* 1215 - 1184 */
-                0x00000000,     /* 1247 - 1216 */
-                0x00000000,     /* 1279 - 1248 */
-                0x00000000,     /* 1311 - 1280 */
-                0x00000000,     /* 1343 - 1312 */
-                0x00000000,     /* 1375 - 1344 */
-                0x00000000,     /* 1407 - 1376 */
-                0x00000000,     /* 1439 - 1408 */
-                0x00000000,     /* 1471 - 1440 */
-                0x00000000,     /* 1503 - 1472 */
-        };
-
-        base = le32_to_cpu(priv->card_alive.log_event_table_ptr);
-        if (!iwl3945_hw_valid_rtc_data_addr(base)) {
-                IWL_ERR(priv, "Invalid event log pointer 0x%08X\n", base);
-                return;
-        }
-
-        disable_ptr = iwl_legacy_read_targ_mem(priv, base + (4 * sizeof(u32)));
-        array_size = iwl_legacy_read_targ_mem(priv, base + (5 * sizeof(u32)));
-
-        if (IWL_EVT_DISABLE && (array_size == IWL_EVT_DISABLE_SIZE)) {
-                IWL_DEBUG_INFO(priv, "Disabling selected uCode log events at 0x%x\n",
-                               disable_ptr);
-                for (i = 0; i < IWL_EVT_DISABLE_SIZE; i++)
-                        iwl_legacy_write_targ_mem(priv,
-                                           disable_ptr + (i * sizeof(u32)),
-                                           evt_disable[i]);
-
-        } else {
-                IWL_DEBUG_INFO(priv, "Selected uCode log events may be disabled\n");
-                IWL_DEBUG_INFO(priv, "  by writing \"1\"s into disable bitmap\n");
-                IWL_DEBUG_INFO(priv, "  in SRAM at 0x%x, size %d u32s\n",
-                               disable_ptr, array_size);
-        }
-
-}
-
-static int iwl3945_hwrate_to_plcp_idx(u8 plcp)
-{
-        int idx;
-
-        for (idx = 0; idx < IWL_RATE_COUNT_3945; idx++)
-                if (iwl3945_rates[idx].plcp == plcp)
-                        return idx;
-        return -1;
-}
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-#define TX_STATUS_ENTRY(x) case TX_3945_STATUS_FAIL_ ## x: return #x
-
-static const char *iwl3945_get_tx_fail_reason(u32 status)
-{
-        switch (status & TX_STATUS_MSK) {
-        case TX_3945_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
-
-/*
- * get ieee prev rate from rate scale table.
- * for A and B mode we need to overright prev
- * value
- */
-int iwl3945_rs_next_rate(struct iwl_priv *priv, int rate)
-{
-        int next_rate = iwl3945_get_prev_ieee_rate(rate);
-
-        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;
-        case IEEE80211_BAND_2GHZ:
-                if (!(priv->_3945.sta_supp_rates & IWL_OFDM_RATES_MASK) &&
-                    iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS)) {
-                        if (rate == IWL_RATE_11M_INDEX)
-                                next_rate = IWL_RATE_5M_INDEX;
-                }
-                break;
-
-        default:
-                break;
-        }
-
-        return next_rate;
-}
-
-
-/**
- * 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 iwl_priv *priv,
-                                     int txq_id, int index)
-{
-        struct iwl_tx_queue *txq = &priv->txq[txq_id];
-        struct iwl_queue *q = &txq->q;
-        struct iwl_tx_info *tx_info;
-
-        BUG_ON(txq_id == IWL39_CMD_QUEUE_NUM);
-
-        for (index = iwl_legacy_queue_inc_wrap(index, q->n_bd);
-                q->read_ptr != index;
-                q->read_ptr = iwl_legacy_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);
-                tx_info->skb = NULL;
-                priv->cfg->ops->lib->txq_free_tfd(priv, txq);
-        }
-
-        if (iwl_legacy_queue_space(q) > q->low_mark && (txq_id >= 0) &&
-                        (txq_id != IWL39_CMD_QUEUE_NUM) &&
-                        priv->mac80211_registered)
-                iwl_legacy_wake_queue(priv, txq);
-}
-
-/**
- * iwl3945_rx_reply_tx - Handle Tx response
- */
-static void iwl3945_rx_reply_tx(struct iwl_priv *priv,
-                                struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        u16 sequence = le16_to_cpu(pkt->hdr.sequence);
-        int txq_id = SEQ_TO_QUEUE(sequence);
-        int index = SEQ_TO_INDEX(sequence);
-        struct iwl_tx_queue *txq = &priv->txq[txq_id];
-        struct ieee80211_tx_info *info;
-        struct iwl3945_tx_resp *tx_resp = (void *)&pkt->u.raw[0];
-        u32  status = le32_to_cpu(tx_resp->status);
-        int rate_idx;
-        int fail;
-
-        if ((index >= txq->q.n_bd) || (iwl_legacy_queue_used(&txq->q, index) == 0)) {
-                IWL_ERR(priv, "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;
-        }
-
-        txq->time_stamp = jiffies;
-        info = IEEE80211_SKB_CB(txq->txb[txq->q.read_ptr].skb);
-        ieee80211_tx_info_clear_status(info);
-
-        /* Fill the MRR chain with some info about on-chip retransmissions */
-        rate_idx = iwl3945_hwrate_to_plcp_idx(tx_resp->rate);
-        if (info->band == IEEE80211_BAND_5GHZ)
-                rate_idx -= IWL_FIRST_OFDM_RATE;
-
-        fail = tx_resp->failure_frame;
-
-        info->status.rates[0].idx = rate_idx;
-        info->status.rates[0].count = fail + 1; /* add final attempt */
-
-        /* tx_status->rts_retry_count = tx_resp->failure_rts; */
-        info->flags |= ((status & TX_STATUS_MSK) == TX_STATUS_SUCCESS) ?
-                                IEEE80211_TX_STAT_ACK : 0;
-
-        IWL_DEBUG_TX(priv, "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(priv, "Tx queue reclaim %d\n", index);
-        iwl3945_tx_queue_reclaim(priv, txq_id, index);
-
-        if (status & TX_ABORT_REQUIRED_MSK)
-                IWL_ERR(priv, "TODO:  Implement Tx ABORT REQUIRED!!!\n");
-}
-
-
-
-/*****************************************************************************
- *
- * Intel PRO/Wireless 3945ABG/BG Network Connection
- *
- *  RX handler implementations
- *
- *****************************************************************************/
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
-static void iwl3945_accumulative_statistics(struct iwl_priv *priv,
-                                            __le32 *stats)
-{
-        int i;
-        __le32 *prev_stats;
-        u32 *accum_stats;
-        u32 *delta, *max_delta;
-
-        prev_stats = (__le32 *)&priv->_3945.statistics;
-        accum_stats = (u32 *)&priv->_3945.accum_statistics;
-        delta = (u32 *)&priv->_3945.delta_statistics;
-        max_delta = (u32 *)&priv->_3945.max_delta;
-
-        for (i = sizeof(__le32); i < sizeof(struct iwl3945_notif_statistics);
-             i += sizeof(__le32), stats++, prev_stats++, delta++,
-             max_delta++, accum_stats++) {
-                if (le32_to_cpu(*stats) > le32_to_cpu(*prev_stats)) {
-                        *delta = (le32_to_cpu(*stats) -
-                                le32_to_cpu(*prev_stats));
-                        *accum_stats += *delta;
-                        if (*delta > *max_delta)
-                                *max_delta = *delta;
-                }
-        }
-
-        /* reset accumulative statistics for "no-counter" type statistics */
-        priv->_3945.accum_statistics.general.temperature =
-                priv->_3945.statistics.general.temperature;
-        priv->_3945.accum_statistics.general.ttl_timestamp =
-                priv->_3945.statistics.general.ttl_timestamp;
-}
-#endif
-
-void iwl3945_hw_rx_statistics(struct iwl_priv *priv,
-                struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-
-        IWL_DEBUG_RX(priv, "Statistics notification received (%d vs %d).\n",
-                     (int)sizeof(struct iwl3945_notif_statistics),
-                     le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK);
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
-        iwl3945_accumulative_statistics(priv, (__le32 *)&pkt->u.raw);
-#endif
-
-        memcpy(&priv->_3945.statistics, pkt->u.raw, sizeof(priv->_3945.statistics));
-}
-
-void iwl3945_reply_statistics(struct iwl_priv *priv,
-                              struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        __le32 *flag = (__le32 *)&pkt->u.raw;
-
-        if (le32_to_cpu(*flag) & UCODE_STATISTICS_CLEAR_MSK) {
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
-                memset(&priv->_3945.accum_statistics, 0,
-                        sizeof(struct iwl3945_notif_statistics));
-                memset(&priv->_3945.delta_statistics, 0,
-                        sizeof(struct iwl3945_notif_statistics));
-                memset(&priv->_3945.max_delta, 0,
-                        sizeof(struct iwl3945_notif_statistics));
-#endif
-                IWL_DEBUG_RX(priv, "Statistics have been cleared\n");
-        }
-        iwl3945_hw_rx_statistics(priv, rxb);
-}
-
-
-/******************************************************************************
- *
- * Misc. internal state and helper functions
- *
- ******************************************************************************/
-
-/* This is necessary only for a number of statistics, see the caller. */
-static int iwl3945_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 */
-        switch (priv->iw_mode) {
-        case NL80211_IFTYPE_ADHOC: /* Header: Dest. | Source    | BSSID */
-                /* packets to our IBSS update information */
-                return !compare_ether_addr(header->addr3, priv->bssid);
-        case NL80211_IFTYPE_STATION: /* Header: Dest. | AP{BSSID} | Source */
-                /* packets to our IBSS update information */
-                return !compare_ether_addr(header->addr2, priv->bssid);
-        default:
-                return 1;
-        }
-}
-
-static void iwl3945_pass_packet_to_mac80211(struct iwl_priv *priv,
-                                   struct iwl_rx_mem_buffer *rxb,
-                                   struct ieee80211_rx_status *stats)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)IWL_RX_DATA(pkt);
-        struct iwl3945_rx_frame_hdr *rx_hdr = IWL_RX_HDR(pkt);
-        struct iwl3945_rx_frame_end *rx_end = IWL_RX_END(pkt);
-        u16 len = le16_to_cpu(rx_hdr->len);
-        struct sk_buff *skb;
-        __le16 fc = hdr->frame_control;
-
-        /* We received data from the HW, so stop the watchdog */
-        if (unlikely(len + IWL39_RX_FRAME_SIZE >
-                     PAGE_SIZE << priv->hw_params.rx_page_order)) {
-                IWL_DEBUG_DROP(priv, "Corruption detected!\n");
-                return;
-        }
-
-        /* We only process data packets if the interface is open */
-        if (unlikely(!priv->is_open)) {
-                IWL_DEBUG_DROP_LIMIT(priv,
-                        "Dropping packet while interface is not open.\n");
-                return;
-        }
-
-        skb = dev_alloc_skb(128);
-        if (!skb) {
-                IWL_ERR(priv, "dev_alloc_skb failed\n");
-                return;
-        }
-
-        if (!iwl3945_mod_params.sw_crypto)
-                iwl_legacy_set_decrypted_flag(priv,
-                                       (struct ieee80211_hdr *)rxb_addr(rxb),
-                                       le32_to_cpu(rx_end->status), stats);
-
-        skb_add_rx_frag(skb, 0, rxb->page,
-                        (void *)rx_hdr->payload - (void *)pkt, len);
-
-        iwl_legacy_update_stats(priv, false, fc, len);
-        memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats));
-
-        ieee80211_rx(priv->hw, skb);
-        priv->alloc_rxb_page--;
-        rxb->page = NULL;
-}
-
-#define IWL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6)
-
-static void iwl3945_rx_reply_rx(struct iwl_priv *priv,
-                                struct iwl_rx_mem_buffer *rxb)
-{
-        struct ieee80211_hdr *header;
-        struct ieee80211_rx_status rx_status;
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        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);
-        u16 rx_stats_sig_avg __maybe_unused = le16_to_cpu(rx_stats->sig_avg);
-        u16 rx_stats_noise_diff __maybe_unused = le16_to_cpu(rx_stats->noise_diff);
-        u8 network_packet;
-
-        rx_status.flag = 0;
-        rx_status.mactime = le64_to_cpu(rx_end->timestamp);
-        rx_status.band = (rx_hdr->phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK) ?
-                                IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
-        rx_status.freq =
-                ieee80211_channel_to_frequency(le16_to_cpu(rx_hdr->channel),
-                                               rx_status.band);
-
-        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;
-
-        rx_status.antenna = (le16_to_cpu(rx_hdr->phy_flags) &
-                                        RX_RES_PHY_FLAGS_ANTENNA_MSK) >> 4;
-
-        /* set the preamble flag if appropriate */
-        if (rx_hdr->phy_flags & RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)
-                rx_status.flag |= RX_FLAG_SHORTPRE;
-
-        if ((unlikely(rx_stats->phy_count > 20))) {
-                IWL_DEBUG_DROP(priv, "dsp size out of range [0,20]: %d/n",
-                                rx_stats->phy_count);
-                return;
-        }
-
-        if (!(rx_end->status & RX_RES_STATUS_NO_CRC32_ERROR)
-            || !(rx_end->status & RX_RES_STATUS_NO_RXE_OVERFLOW)) {
-                IWL_DEBUG_RX(priv, "Bad CRC or FIFO: 0x%08X.\n", rx_end->status);
-                return;
-        }
-
-
-
-        /* Convert 3945's rssi indicator to dBm */
-        rx_status.signal = rx_stats->rssi - IWL39_RSSI_OFFSET;
-
-        IWL_DEBUG_STATS(priv, "Rssi %d sig_avg %d noise_diff %d\n",
-                        rx_status.signal, rx_stats_sig_avg,
-                        rx_stats_noise_diff);
-
-        header = (struct ieee80211_hdr *)IWL_RX_DATA(pkt);
-
-        network_packet = iwl3945_is_network_packet(priv, header);
-
-        IWL_DEBUG_STATS_LIMIT(priv, "[%c] %d RSSI:%d Signal:%u, Rate:%u\n",
-                              network_packet ? '*' : ' ',
-                              le16_to_cpu(rx_hdr->channel),
-                              rx_status.signal, rx_status.signal,
-                              rx_status.rate_idx);
-
-        iwl_legacy_dbg_log_rx_data_frame(priv, le16_to_cpu(rx_hdr->len),
-                                                header);
-
-        if (network_packet) {
-                priv->_3945.last_beacon_time =
-                        le32_to_cpu(rx_end->beacon_timestamp);
-                priv->_3945.last_tsf = le64_to_cpu(rx_end->timestamp);
-                priv->_3945.last_rx_rssi = rx_status.signal;
-        }
-
-        iwl3945_pass_packet_to_mac80211(priv, rxb, &rx_status);
-}
-
-int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv,
-                                     struct iwl_tx_queue *txq,
-                                     dma_addr_t addr, u16 len, u8 reset, u8 pad)
-{
-        int count;
-        struct iwl_queue *q;
-        struct iwl3945_tfd *tfd, *tfd_tmp;
-
-        q = &txq->q;
-        tfd_tmp = (struct iwl3945_tfd *)txq->tfds;
-        tfd = &tfd_tmp[q->write_ptr];
-
-        if (reset)
-                memset(tfd, 0, sizeof(*tfd));
-
-        count = TFD_CTL_COUNT_GET(le32_to_cpu(tfd->control_flags));
-
-        if ((count >= NUM_TFD_CHUNKS) || (count < 0)) {
-                IWL_ERR(priv, "Error can not send more than %d chunks\n",
-                          NUM_TFD_CHUNKS);
-                return -EINVAL;
-        }
-
-        tfd->tbs[count].addr = cpu_to_le32(addr);
-        tfd->tbs[count].len = cpu_to_le32(len);
-
-        count++;
-
-        tfd->control_flags = cpu_to_le32(TFD_CTL_COUNT_SET(count) |
-                                         TFD_CTL_PAD_SET(pad));
-
-        return 0;
-}
-
-/**
- * iwl3945_hw_txq_free_tfd - Free one TFD, those at index [txq->q.read_ptr]
- *
- * Does NOT advance any indexes
- */
-void iwl3945_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)
-{
-        struct iwl3945_tfd *tfd_tmp = (struct iwl3945_tfd *)txq->tfds;
-        int index = txq->q.read_ptr;
-        struct iwl3945_tfd *tfd = &tfd_tmp[index];
-        struct pci_dev *dev = priv->pci_dev;
-        int i;
-        int counter;
-
-        /* sanity check */
-        counter = TFD_CTL_COUNT_GET(le32_to_cpu(tfd->control_flags));
-        if (counter > NUM_TFD_CHUNKS) {
-                IWL_ERR(priv, "Too many chunks: %i\n", counter);
-                /* @todo issue fatal error, it is quite serious situation */
-                return;
-        }
-
-        /* Unmap tx_cmd */
-        if (counter)
-                pci_unmap_single(dev,
-                                dma_unmap_addr(&txq->meta[index], mapping),
-                                dma_unmap_len(&txq->meta[index], len),
-                                PCI_DMA_TODEVICE);
-
-        /* unmap chunks if any */
-
-        for (i = 1; i < counter; i++)
-                pci_unmap_single(dev, le32_to_cpu(tfd->tbs[i].addr),
-                         le32_to_cpu(tfd->tbs[i].len), PCI_DMA_TODEVICE);
-
-        /* free SKB */
-        if (txq->txb) {
-                struct sk_buff *skb;
-
-                skb = txq->txb[txq->q.read_ptr].skb;
-
-                /* can be called from irqs-disabled context */
-                if (skb) {
-                        dev_kfree_skb_any(skb);
-                        txq->txb[txq->q.read_ptr].skb = NULL;
-                }
-        }
-}
-
-/**
- * iwl3945_hw_build_tx_cmd_rate - Add rate portion to TX_CMD:
- *
-*/
-void iwl3945_hw_build_tx_cmd_rate(struct iwl_priv *priv,
-                                  struct iwl_device_cmd *cmd,
-                                  struct ieee80211_tx_info *info,
-                                  struct ieee80211_hdr *hdr,
-                                  int sta_id, int tx_id)
-{
-        u16 hw_value = ieee80211_get_tx_rate(priv->hw, info)->hw_value;
-        u16 rate_index = min(hw_value & 0xffff, IWL_RATE_COUNT_3945);
-        u16 rate_mask;
-        int rate;
-        u8 rts_retry_limit;
-        u8 data_retry_limit;
-        __le32 tx_flags;
-        __le16 fc = hdr->frame_control;
-        struct iwl3945_tx_cmd *tx_cmd = (struct iwl3945_tx_cmd *)cmd->cmd.payload;
-
-        rate = iwl3945_rates[rate_index].plcp;
-        tx_flags = tx_cmd->tx_flags;
-
-        /* We need to figure out how to get the sta->supp_rates while
-         * in this running context */
-        rate_mask = IWL_RATES_MASK_3945;
-
-        /* Set retry limit on DATA packets and Probe Responses*/
-        if (ieee80211_is_probe_resp(fc))
-                data_retry_limit = 3;
-        else
-                data_retry_limit = IWL_DEFAULT_TX_RETRY;
-        tx_cmd->data_retry_limit = data_retry_limit;
-
-        if (tx_id >= IWL39_CMD_QUEUE_NUM)
-                rts_retry_limit = 3;
-        else
-                rts_retry_limit = 7;
-
-        if (data_retry_limit < rts_retry_limit)
-                rts_retry_limit = data_retry_limit;
-        tx_cmd->rts_retry_limit = rts_retry_limit;
-
-        tx_cmd->rate = rate;
-        tx_cmd->tx_flags = tx_flags;
-
-        /* OFDM */
-        tx_cmd->supp_rates[0] =
-           ((rate_mask & IWL_OFDM_RATES_MASK) >> IWL_FIRST_OFDM_RATE) & 0xFF;
-
-        /* CCK */
-        tx_cmd->supp_rates[1] = (rate_mask & 0xF);
-
-        IWL_DEBUG_RATE(priv, "Tx sta id: %d, rate: %d (plcp), flags: 0x%4X "
-                       "cck/ofdm mask: 0x%x/0x%x\n", sta_id,
-                       tx_cmd->rate, le32_to_cpu(tx_cmd->tx_flags),
-                       tx_cmd->supp_rates[1], tx_cmd->supp_rates[0]);
-}
-
-static u8 iwl3945_sync_sta(struct iwl_priv *priv, int sta_id, u16 tx_rate)
-{
-        unsigned long flags_spin;
-        struct iwl_station_entry *station;
-
-        if (sta_id == IWL_INVALID_STATION)
-                return IWL_INVALID_STATION;
-
-        spin_lock_irqsave(&priv->sta_lock, flags_spin);
-        station = &priv->stations[sta_id];
-
-        station->sta.sta.modify_mask = STA_MODIFY_TX_RATE_MSK;
-        station->sta.rate_n_flags = cpu_to_le16(tx_rate);
-        station->sta.mode = STA_CONTROL_MODIFY_MSK;
-        iwl_legacy_send_add_sta(priv, &station->sta, CMD_ASYNC);
-        spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
-
-        IWL_DEBUG_RATE(priv, "SCALE sync station %d to rate %d\n",
-                        sta_id, tx_rate);
-        return sta_id;
-}
-
-static void iwl3945_set_pwr_vmain(struct iwl_priv *priv)
-{
-/*
- * (for documentation purposes)
- * to set power to V_AUX, do
-
-                if (pci_pme_capable(priv->pci_dev, PCI_D3cold)) {
-                        iwl_legacy_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,
-                                        APMG_PS_CTRL_VAL_PWR_SRC_VAUX,
-                                        ~APMG_PS_CTRL_MSK_PWR_SRC);
-
-                        iwl_poll_bit(priv, CSR_GPIO_IN,
-                                     CSR_GPIO_IN_VAL_VAUX_PWR_SRC,
-                                     CSR_GPIO_IN_BIT_AUX_POWER, 5000);
-                }
- */
-
-        iwl_legacy_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,
-                        APMG_PS_CTRL_VAL_PWR_SRC_VMAIN,
-                        ~APMG_PS_CTRL_MSK_PWR_SRC);
-
-        iwl_poll_bit(priv, CSR_GPIO_IN, CSR_GPIO_IN_VAL_VMAIN_PWR_SRC,
-                     CSR_GPIO_IN_BIT_AUX_POWER, 5000);  /* uS */
-}
-
-static int iwl3945_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
-{
-        iwl_legacy_write_direct32(priv, FH39_RCSR_RBD_BASE(0), rxq->bd_dma);
-        iwl_legacy_write_direct32(priv, FH39_RCSR_RPTR_ADDR(0),
-                                        rxq->rb_stts_dma);
-        iwl_legacy_write_direct32(priv, FH39_RCSR_WPTR(0), 0);
-        iwl_legacy_write_direct32(priv, FH39_RCSR_CONFIG(0),
-                FH39_RCSR_RX_CONFIG_REG_VAL_DMA_CHNL_EN_ENABLE |
-                FH39_RCSR_RX_CONFIG_REG_VAL_RDRBD_EN_ENABLE |
-                FH39_RCSR_RX_CONFIG_REG_BIT_WR_STTS_EN |
-                FH39_RCSR_RX_CONFIG_REG_VAL_MAX_FRAG_SIZE_128 |
-                (RX_QUEUE_SIZE_LOG << FH39_RCSR_RX_CONFIG_REG_POS_RBDC_SIZE) |
-                FH39_RCSR_RX_CONFIG_REG_VAL_IRQ_DEST_INT_HOST |
-                (1 << FH39_RCSR_RX_CONFIG_REG_POS_IRQ_RBTH) |
-                FH39_RCSR_RX_CONFIG_REG_VAL_MSG_MODE_FH);
-
-        /* fake read to flush all prev I/O */
-        iwl_legacy_read_direct32(priv, FH39_RSSR_CTRL);
-
-        return 0;
-}
-
-static int iwl3945_tx_reset(struct iwl_priv *priv)
-{
-
-        /* bypass mode */
-        iwl_legacy_write_prph(priv, ALM_SCD_MODE_REG, 0x2);
-
-        /* RA 0 is active */
-        iwl_legacy_write_prph(priv, ALM_SCD_ARASTAT_REG, 0x01);
-
-        /* all 6 fifo are active */
-        iwl_legacy_write_prph(priv, ALM_SCD_TXFACT_REG, 0x3f);
-
-        iwl_legacy_write_prph(priv, ALM_SCD_SBYP_MODE_1_REG, 0x010000);
-        iwl_legacy_write_prph(priv, ALM_SCD_SBYP_MODE_2_REG, 0x030002);
-        iwl_legacy_write_prph(priv, ALM_SCD_TXF4MF_REG, 0x000004);
-        iwl_legacy_write_prph(priv, ALM_SCD_TXF5MF_REG, 0x000005);
-
-        iwl_legacy_write_direct32(priv, FH39_TSSR_CBB_BASE,
-                             priv->_3945.shared_phys);
-
-        iwl_legacy_write_direct32(priv, FH39_TSSR_MSG_CONFIG,
-                FH39_TSSR_TX_MSG_CONFIG_REG_VAL_SNOOP_RD_TXPD_ON |
-                FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RD_TXPD_ON |
-                FH39_TSSR_TX_MSG_CONFIG_REG_VAL_MAX_FRAG_SIZE_128B |
-                FH39_TSSR_TX_MSG_CONFIG_REG_VAL_SNOOP_RD_TFD_ON |
-                FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RD_CBB_ON |
-                FH39_TSSR_TX_MSG_CONFIG_REG_VAL_ORDER_RSP_WAIT_TH |
-                FH39_TSSR_TX_MSG_CONFIG_REG_VAL_RSP_WAIT_TH);
-
-
-        return 0;
-}
-
-/**
- * iwl3945_txq_ctx_reset - Reset TX queue context
- *
- * Destroys all DMA structures and initialize them again
- */
-static int iwl3945_txq_ctx_reset(struct iwl_priv *priv)
-{
-        int rc;
-        int txq_id, slots_num;
-
-        iwl3945_hw_txq_ctx_free(priv);
-
-        /* allocate tx queue structure */
-        rc = iwl_legacy_alloc_txq_mem(priv);
-        if (rc)
-                return rc;
-
-        /* Tx CMD queue */
-        rc = iwl3945_tx_reset(priv);
-        if (rc)
-                goto error;
-
-        /* Tx queue(s) */
-        for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) {
-                slots_num = (txq_id == IWL39_CMD_QUEUE_NUM) ?
-                                TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;
-                rc = iwl_legacy_tx_queue_init(priv, &priv->txq[txq_id],
-                                                slots_num, txq_id);
-                if (rc) {
-                        IWL_ERR(priv, "Tx %d queue init failed\n", txq_id);
-                        goto error;
-                }
-        }
-
-        return rc;
-
- error:
-        iwl3945_hw_txq_ctx_free(priv);
-        return rc;
-}
-
-
-/*
- * Start up 3945's basic functionality after it has been reset
- * (e.g. after platform boot, or shutdown via iwl_legacy_apm_stop())
- * NOTE:  This does not load uCode nor start the embedded processor
- */
-static int iwl3945_apm_init(struct iwl_priv *priv)
-{
-        int ret = iwl_legacy_apm_init(priv);
-
-        /* Clear APMG (NIC's internal power management) interrupts */
-        iwl_legacy_write_prph(priv, APMG_RTC_INT_MSK_REG, 0x0);
-        iwl_legacy_write_prph(priv, APMG_RTC_INT_STT_REG, 0xFFFFFFFF);
-
-        /* Reset radio chip */
-        iwl_legacy_set_bits_prph(priv, APMG_PS_CTRL_REG,
-                                APMG_PS_CTRL_VAL_RESET_REQ);
-        udelay(5);
-        iwl_legacy_clear_bits_prph(priv, APMG_PS_CTRL_REG,
-                                APMG_PS_CTRL_VAL_RESET_REQ);
-
-        return ret;
-}
-
-static void iwl3945_nic_config(struct iwl_priv *priv)
-{
-        struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom;
-        unsigned long flags;
-        u8 rev_id = priv->pci_dev->revision;
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        /* Determine HW type */
-        IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", rev_id);
-
-        if (rev_id & PCI_CFG_REV_ID_BIT_RTP)
-                IWL_DEBUG_INFO(priv, "RTP type\n");
-        else if (rev_id & PCI_CFG_REV_ID_BIT_BASIC_SKU) {
-                IWL_DEBUG_INFO(priv, "3945 RADIO-MB type\n");
-                iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                            CSR39_HW_IF_CONFIG_REG_BIT_3945_MB);
-        } else {
-                IWL_DEBUG_INFO(priv, "3945 RADIO-MM type\n");
-                iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                            CSR39_HW_IF_CONFIG_REG_BIT_3945_MM);
-        }
-
-        if (EEPROM_SKU_CAP_OP_MODE_MRC == eeprom->sku_cap) {
-                IWL_DEBUG_INFO(priv, "SKU OP mode is mrc\n");
-                iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                            CSR39_HW_IF_CONFIG_REG_BIT_SKU_MRC);
-        } else
-                IWL_DEBUG_INFO(priv, "SKU OP mode is basic\n");
-
-        if ((eeprom->board_revision & 0xF0) == 0xD0) {
-                IWL_DEBUG_INFO(priv, "3945ABG revision is 0x%X\n",
-                               eeprom->board_revision);
-                iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                            CSR39_HW_IF_CONFIG_REG_BIT_BOARD_TYPE);
-        } else {
-                IWL_DEBUG_INFO(priv, "3945ABG revision is 0x%X\n",
-                               eeprom->board_revision);
-                iwl_legacy_clear_bit(priv, CSR_HW_IF_CONFIG_REG,
-                              CSR39_HW_IF_CONFIG_REG_BIT_BOARD_TYPE);
-        }
-
-        if (eeprom->almgor_m_version <= 1) {
-                iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                            CSR39_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_A);
-                IWL_DEBUG_INFO(priv, "Card M type A version is 0x%X\n",
-                               eeprom->almgor_m_version);
-        } else {
-                IWL_DEBUG_INFO(priv, "Card M type B version is 0x%X\n",
-                               eeprom->almgor_m_version);
-                iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                            CSR39_HW_IF_CONFIG_REG_BITS_SILICON_TYPE_B);
-        }
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        if (eeprom->sku_cap & EEPROM_SKU_CAP_SW_RF_KILL_ENABLE)
-                IWL_DEBUG_RF_KILL(priv, "SW RF KILL supported in EEPROM.\n");
-
-        if (eeprom->sku_cap & EEPROM_SKU_CAP_HW_RF_KILL_ENABLE)
-                IWL_DEBUG_RF_KILL(priv, "HW RF KILL supported in EEPROM.\n");
-}
-
-int iwl3945_hw_nic_init(struct iwl_priv *priv)
-{
-        int rc;
-        unsigned long flags;
-        struct iwl_rx_queue *rxq = &priv->rxq;
-
-        spin_lock_irqsave(&priv->lock, flags);
-        priv->cfg->ops->lib->apm_ops.init(priv);
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        iwl3945_set_pwr_vmain(priv);
-
-        priv->cfg->ops->lib->apm_ops.config(priv);
-
-        /* Allocate the RX queue, or reset if it is already allocated */
-        if (!rxq->bd) {
-                rc = iwl_legacy_rx_queue_alloc(priv);
-                if (rc) {
-                        IWL_ERR(priv, "Unable to initialize Rx queue\n");
-                        return -ENOMEM;
-                }
-        } else
-                iwl3945_rx_queue_reset(priv, rxq);
-
-        iwl3945_rx_replenish(priv);
-
-        iwl3945_rx_init(priv, rxq);
-
-
-        /* Look at using this instead:
-        rxq->need_update = 1;
-        iwl_legacy_rx_queue_update_write_ptr(priv, rxq);
-        */
-
-        iwl_legacy_write_direct32(priv, FH39_RCSR_WPTR(0), rxq->write & ~7);
-
-        rc = iwl3945_txq_ctx_reset(priv);
-        if (rc)
-                return rc;
-
-        set_bit(STATUS_INIT, &priv->status);
-
-        return 0;
-}
-
-/**
- * iwl3945_hw_txq_ctx_free - Free TXQ Context
- *
- * Destroy all TX DMA queues and structures
- */
-void iwl3945_hw_txq_ctx_free(struct iwl_priv *priv)
-{
-        int txq_id;
-
-        /* Tx queues */
-        if (priv->txq)
-                for (txq_id = 0; txq_id < priv->hw_params.max_txq_num;
-                     txq_id++)
-                        if (txq_id == IWL39_CMD_QUEUE_NUM)
-                                iwl_legacy_cmd_queue_free(priv);
-                        else
-                                iwl_legacy_tx_queue_free(priv, txq_id);
-
-        /* free tx queue structure */
-        iwl_legacy_txq_mem(priv);
-}
-
-void iwl3945_hw_txq_ctx_stop(struct iwl_priv *priv)
-{
-        int txq_id;
-
-        /* stop SCD */
-        iwl_legacy_write_prph(priv, ALM_SCD_MODE_REG, 0);
-        iwl_legacy_write_prph(priv, ALM_SCD_TXFACT_REG, 0);
-
-        /* reset TFD queues */
-        for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) {
-                iwl_legacy_write_direct32(priv, FH39_TCSR_CONFIG(txq_id), 0x0);
-                iwl_poll_direct_bit(priv, FH39_TSSR_TX_STATUS,
-                                FH39_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(txq_id),
-                                1000);
-        }
-
-        iwl3945_hw_txq_ctx_free(priv);
-}
-
-/**
- * iwl3945_hw_reg_adjust_power_by_temp
- * return index delta into power gain settings table
-*/
-static int iwl3945_hw_reg_adjust_power_by_temp(int new_reading, int old_reading)
-{
-        return (new_reading - old_reading) * (-11) / 100;
-}
-
-/**
- * iwl3945_hw_reg_temp_out_of_range - Keep temperature in sane range
- */
-static inline int iwl3945_hw_reg_temp_out_of_range(int temperature)
-{
-        return ((temperature < -260) || (temperature > 25)) ? 1 : 0;
-}
-
-int iwl3945_hw_get_temperature(struct iwl_priv *priv)
-{
-        return iwl_read32(priv, CSR_UCODE_DRV_GP2);
-}
-
-/**
- * iwl3945_hw_reg_txpower_get_temperature
- * get the current temperature by reading from NIC
-*/
-static int iwl3945_hw_reg_txpower_get_temperature(struct iwl_priv *priv)
-{
-        struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom;
-        int temperature;
-
-        temperature = iwl3945_hw_get_temperature(priv);
-
-        /* driver's okay range is -260 to +25.
-         *   human readable okay range is 0 to +285 */
-        IWL_DEBUG_INFO(priv, "Temperature: %d\n", temperature + IWL_TEMP_CONVERT);
-
-        /* handle insane temp reading */
-        if (iwl3945_hw_reg_temp_out_of_range(temperature)) {
-                IWL_ERR(priv, "Error bad temperature value  %d\n", temperature);
-
-                /* if really really hot(?),
-                 *   substitute the 3rd band/group's temp measured at factory */
-                if (priv->last_temperature > 100)
-                        temperature = eeprom->groups[2].temperature;
-                else /* else use most recent "sane" value from driver */
-                        temperature = priv->last_temperature;
-        }
-
-        return temperature;     /* raw, not "human readable" */
-}
-
-/* Adjust Txpower only if temperature variance is greater than threshold.
- *
- * Both are lower than older versions' 9 degrees */
-#define IWL_TEMPERATURE_LIMIT_TIMER   6
-
-/**
- * iwl3945_is_temp_calib_needed - determines if new calibration is needed
- *
- * records new temperature in tx_mgr->temperature.
- * replaces tx_mgr->last_temperature *only* if calib needed
- *    (assumes caller will actually do the calibration!). */
-static int iwl3945_is_temp_calib_needed(struct iwl_priv *priv)
-{
-        int temp_diff;
-
-        priv->temperature = iwl3945_hw_reg_txpower_get_temperature(priv);
-        temp_diff = priv->temperature - priv->last_temperature;
-
-        /* get absolute value */
-        if (temp_diff < 0) {
-                IWL_DEBUG_POWER(priv, "Getting cooler, delta %d,\n", temp_diff);
-                temp_diff = -temp_diff;
-        } else if (temp_diff == 0)
-                IWL_DEBUG_POWER(priv, "Same temp,\n");
-        else
-                IWL_DEBUG_POWER(priv, "Getting warmer, delta %d,\n", temp_diff);
-
-        /* if we don't need calibration, *don't* update last_temperature */
-        if (temp_diff < IWL_TEMPERATURE_LIMIT_TIMER) {
-                IWL_DEBUG_POWER(priv, "Timed thermal calib not needed\n");
-                return 0;
-        }
-
-        IWL_DEBUG_POWER(priv, "Timed thermal calib needed\n");
-
-        /* assume that caller will actually do calib ...
-         *   update the "last temperature" value */
-        priv->last_temperature = priv->temperature;
-        return 1;
-}
-
-#define IWL_MAX_GAIN_ENTRIES 78
-#define IWL_CCK_FROM_OFDM_POWER_DIFF  -5
-#define IWL_CCK_FROM_OFDM_INDEX_DIFF (10)
-
-/* radio and DSP power table, each step is 1/2 dB.
- * 1st number is for RF analog gain, 2nd number is for DSP pre-DAC gain. */
-static struct iwl3945_tx_power power_gain_table[2][IWL_MAX_GAIN_ENTRIES] = {
-        {
-         {251, 127},            /* 2.4 GHz, highest power */
-         {251, 127},
-         {251, 127},
-         {251, 127},
-         {251, 125},
-         {251, 110},
-         {251, 105},
-         {251, 98},
-         {187, 125},
-         {187, 115},
-         {187, 108},
-         {187, 99},
-         {243, 119},
-         {243, 111},
-         {243, 105},
-         {243, 97},
-         {243, 92},
-         {211, 106},
-         {211, 100},
-         {179, 120},
-         {179, 113},
-         {179, 107},
-         {147, 125},
-         {147, 119},
-         {147, 112},
-         {147, 106},
-         {147, 101},
-         {147, 97},
-         {147, 91},
-         {115, 107},
-         {235, 121},
-         {235, 115},
-         {235, 109},
-         {203, 127},
-         {203, 121},
-         {203, 115},
-         {203, 108},
-         {203, 102},
-         {203, 96},
-         {203, 92},
-         {171, 110},
-         {171, 104},
-         {171, 98},
-         {139, 116},
-         {227, 125},
-         {227, 119},
-         {227, 113},
-         {227, 107},
-         {227, 101},
-         {227, 96},
-         {195, 113},
-         {195, 106},
-         {195, 102},
-         {195, 95},
-         {163, 113},
-         {163, 106},
-         {163, 102},
-         {163, 95},
-         {131, 113},
-         {131, 106},
-         {131, 102},
-         {131, 95},
-         {99, 113},
-         {99, 106},
-         {99, 102},
-         {99, 95},
-         {67, 113},
-         {67, 106},
-         {67, 102},
-         {67, 95},
-         {35, 113},
-         {35, 106},
-         {35, 102},
-         {35, 95},
-         {3, 113},
-         {3, 106},
-         {3, 102},
-         {3, 95} },             /* 2.4 GHz, lowest power */
-        {
-         {251, 127},            /* 5.x GHz, highest power */
-         {251, 120},
-         {251, 114},
-         {219, 119},
-         {219, 101},
-         {187, 113},
-         {187, 102},
-         {155, 114},
-         {155, 103},
-         {123, 117},
-         {123, 107},
-         {123, 99},
-         {123, 92},
-         {91, 108},
-         {59, 125},
-         {59, 118},
-         {59, 109},
-         {59, 102},
-         {59, 96},
-         {59, 90},
-         {27, 104},
-         {27, 98},
-         {27, 92},
-         {115, 118},
-         {115, 111},
-         {115, 104},
-         {83, 126},
-         {83, 121},
-         {83, 113},
-         {83, 105},
-         {83, 99},
-         {51, 118},
-         {51, 111},
-         {51, 104},
-         {51, 98},
-         {19, 116},
-         {19, 109},
-         {19, 102},
-         {19, 98},
-         {19, 93},
-         {171, 113},
-         {171, 107},
-         {171, 99},
-         {139, 120},
-         {139, 113},
-         {139, 107},
-         {139, 99},
-         {107, 120},
-         {107, 113},
-         {107, 107},
-         {107, 99},
-         {75, 120},
-         {75, 113},
-         {75, 107},
-         {75, 99},
-         {43, 120},
-         {43, 113},
-         {43, 107},
-         {43, 99},
-         {11, 120},
-         {11, 113},
-         {11, 107},
-         {11, 99},
-         {131, 107},
-         {131, 99},
-         {99, 120},
-         {99, 113},
-         {99, 107},
-         {99, 99},
-         {67, 120},
-         {67, 113},
-         {67, 107},
-         {67, 99},
-         {35, 120},
-         {35, 113},
-         {35, 107},
-         {35, 99},
-         {3, 120} }             /* 5.x GHz, lowest power */
-};
-
-static inline u8 iwl3945_hw_reg_fix_power_index(int index)
-{
-        if (index < 0)
-                return 0;
-        if (index >= IWL_MAX_GAIN_ENTRIES)
-                return IWL_MAX_GAIN_ENTRIES - 1;
-        return (u8) index;
-}
-
-/* Kick off thermal recalibration check every 60 seconds */
-#define REG_RECALIB_PERIOD (60)
-
-/**
- * iwl3945_hw_reg_set_scan_power - Set Tx power for scan probe requests
- *
- * Set (in our channel info database) the direct scan Tx power for 1 Mbit (CCK)
- * or 6 Mbit (OFDM) rates.
- */
-static void iwl3945_hw_reg_set_scan_power(struct iwl_priv *priv, u32 scan_tbl_index,
-                               s32 rate_index, const s8 *clip_pwrs,
-                               struct iwl_channel_info *ch_info,
-                               int band_index)
-{
-        struct iwl3945_scan_power_info *scan_power_info;
-        s8 power;
-        u8 power_index;
-
-        scan_power_info = &ch_info->scan_pwr_info[scan_tbl_index];
-
-        /* use this channel group's 6Mbit clipping/saturation pwr,
-         *   but cap at regulatory scan power restriction (set during init
-         *   based on eeprom channel data) for this channel.  */
-        power = min(ch_info->scan_power, clip_pwrs[IWL_RATE_6M_INDEX_TABLE]);
-
-        power = min(power, priv->tx_power_user_lmt);
-        scan_power_info->requested_power = power;
-
-        /* find difference between new scan *power* and current "normal"
-         *   Tx *power* for 6Mb.  Use this difference (x2) to adjust the
-         *   current "normal" temperature-compensated Tx power *index* for
-         *   this rate (1Mb or 6Mb) to yield new temp-compensated scan power
-         *   *index*. */
-        power_index = ch_info->power_info[rate_index].power_table_index
-            - (power - ch_info->power_info
-               [IWL_RATE_6M_INDEX_TABLE].requested_power) * 2;
-
-        /* store reference index that we use when adjusting *all* scan
-         *   powers.  So we can accommodate user (all channel) or spectrum
-         *   management (single channel) power changes "between" temperature
-         *   feedback compensation procedures.
-         * don't force fit this reference index into gain table; it may be a
-         *   negative number.  This will help avoid errors when we're at
-         *   the lower bounds (highest gains, for warmest temperatures)
-         *   of the table. */
-
-        /* don't exceed table bounds for "real" setting */
-        power_index = iwl3945_hw_reg_fix_power_index(power_index);
-
-        scan_power_info->power_table_index = power_index;
-        scan_power_info->tpc.tx_gain =
-            power_gain_table[band_index][power_index].tx_gain;
-        scan_power_info->tpc.dsp_atten =
-            power_gain_table[band_index][power_index].dsp_atten;
-}
-
-/**
- * iwl3945_send_tx_power - fill in Tx Power command with gain settings
- *
- * Configures power settings for all rates for the current channel,
- * using values from channel info struct, and send to NIC
- */
-static int iwl3945_send_tx_power(struct iwl_priv *priv)
-{
-        int rate_idx, i;
-        const struct iwl_channel_info *ch_info = NULL;
-        struct iwl3945_txpowertable_cmd txpower = {
-                .channel = priv->contexts[IWL_RXON_CTX_BSS].active.channel,
-        };
-        u16 chan;
-
-        if (WARN_ONCE(test_bit(STATUS_SCAN_HW, &priv->status),
-                      "TX Power requested while scanning!\n"))
-                return -EAGAIN;
-
-        chan = le16_to_cpu(priv->contexts[IWL_RXON_CTX_BSS].active.channel);
-
-        txpower.band = (priv->band == IEEE80211_BAND_5GHZ) ? 0 : 1;
-        ch_info = iwl_legacy_get_channel_info(priv, priv->band, chan);
-        if (!ch_info) {
-                IWL_ERR(priv,
-                        "Failed to get channel info for channel %d [%d]\n",
-                        chan, priv->band);
-                return -EINVAL;
-        }
-
-        if (!iwl_legacy_is_channel_valid(ch_info)) {
-                IWL_DEBUG_POWER(priv, "Not calling TX_PWR_TABLE_CMD on "
-                                "non-Tx channel.\n");
-                return 0;
-        }
-
-        /* fill cmd with power settings for all rates for current channel */
-        /* Fill OFDM rate */
-        for (rate_idx = IWL_FIRST_OFDM_RATE, i = 0;
-             rate_idx <= IWL39_LAST_OFDM_RATE; rate_idx++, i++) {
-
-                txpower.power[i].tpc = ch_info->power_info[i].tpc;
-                txpower.power[i].rate = iwl3945_rates[rate_idx].plcp;
-
-                IWL_DEBUG_POWER(priv, "ch %d:%d rf %d dsp %3d rate code 0x%02x\n",
-                                le16_to_cpu(txpower.channel),
-                                txpower.band,
-                                txpower.power[i].tpc.tx_gain,
-                                txpower.power[i].tpc.dsp_atten,
-                                txpower.power[i].rate);
-        }
-        /* Fill CCK rates */
-        for (rate_idx = IWL_FIRST_CCK_RATE;
-             rate_idx <= IWL_LAST_CCK_RATE; rate_idx++, i++) {
-                txpower.power[i].tpc = ch_info->power_info[i].tpc;
-                txpower.power[i].rate = iwl3945_rates[rate_idx].plcp;
-
-                IWL_DEBUG_POWER(priv, "ch %d:%d rf %d dsp %3d rate code 0x%02x\n",
-                                le16_to_cpu(txpower.channel),
-                                txpower.band,
-                                txpower.power[i].tpc.tx_gain,
-                                txpower.power[i].tpc.dsp_atten,
-                                txpower.power[i].rate);
-        }
-
-        return iwl_legacy_send_cmd_pdu(priv, REPLY_TX_PWR_TABLE_CMD,
-                                sizeof(struct iwl3945_txpowertable_cmd),
-                                &txpower);
-
-}
-
-/**
- * iwl3945_hw_reg_set_new_power - Configures power tables at new levels
- * @ch_info: Channel to update.  Uses power_info.requested_power.
- *
- * Replace requested_power and base_power_index ch_info fields for
- * one channel.
- *
- * Called if user or spectrum management changes power preferences.
- * Takes into account h/w and modulation limitations (clip power).
- *
- * This does *not* send anything to NIC, just sets up ch_info for one channel.
- *
- * NOTE: reg_compensate_for_temperature_dif() *must* be run after this to
- *       properly fill out the scan powers, and actual h/w gain settings,
- *       and send changes to NIC
- */
-static int iwl3945_hw_reg_set_new_power(struct iwl_priv *priv,
-                             struct iwl_channel_info *ch_info)
-{
-        struct iwl3945_channel_power_info *power_info;
-        int power_changed = 0;
-        int i;
-        const s8 *clip_pwrs;
-        int power;
-
-        /* Get this chnlgrp's rate-to-max/clip-powers table */
-        clip_pwrs = priv->_3945.clip_groups[ch_info->group_index].clip_powers;
-
-        /* Get this channel's rate-to-current-power settings table */
-        power_info = ch_info->power_info;
-
-        /* update OFDM Txpower settings */
-        for (i = IWL_RATE_6M_INDEX_TABLE; i <= IWL_RATE_54M_INDEX_TABLE;
-             i++, ++power_info) {
-                int delta_idx;
-
-                /* limit new power to be no more than h/w capability */
-                power = min(ch_info->curr_txpow, clip_pwrs[i]);
-                if (power == power_info->requested_power)
-                        continue;
-
-                /* find difference between old and new requested powers,
-                 *    update base (non-temp-compensated) power index */
-                delta_idx = (power - power_info->requested_power) * 2;
-                power_info->base_power_index -= delta_idx;
-
-                /* save new requested power value */
-                power_info->requested_power = power;
-
-                power_changed = 1;
-        }
-
-        /* update CCK Txpower settings, based on OFDM 12M setting ...
-         *    ... all CCK power settings for a given channel are the *same*. */
-        if (power_changed) {
-                power =
-                    ch_info->power_info[IWL_RATE_12M_INDEX_TABLE].
-                    requested_power + IWL_CCK_FROM_OFDM_POWER_DIFF;
-
-                /* do all CCK rates' iwl3945_channel_power_info structures */
-                for (i = IWL_RATE_1M_INDEX_TABLE; i <= IWL_RATE_11M_INDEX_TABLE; i++) {
-                        power_info->requested_power = power;
-                        power_info->base_power_index =
-                            ch_info->power_info[IWL_RATE_12M_INDEX_TABLE].
-                            base_power_index + IWL_CCK_FROM_OFDM_INDEX_DIFF;
-                        ++power_info;
-                }
-        }
-
-        return 0;
-}
-
-/**
- * iwl3945_hw_reg_get_ch_txpower_limit - returns new power limit for channel
- *
- * NOTE: Returned power limit may be less (but not more) than requested,
- *       based strictly on regulatory (eeprom and spectrum mgt) limitations
- *       (no consideration for h/w clipping limitations).
- */
-static int iwl3945_hw_reg_get_ch_txpower_limit(struct iwl_channel_info *ch_info)
-{
-        s8 max_power;
-
-#if 0
-        /* if we're using TGd limits, use lower of TGd or EEPROM */
-        if (ch_info->tgd_data.max_power != 0)
-                max_power = min(ch_info->tgd_data.max_power,
-                                ch_info->eeprom.max_power_avg);
-
-        /* else just use EEPROM limits */
-        else
-#endif
-                max_power = ch_info->eeprom.max_power_avg;
-
-        return min(max_power, ch_info->max_power_avg);
-}
-
-/**
- * iwl3945_hw_reg_comp_txpower_temp - Compensate for temperature
- *
- * Compensate txpower settings of *all* channels for temperature.
- * This only accounts for the difference between current temperature
- *   and the factory calibration temperatures, and bases the new settings
- *   on the channel's base_power_index.
- *
- * If RxOn is "associated", this sends the new Txpower to NIC!
- */
-static int iwl3945_hw_reg_comp_txpower_temp(struct iwl_priv *priv)
-{
-        struct iwl_channel_info *ch_info = NULL;
-        struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom;
-        int delta_index;
-        const s8 *clip_pwrs; /* array of h/w max power levels for each rate */
-        u8 a_band;
-        u8 rate_index;
-        u8 scan_tbl_index;
-        u8 i;
-        int ref_temp;
-        int temperature = priv->temperature;
-
-        if (priv->disable_tx_power_cal ||
-            test_bit(STATUS_SCANNING, &priv->status)) {
-                /* do not perform tx power calibration */
-                return 0;
-        }
-        /* set up new Tx power info for each and every channel, 2.4 and 5.x */
-        for (i = 0; i < priv->channel_count; i++) {
-                ch_info = &priv->channel_info[i];
-                a_band = iwl_legacy_is_channel_a_band(ch_info);
-
-                /* Get this chnlgrp's factory calibration temperature */
-                ref_temp = (s16)eeprom->groups[ch_info->group_index].
-                    temperature;
-
-                /* get power index adjustment based on current and factory
-                 * temps */
-                delta_index = iwl3945_hw_reg_adjust_power_by_temp(temperature,
-                                                              ref_temp);
-
-                /* set tx power value for all rates, OFDM and CCK */
-                for (rate_index = 0; rate_index < IWL_RATE_COUNT_3945;
-                     rate_index++) {
-                        int power_idx =
-                            ch_info->power_info[rate_index].base_power_index;
-
-                        /* temperature compensate */
-                        power_idx += delta_index;
-
-                        /* stay within table range */
-                        power_idx = iwl3945_hw_reg_fix_power_index(power_idx);
-                        ch_info->power_info[rate_index].
-                            power_table_index = (u8) power_idx;
-                        ch_info->power_info[rate_index].tpc =
-                            power_gain_table[a_band][power_idx];
-                }
-
-                /* Get this chnlgrp's rate-to-max/clip-powers table */
-                clip_pwrs = priv->_3945.clip_groups[ch_info->group_index].clip_powers;
-
-                /* set scan tx power, 1Mbit for CCK, 6Mbit for OFDM */
-                for (scan_tbl_index = 0;
-                     scan_tbl_index < IWL_NUM_SCAN_RATES; scan_tbl_index++) {
-                        s32 actual_index = (scan_tbl_index == 0) ?
-                            IWL_RATE_1M_INDEX_TABLE : IWL_RATE_6M_INDEX_TABLE;
-                        iwl3945_hw_reg_set_scan_power(priv, scan_tbl_index,
-                                           actual_index, clip_pwrs,
-                                           ch_info, a_band);
-                }
-        }
-
-        /* send Txpower command for current channel to ucode */
-        return priv->cfg->ops->lib->send_tx_power(priv);
-}
-
-int iwl3945_hw_reg_set_txpower(struct iwl_priv *priv, s8 power)
-{
-        struct iwl_channel_info *ch_info;
-        s8 max_power;
-        u8 a_band;
-        u8 i;
-
-        if (priv->tx_power_user_lmt == power) {
-                IWL_DEBUG_POWER(priv, "Requested Tx power same as current "
-                                "limit: %ddBm.\n", power);
-                return 0;
-        }
-
-        IWL_DEBUG_POWER(priv, "Setting upper limit clamp to %ddBm.\n", power);
-        priv->tx_power_user_lmt = power;
-
-        /* set up new Tx powers for each and every channel, 2.4 and 5.x */
-
-        for (i = 0; i < priv->channel_count; i++) {
-                ch_info = &priv->channel_info[i];
-                a_band = iwl_legacy_is_channel_a_band(ch_info);
-
-                /* find minimum power of all user and regulatory constraints
-                 *    (does not consider h/w clipping limitations) */
-                max_power = iwl3945_hw_reg_get_ch_txpower_limit(ch_info);
-                max_power = min(power, max_power);
-                if (max_power != ch_info->curr_txpow) {
-                        ch_info->curr_txpow = max_power;
-
-                        /* this considers the h/w clipping limitations */
-                        iwl3945_hw_reg_set_new_power(priv, ch_info);
-                }
-        }
-
-        /* update txpower settings for all channels,
-         *   send to NIC if associated. */
-        iwl3945_is_temp_calib_needed(priv);
-        iwl3945_hw_reg_comp_txpower_temp(priv);
-
-        return 0;
-}
-
-static int iwl3945_send_rxon_assoc(struct iwl_priv *priv,
-                                   struct iwl_rxon_context *ctx)
-{
-        int rc = 0;
-        struct iwl_rx_packet *pkt;
-        struct iwl3945_rxon_assoc_cmd rxon_assoc;
-        struct iwl_host_cmd cmd = {
-                .id = REPLY_RXON_ASSOC,
-                .len = sizeof(rxon_assoc),
-                .flags = CMD_WANT_SKB,
-                .data = &rxon_assoc,
-        };
-        const struct iwl_legacy_rxon_cmd *rxon1 = &ctx->staging;
-        const struct iwl_legacy_rxon_cmd *rxon2 = &ctx->active;
-
-        if ((rxon1->flags == rxon2->flags) &&
-            (rxon1->filter_flags == rxon2->filter_flags) &&
-            (rxon1->cck_basic_rates == rxon2->cck_basic_rates) &&
-            (rxon1->ofdm_basic_rates == rxon2->ofdm_basic_rates)) {
-                IWL_DEBUG_INFO(priv, "Using current RXON_ASSOC.  Not resending.\n");
-                return 0;
-        }
-
-        rxon_assoc.flags = ctx->staging.flags;
-        rxon_assoc.filter_flags = ctx->staging.filter_flags;
-        rxon_assoc.ofdm_basic_rates = ctx->staging.ofdm_basic_rates;
-        rxon_assoc.cck_basic_rates = ctx->staging.cck_basic_rates;
-        rxon_assoc.reserved = 0;
-
-        rc = iwl_legacy_send_cmd_sync(priv, &cmd);
-        if (rc)
-                return rc;
-
-        pkt = (struct iwl_rx_packet *)cmd.reply_page;
-        if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) {
-                IWL_ERR(priv, "Bad return from REPLY_RXON_ASSOC command\n");
-                rc = -EIO;
-        }
-
-        iwl_legacy_free_pages(priv, cmd.reply_page);
-
-        return rc;
-}
-
-/**
- * iwl3945_commit_rxon - commit staging_rxon to hardware
- *
- * The RXON command in staging_rxon is committed to the hardware and
- * the active_rxon structure is updated with the new data.  This
- * function correctly transitions out of the RXON_ASSOC_MSK state if
- * a HW tune is required based on the RXON structure changes.
- */
-int iwl3945_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
-{
-        /* cast away the const for active_rxon in this function */
-        struct iwl3945_rxon_cmd *active_rxon = (void *)&ctx->active;
-        struct iwl3945_rxon_cmd *staging_rxon = (void *)&ctx->staging;
-        int rc = 0;
-        bool new_assoc = !!(staging_rxon->filter_flags & RXON_FILTER_ASSOC_MSK);
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return -EINVAL;
-
-        if (!iwl_legacy_is_alive(priv))
-                return -1;
-
-        /* always get timestamp with Rx frame */
-        staging_rxon->flags |= RXON_FLG_TSF2HOST_MSK;
-
-        /* select antenna */
-        staging_rxon->flags &=
-            ~(RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_SEL_MSK);
-        staging_rxon->flags |= iwl3945_get_antenna_flags(priv);
-
-        rc = iwl_legacy_check_rxon_cmd(priv, ctx);
-        if (rc) {
-                IWL_ERR(priv, "Invalid RXON configuration.  Not committing.\n");
-                return -EINVAL;
-        }
-
-        /* If we don't need to send a full RXON, we can use
-         * iwl3945_rxon_assoc_cmd which is used to reconfigure filter
-         * and other flags for the current radio configuration. */
-        if (!iwl_legacy_full_rxon_required(priv,
-                        &priv->contexts[IWL_RXON_CTX_BSS])) {
-                rc = iwl_legacy_send_rxon_assoc(priv,
-                                         &priv->contexts[IWL_RXON_CTX_BSS]);
-                if (rc) {
-                        IWL_ERR(priv, "Error setting RXON_ASSOC "
-                                  "configuration (%d).\n", rc);
-                        return rc;
-                }
-
-                memcpy(active_rxon, staging_rxon, sizeof(*active_rxon));
-                /*
-                 * We do not commit tx power settings while channel changing,
-                 * do it now if tx power changed.
-                 */
-                iwl_legacy_set_tx_power(priv, priv->tx_power_next, false);
-                return 0;
-        }
-
-        /* If we are currently associated and the new config requires
-         * 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 (iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS) && new_assoc) {
-                IWL_DEBUG_INFO(priv, "Toggling associated bit on current RXON\n");
-                active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
-
-                /*
-                 * reserved4 and 5 could have been filled by the iwlcore code.
-                 * Let's clear them before pushing to the 3945.
-                 */
-                active_rxon->reserved4 = 0;
-                active_rxon->reserved5 = 0;
-                rc = iwl_legacy_send_cmd_pdu(priv, REPLY_RXON,
-                                      sizeof(struct iwl3945_rxon_cmd),
-                                      &priv->contexts[IWL_RXON_CTX_BSS].active);
-
-                /* If the mask clearing failed then we set
-                 * active_rxon back to what it was previously */
-                if (rc) {
-                        active_rxon->filter_flags |= RXON_FILTER_ASSOC_MSK;
-                        IWL_ERR(priv, "Error clearing ASSOC_MSK on current "
-                                  "configuration (%d).\n", rc);
-                        return rc;
-                }
-                iwl_legacy_clear_ucode_stations(priv,
-                                         &priv->contexts[IWL_RXON_CTX_BSS]);
-                iwl_legacy_restore_stations(priv,
-                                         &priv->contexts[IWL_RXON_CTX_BSS]);
-        }
-
-        IWL_DEBUG_INFO(priv, "Sending RXON\n"
-                       "* with%s RXON_FILTER_ASSOC_MSK\n"
-                       "* channel = %d\n"
-                       "* bssid = %pM\n",
-                       (new_assoc ? "" : "out"),
-                       le16_to_cpu(staging_rxon->channel),
-                       staging_rxon->bssid_addr);
-
-        /*
-         * reserved4 and 5 could have been filled by the iwlcore code.
-         * Let's clear them before pushing to the 3945.
-         */
-        staging_rxon->reserved4 = 0;
-        staging_rxon->reserved5 = 0;
-
-        iwl_legacy_set_rxon_hwcrypto(priv, ctx, !iwl3945_mod_params.sw_crypto);
-
-        /* Apply the new configuration */
-        rc = iwl_legacy_send_cmd_pdu(priv, REPLY_RXON,
-                              sizeof(struct iwl3945_rxon_cmd),
-                              staging_rxon);
-        if (rc) {
-                IWL_ERR(priv, "Error setting new configuration (%d).\n", rc);
-                return rc;
-        }
-
-        memcpy(active_rxon, staging_rxon, sizeof(*active_rxon));
-
-        if (!new_assoc) {
-                iwl_legacy_clear_ucode_stations(priv,
-                                         &priv->contexts[IWL_RXON_CTX_BSS]);
-                iwl_legacy_restore_stations(priv,
-                                        &priv->contexts[IWL_RXON_CTX_BSS]);
-        }
-
-        /* If we issue a new RXON command which required a tune then we must
-         * send a new TXPOWER command or we won't be able to Tx any frames */
-        rc = iwl_legacy_set_tx_power(priv, priv->tx_power_next, true);
-        if (rc) {
-                IWL_ERR(priv, "Error setting Tx power (%d).\n", rc);
-                return rc;
-        }
-
-        /* Init the hardware's rate fallback order based on the band */
-        rc = iwl3945_init_hw_rate_table(priv);
-        if (rc) {
-                IWL_ERR(priv, "Error setting HW rate table: %02X\n", rc);
-                return -EIO;
-        }
-
-        return 0;
-}
-
-/**
- * iwl3945_reg_txpower_periodic -  called when time to check our temperature.
- *
- * -- reset periodic timer
- * -- see if temp has changed enough to warrant re-calibration ... if so:
- *     -- correct coeffs for temp (can reset temp timer)
- *     -- save this temp as "last",
- *     -- send new set of gain settings to NIC
- * NOTE:  This should continue working, even when we're not associated,
- *   so we can keep our internal table of scan powers current. */
-void iwl3945_reg_txpower_periodic(struct iwl_priv *priv)
-{
-        /* This will kick in the "brute force"
-         * iwl3945_hw_reg_comp_txpower_temp() below */
-        if (!iwl3945_is_temp_calib_needed(priv))
-                goto reschedule;
-
-        /* Set up a new set of temp-adjusted TxPowers, send to NIC.
-         * This is based *only* on current temperature,
-         * ignoring any previous power measurements */
-        iwl3945_hw_reg_comp_txpower_temp(priv);
-
- reschedule:
-        queue_delayed_work(priv->workqueue,
-                           &priv->_3945.thermal_periodic, REG_RECALIB_PERIOD * HZ);
-}
-
-static void iwl3945_bg_reg_txpower_periodic(struct work_struct *work)
-{
-        struct iwl_priv *priv = container_of(work, struct iwl_priv,
-                                             _3945.thermal_periodic.work);
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
-
-        mutex_lock(&priv->mutex);
-        iwl3945_reg_txpower_periodic(priv);
-        mutex_unlock(&priv->mutex);
-}
-
-/**
- * iwl3945_hw_reg_get_ch_grp_index - find the channel-group index (0-4)
- *                                 for the channel.
- *
- * This function is used when initializing channel-info structs.
- *
- * NOTE: These channel groups do *NOT* match the bands above!
- *       These channel groups are based on factory-tested channels;
- *       on A-band, EEPROM's "group frequency" entries represent the top
- *       channel in each group 1-4.  Group 5 All B/G channels are in group 0.
- */
-static u16 iwl3945_hw_reg_get_ch_grp_index(struct iwl_priv *priv,
-                                       const struct iwl_channel_info *ch_info)
-{
-        struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom;
-        struct iwl3945_eeprom_txpower_group *ch_grp = &eeprom->groups[0];
-        u8 group;
-        u16 group_index = 0;    /* based on factory calib frequencies */
-        u8 grp_channel;
-
-        /* Find the group index for the channel ... don't use index 1(?) */
-        if (iwl_legacy_is_channel_a_band(ch_info)) {
-                for (group = 1; group < 5; group++) {
-                        grp_channel = ch_grp[group].group_channel;
-                        if (ch_info->channel <= grp_channel) {
-                                group_index = group;
-                                break;
-                        }
-                }
-                /* group 4 has a few channels *above* its factory cal freq */
-                if (group == 5)
-                        group_index = 4;
-        } else
-                group_index = 0;        /* 2.4 GHz, group 0 */
-
-        IWL_DEBUG_POWER(priv, "Chnl %d mapped to grp %d\n", ch_info->channel,
-                        group_index);
-        return group_index;
-}
-
-/**
- * iwl3945_hw_reg_get_matched_power_index - Interpolate to get nominal index
- *
- * Interpolate to get nominal (i.e. at factory calibration temperature) index
- *   into radio/DSP gain settings table for requested power.
- */
-static int iwl3945_hw_reg_get_matched_power_index(struct iwl_priv *priv,
-                                       s8 requested_power,
-                                       s32 setting_index, s32 *new_index)
-{
-        const struct iwl3945_eeprom_txpower_group *chnl_grp = NULL;
-        struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom;
-        s32 index0, index1;
-        s32 power = 2 * requested_power;
-        s32 i;
-        const struct iwl3945_eeprom_txpower_sample *samples;
-        s32 gains0, gains1;
-        s32 res;
-        s32 denominator;
-
-        chnl_grp = &eeprom->groups[setting_index];
-        samples = chnl_grp->samples;
-        for (i = 0; i < 5; i++) {
-                if (power == samples[i].power) {
-                        *new_index = samples[i].gain_index;
-                        return 0;
-                }
-        }
-
-        if (power > samples[1].power) {
-                index0 = 0;
-                index1 = 1;
-        } else if (power > samples[2].power) {
-                index0 = 1;
-                index1 = 2;
-        } else if (power > samples[3].power) {
-                index0 = 2;
-                index1 = 3;
-        } else {
-                index0 = 3;
-                index1 = 4;
-        }
-
-        denominator = (s32) samples[index1].power - (s32) samples[index0].power;
-        if (denominator == 0)
-                return -EINVAL;
-        gains0 = (s32) samples[index0].gain_index * (1 << 19);
-        gains1 = (s32) samples[index1].gain_index * (1 << 19);
-        res = gains0 + (gains1 - gains0) *
-            ((s32) power - (s32) samples[index0].power) / denominator +
-            (1 << 18);
-        *new_index = res >> 19;
-        return 0;
-}
-
-static void iwl3945_hw_reg_init_channel_groups(struct iwl_priv *priv)
-{
-        u32 i;
-        s32 rate_index;
-        struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom;
-        const struct iwl3945_eeprom_txpower_group *group;
-
-        IWL_DEBUG_POWER(priv, "Initializing factory calib info from EEPROM\n");
-
-        for (i = 0; i < IWL_NUM_TX_CALIB_GROUPS; i++) {
-                s8 *clip_pwrs;  /* table of power levels for each rate */
-                s8 satur_pwr;   /* saturation power for each chnl group */
-                group = &eeprom->groups[i];
-
-                /* sanity check on factory saturation power value */
-                if (group->saturation_power < 40) {
-                        IWL_WARN(priv, "Error: saturation power is %d, "
-                                    "less than minimum expected 40\n",
-                                    group->saturation_power);
-                        return;
-                }
-
-                /*
-                 * Derive requested power levels for each rate, based on
-                 *   hardware capabilities (saturation power for band).
-                 * Basic value is 3dB down from saturation, with further
-                 *   power reductions for highest 3 data rates.  These
-                 *   backoffs provide headroom for high rate modulation
-                 *   power peaks, without too much distortion (clipping).
-                 */
-                /* we'll fill in this array with h/w max power levels */
-                clip_pwrs = (s8 *) priv->_3945.clip_groups[i].clip_powers;
-
-                /* divide factory saturation power by 2 to find -3dB level */
-                satur_pwr = (s8) (group->saturation_power >> 1);
-
-                /* fill in channel group's nominal powers for each rate */
-                for (rate_index = 0;
-                     rate_index < IWL_RATE_COUNT_3945; rate_index++, clip_pwrs++) {
-                        switch (rate_index) {
-                        case IWL_RATE_36M_INDEX_TABLE:
-                                if (i == 0)     /* B/G */
-                                        *clip_pwrs = satur_pwr;
-                                else    /* A */
-                                        *clip_pwrs = satur_pwr - 5;
-                                break;
-                        case IWL_RATE_48M_INDEX_TABLE:
-                                if (i == 0)
-                                        *clip_pwrs = satur_pwr - 7;
-                                else
-                                        *clip_pwrs = satur_pwr - 10;
-                                break;
-                        case IWL_RATE_54M_INDEX_TABLE:
-                                if (i == 0)
-                                        *clip_pwrs = satur_pwr - 9;
-                                else
-                                        *clip_pwrs = satur_pwr - 12;
-                                break;
-                        default:
-                                *clip_pwrs = satur_pwr;
-                                break;
-                        }
-                }
-        }
-}
-
-/**
- * iwl3945_txpower_set_from_eeprom - Set channel power info based on EEPROM
- *
- * Second pass (during init) to set up priv->channel_info
- *
- * Set up Tx-power settings in our channel info database for each VALID
- * (for this geo/SKU) channel, at all Tx data rates, based on eeprom values
- * and current temperature.
- *
- * Since this is based on current temperature (at init time), these values may
- * not be valid for very long, but it gives us a starting/default point,
- * and allows us to active (i.e. using Tx) scan.
- *
- * This does *not* write values to NIC, just sets up our internal table.
- */
-int iwl3945_txpower_set_from_eeprom(struct iwl_priv *priv)
-{
-        struct iwl_channel_info *ch_info = NULL;
-        struct iwl3945_channel_power_info *pwr_info;
-        struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom;
-        int delta_index;
-        u8 rate_index;
-        u8 scan_tbl_index;
-        const s8 *clip_pwrs;    /* array of power levels for each rate */
-        u8 gain, dsp_atten;
-        s8 power;
-        u8 pwr_index, base_pwr_index, a_band;
-        u8 i;
-        int temperature;
-
-        /* save temperature reference,
-         *   so we can determine next time to calibrate */
-        temperature = iwl3945_hw_reg_txpower_get_temperature(priv);
-        priv->last_temperature = temperature;
-
-        iwl3945_hw_reg_init_channel_groups(priv);
-
-        /* initialize Tx power info for each and every channel, 2.4 and 5.x */
-        for (i = 0, ch_info = priv->channel_info; i < priv->channel_count;
-             i++, ch_info++) {
-                a_band = iwl_legacy_is_channel_a_band(ch_info);
-                if (!iwl_legacy_is_channel_valid(ch_info))
-                        continue;
-
-                /* find this channel's channel group (*not* "band") index */
-                ch_info->group_index =
-                        iwl3945_hw_reg_get_ch_grp_index(priv, ch_info);
-
-                /* Get this chnlgrp's rate->max/clip-powers table */
-                clip_pwrs = priv->_3945.clip_groups[ch_info->group_index].clip_powers;
-
-                /* calculate power index *adjustment* value according to
-                 *  diff between current temperature and factory temperature */
-                delta_index = iwl3945_hw_reg_adjust_power_by_temp(temperature,
-                                eeprom->groups[ch_info->group_index].
-                                temperature);
-
-                IWL_DEBUG_POWER(priv, "Delta index for channel %d: %d [%d]\n",
-                                ch_info->channel, delta_index, temperature +
-                                IWL_TEMP_CONVERT);
-
-                /* set tx power value for all OFDM rates */
-                for (rate_index = 0; rate_index < IWL_OFDM_RATES;
-                     rate_index++) {
-                        s32 uninitialized_var(power_idx);
-                        int rc;
-
-                        /* use channel group's clip-power table,
-                         *   but don't exceed channel's max power */
-                        s8 pwr = min(ch_info->max_power_avg,
-                                     clip_pwrs[rate_index]);
-
-                        pwr_info = &ch_info->power_info[rate_index];
-
-                        /* get base (i.e. at factory-measured temperature)
-                         *    power table index for this rate's power */
-                        rc = iwl3945_hw_reg_get_matched_power_index(priv, pwr,
-                                                         ch_info->group_index,
-                                                         &power_idx);
-                        if (rc) {
-                                IWL_ERR(priv, "Invalid power index\n");
-                                return rc;
-                        }
-                        pwr_info->base_power_index = (u8) power_idx;
-
-                        /* temperature compensate */
-                        power_idx += delta_index;
-
-                        /* stay within range of gain table */
-                        power_idx = iwl3945_hw_reg_fix_power_index(power_idx);
-
-                        /* fill 1 OFDM rate's iwl3945_channel_power_info struct */
-                        pwr_info->requested_power = pwr;
-                        pwr_info->power_table_index = (u8) power_idx;
-                        pwr_info->tpc.tx_gain =
-                            power_gain_table[a_band][power_idx].tx_gain;
-                        pwr_info->tpc.dsp_atten =
-                            power_gain_table[a_band][power_idx].dsp_atten;
-                }
-
-                /* set tx power for CCK rates, based on OFDM 12 Mbit settings*/
-                pwr_info = &ch_info->power_info[IWL_RATE_12M_INDEX_TABLE];
-                power = pwr_info->requested_power +
-                        IWL_CCK_FROM_OFDM_POWER_DIFF;
-                pwr_index = pwr_info->power_table_index +
-                        IWL_CCK_FROM_OFDM_INDEX_DIFF;
-                base_pwr_index = pwr_info->base_power_index +
-                        IWL_CCK_FROM_OFDM_INDEX_DIFF;
-
-                /* stay within table range */
-                pwr_index = iwl3945_hw_reg_fix_power_index(pwr_index);
-                gain = power_gain_table[a_band][pwr_index].tx_gain;
-                dsp_atten = power_gain_table[a_band][pwr_index].dsp_atten;
-
-                /* fill each CCK rate's iwl3945_channel_power_info structure
-                 * NOTE:  All CCK-rate Txpwrs are the same for a given chnl!
-                 * NOTE:  CCK rates start at end of OFDM rates! */
-                for (rate_index = 0;
-                     rate_index < IWL_CCK_RATES; rate_index++) {
-                        pwr_info = &ch_info->power_info[rate_index+IWL_OFDM_RATES];
-                        pwr_info->requested_power = power;
-                        pwr_info->power_table_index = pwr_index;
-                        pwr_info->base_power_index = base_pwr_index;
-                        pwr_info->tpc.tx_gain = gain;
-                        pwr_info->tpc.dsp_atten = dsp_atten;
-                }
-
-                /* set scan tx power, 1Mbit for CCK, 6Mbit for OFDM */
-                for (scan_tbl_index = 0;
-                     scan_tbl_index < IWL_NUM_SCAN_RATES; scan_tbl_index++) {
-                        s32 actual_index = (scan_tbl_index == 0) ?
-                                IWL_RATE_1M_INDEX_TABLE : IWL_RATE_6M_INDEX_TABLE;
-                        iwl3945_hw_reg_set_scan_power(priv, scan_tbl_index,
-                                actual_index, clip_pwrs, ch_info, a_band);
-                }
-        }
-
-        return 0;
-}
-
-int iwl3945_hw_rxq_stop(struct iwl_priv *priv)
-{
-        int rc;
-
-        iwl_legacy_write_direct32(priv, FH39_RCSR_CONFIG(0), 0);
-        rc = iwl_poll_direct_bit(priv, FH39_RSSR_STATUS,
-                        FH39_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000);
-        if (rc < 0)
-                IWL_ERR(priv, "Can't stop Rx DMA.\n");
-
-        return 0;
-}
-
-int iwl3945_hw_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq)
-{
-        int txq_id = txq->q.id;
-
-        struct iwl3945_shared *shared_data = priv->_3945.shared_virt;
-
-        shared_data->tx_base_ptr[txq_id] = cpu_to_le32((u32)txq->q.dma_addr);
-
-        iwl_legacy_write_direct32(priv, FH39_CBCC_CTRL(txq_id), 0);
-        iwl_legacy_write_direct32(priv, FH39_CBCC_BASE(txq_id), 0);
-
-        iwl_legacy_write_direct32(priv, FH39_TCSR_CONFIG(txq_id),
-                FH39_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_NOINT |
-                FH39_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_TXF |
-                FH39_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_IFTFD |
-                FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE_VAL |
-                FH39_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE);
-
-        /* fake read to flush all prev. writes */
-        iwl_read32(priv, FH39_TSSR_CBB_BASE);
-
-        return 0;
-}
-
-/*
- * HCMD utils
- */
-static u16 iwl3945_get_hcmd_size(u8 cmd_id, u16 len)
-{
-        switch (cmd_id) {
-        case REPLY_RXON:
-                return sizeof(struct iwl3945_rxon_cmd);
-        case POWER_TABLE_CMD:
-                return sizeof(struct iwl3945_powertable_cmd);
-        default:
-                return len;
-        }
-}
-
-
-static u16 iwl3945_build_addsta_hcmd(const struct iwl_legacy_addsta_cmd *cmd,
-                                                                u8 *data)
-{
-        struct iwl3945_addsta_cmd *addsta = (struct iwl3945_addsta_cmd *)data;
-        addsta->mode = cmd->mode;
-        memcpy(&addsta->sta, &cmd->sta, sizeof(struct sta_id_modify));
-        memcpy(&addsta->key, &cmd->key, sizeof(struct iwl4965_keyinfo));
-        addsta->station_flags = cmd->station_flags;
-        addsta->station_flags_msk = cmd->station_flags_msk;
-        addsta->tid_disable_tx = cpu_to_le16(0);
-        addsta->rate_n_flags = cmd->rate_n_flags;
-        addsta->add_immediate_ba_tid = cmd->add_immediate_ba_tid;
-        addsta->remove_immediate_ba_tid = cmd->remove_immediate_ba_tid;
-        addsta->add_immediate_ba_ssn = cmd->add_immediate_ba_ssn;
-
-        return (u16)sizeof(struct iwl3945_addsta_cmd);
-}
-
-static int iwl3945_add_bssid_station(struct iwl_priv *priv,
-                                     const u8 *addr, u8 *sta_id_r)
-{
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        int ret;
-        u8 sta_id;
-        unsigned long flags;
-
-        if (sta_id_r)
-                *sta_id_r = IWL_INVALID_STATION;
-
-        ret = iwl_legacy_add_station_common(priv, ctx, addr, 0, NULL, &sta_id);
-        if (ret) {
-                IWL_ERR(priv, "Unable to add station %pM\n", addr);
-                return ret;
-        }
-
-        if (sta_id_r)
-                *sta_id_r = sta_id;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        priv->stations[sta_id].used |= IWL_STA_LOCAL;
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        return 0;
-}
-static int iwl3945_manage_ibss_station(struct iwl_priv *priv,
-                                       struct ieee80211_vif *vif, bool add)
-{
-        struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
-        int ret;
-
-        if (add) {
-                ret = iwl3945_add_bssid_station(priv, vif->bss_conf.bssid,
-                                                &vif_priv->ibss_bssid_sta_id);
-                if (ret)
-                        return ret;
-
-                iwl3945_sync_sta(priv, vif_priv->ibss_bssid_sta_id,
-                                 (priv->band == IEEE80211_BAND_5GHZ) ?
-                                 IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP);
-                iwl3945_rate_scale_init(priv->hw, vif_priv->ibss_bssid_sta_id);
-
-                return 0;
-        }
-
-        return iwl_legacy_remove_station(priv, vif_priv->ibss_bssid_sta_id,
-                                  vif->bss_conf.bssid);
-}
-
-/**
- * iwl3945_init_hw_rate_table - Initialize the hardware rate fallback table
- */
-int iwl3945_init_hw_rate_table(struct iwl_priv *priv)
-{
-        int rc, i, index, prev_index;
-        struct iwl3945_rate_scaling_cmd rate_cmd = {
-                .reserved = {0, 0, 0},
-        };
-        struct iwl3945_rate_scaling_info *table = rate_cmd.table;
-
-        for (i = 0; i < ARRAY_SIZE(iwl3945_rates); i++) {
-                index = iwl3945_rates[i].table_rs_index;
-
-                table[index].rate_n_flags =
-                        iwl3945_hw_set_rate_n_flags(iwl3945_rates[i].plcp, 0);
-                table[index].try_cnt = priv->retry_rate;
-                prev_index = iwl3945_get_prev_ieee_rate(i);
-                table[index].next_rate_index =
-                                iwl3945_rates[prev_index].table_rs_index;
-        }
-
-        switch (priv->band) {
-        case IEEE80211_BAND_5GHZ:
-                IWL_DEBUG_RATE(priv, "Select A mode rate scale\n");
-                /* If one of the following CCK rates is used,
-                 * have it fall back to the 6M OFDM rate */
-                for (i = IWL_RATE_1M_INDEX_TABLE;
-                        i <= IWL_RATE_11M_INDEX_TABLE; i++)
-                        table[i].next_rate_index =
-                          iwl3945_rates[IWL_FIRST_OFDM_RATE].table_rs_index;
-
-                /* Don't fall back to CCK rates */
-                table[IWL_RATE_12M_INDEX_TABLE].next_rate_index =
-                                                IWL_RATE_9M_INDEX_TABLE;
-
-                /* Don't drop out of OFDM rates */
-                table[IWL_RATE_6M_INDEX_TABLE].next_rate_index =
-                    iwl3945_rates[IWL_FIRST_OFDM_RATE].table_rs_index;
-                break;
-
-        case IEEE80211_BAND_2GHZ:
-                IWL_DEBUG_RATE(priv, "Select B/G mode rate scale\n");
-                /* If an OFDM rate is used, have it fall back to the
-                 * 1M CCK rates */
-
-                if (!(priv->_3945.sta_supp_rates & IWL_OFDM_RATES_MASK) &&
-                    iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS)) {
-
-                        index = IWL_FIRST_CCK_RATE;
-                        for (i = IWL_RATE_6M_INDEX_TABLE;
-                             i <= IWL_RATE_54M_INDEX_TABLE; i++)
-                                table[i].next_rate_index =
-                                        iwl3945_rates[index].table_rs_index;
-
-                        index = IWL_RATE_11M_INDEX_TABLE;
-                        /* CCK shouldn't fall back to OFDM... */
-                        table[index].next_rate_index = IWL_RATE_5M_INDEX_TABLE;
-                }
-                break;
-
-        default:
-                WARN_ON(1);
-                break;
-        }
-
-        /* Update the rate scaling for control frame Tx */
-        rate_cmd.table_id = 0;
-        rc = iwl_legacy_send_cmd_pdu(priv, REPLY_RATE_SCALE, sizeof(rate_cmd),
-                              &rate_cmd);
-        if (rc)
-                return rc;
-
-        /* Update the rate scaling for data frame Tx */
-        rate_cmd.table_id = 1;
-        return iwl_legacy_send_cmd_pdu(priv, REPLY_RATE_SCALE, sizeof(rate_cmd),
-                                &rate_cmd);
-}
-
-/* Called when initializing driver */
-int iwl3945_hw_set_hw_params(struct iwl_priv *priv)
-{
-        memset((void *)&priv->hw_params, 0,
-               sizeof(struct iwl_hw_params));
-
-        priv->_3945.shared_virt =
-                dma_alloc_coherent(&priv->pci_dev->dev,
-                                   sizeof(struct iwl3945_shared),
-                                   &priv->_3945.shared_phys, GFP_KERNEL);
-        if (!priv->_3945.shared_virt) {
-                IWL_ERR(priv, "failed to allocate pci memory\n");
-                return -ENOMEM;
-        }
-
-        /* Assign number of Usable TX queues */
-        priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;
-
-        priv->hw_params.tfd_size = sizeof(struct iwl3945_tfd);
-        priv->hw_params.rx_page_order = get_order(IWL_RX_BUF_SIZE_3K);
-        priv->hw_params.max_rxq_size = RX_QUEUE_SIZE;
-        priv->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;
-        priv->hw_params.max_stations = IWL3945_STATION_COUNT;
-        priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWL3945_BROADCAST_ID;
-
-        priv->sta_key_max_num = STA_KEY_MAX_NUM;
-
-        priv->hw_params.rx_wrt_ptr_reg = FH39_RSCSR_CHNL0_WPTR;
-        priv->hw_params.max_beacon_itrvl = IWL39_MAX_UCODE_BEACON_INTERVAL;
-        priv->hw_params.beacon_time_tsf_bits = IWL3945_EXT_BEACON_TIME_POS;
-
-        return 0;
-}
-
-unsigned int iwl3945_hw_get_beacon_cmd(struct iwl_priv *priv,
-                          struct iwl3945_frame *frame, u8 rate)
-{
-        struct iwl3945_tx_beacon_cmd *tx_beacon_cmd;
-        unsigned int frame_size;
-
-        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 =
-                priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id;
-        tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
-
-        frame_size = iwl3945_fill_beacon_frame(priv,
-                                tx_beacon_cmd->frame,
-                                sizeof(frame->u) - sizeof(*tx_beacon_cmd));
-
-        BUG_ON(frame_size > MAX_MPDU_SIZE);
-        tx_beacon_cmd->tx.len = cpu_to_le16((u16)frame_size);
-
-        tx_beacon_cmd->tx.rate = rate;
-        tx_beacon_cmd->tx.tx_flags = (TX_CMD_FLG_SEQ_CTL_MSK |
-                                      TX_CMD_FLG_TSF_MSK);
-
-        /* supp_rates[0] == OFDM start at IWL_FIRST_OFDM_RATE*/
-        tx_beacon_cmd->tx.supp_rates[0] =
-                (IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
-
-        tx_beacon_cmd->tx.supp_rates[1] =
-                (IWL_CCK_BASIC_RATES_MASK & 0xF);
-
-        return sizeof(struct iwl3945_tx_beacon_cmd) + frame_size;
-}
-
-void iwl3945_hw_rx_handler_setup(struct iwl_priv *priv)
-{
-        priv->rx_handlers[REPLY_TX] = iwl3945_rx_reply_tx;
-        priv->rx_handlers[REPLY_3945_RX] = iwl3945_rx_reply_rx;
-}
-
-void iwl3945_hw_setup_deferred_work(struct iwl_priv *priv)
-{
-        INIT_DELAYED_WORK(&priv->_3945.thermal_periodic,
-                          iwl3945_bg_reg_txpower_periodic);
-}
-
-void iwl3945_hw_cancel_deferred_work(struct iwl_priv *priv)
-{
-        cancel_delayed_work(&priv->_3945.thermal_periodic);
-}
-
-/* check contents of special bootstrap uCode SRAM */
-static int iwl3945_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(priv, "Begin verify bsm\n");
-
-        /* verify BSM SRAM contents */
-        val = iwl_legacy_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_legacy_read_prph(priv, reg);
-                if (val != le32_to_cpu(*image)) {
-                        IWL_ERR(priv, "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(priv, "BSM bootstrap uCode image OK\n");
-
-        return 0;
-}
-
-
-/******************************************************************************
- *
- * EEPROM related functions
- *
- ******************************************************************************/
-
-/*
- * Clear the OWNER_MSK, to establish driver (instead of uCode running on
- * embedded controller) as EEPROM reader; each read 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 some ownership mechanism.  Here, the driver
- * simply claims ownership, which should be safe when this function is called
- * (i.e. before loading uCode!).
- */
-static int iwl3945_eeprom_acquire_semaphore(struct iwl_priv *priv)
-{
-        _iwl_legacy_clear_bit(priv, CSR_EEPROM_GP, CSR_EEPROM_GP_IF_OWNER_MSK);
-        return 0;
-}
-
-
-static void iwl3945_eeprom_release_semaphore(struct iwl_priv *priv)
-{
-        return;
-}
-
- /**
-  * iwl3945_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 iwl3945_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 rc;
-        int i;
-        u32 done;
-        u32 reg_offset;
-
-        IWL_DEBUG_INFO(priv, "Begin load bsm\n");
-
-        /* make sure bootstrap program is no larger than BSM's SRAM size */
-        if (len > IWL39_MAX_BSM_SIZE)
-                return -EINVAL;
-
-        /* Tell bootstrap uCode where to find the "Initialize" uCode
-        *   in host DRAM ... host DRAM physical address bits 31:0 for 3945.
-        * NOTE:  iwl3945_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;
-        pdata = priv->ucode_init_data.p_addr;
-        inst_len = priv->ucode_init.len;
-        data_len = priv->ucode_init_data.len;
-
-        iwl_legacy_write_prph(priv, BSM_DRAM_INST_PTR_REG, pinst);
-        iwl_legacy_write_prph(priv, BSM_DRAM_DATA_PTR_REG, pdata);
-        iwl_legacy_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG, inst_len);
-        iwl_legacy_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_legacy_write_prph(priv, reg_offset,
-                                          le32_to_cpu(*image));
-
-        rc = iwl3945_verify_bsm(priv);
-        if (rc)
-                return rc;
-
-        /* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */
-        iwl_legacy_write_prph(priv, BSM_WR_MEM_SRC_REG, 0x0);
-        iwl_legacy_write_prph(priv, BSM_WR_MEM_DST_REG,
-                                 IWL39_RTC_INST_LOWER_BOUND);
-        iwl_legacy_write_prph(priv, BSM_WR_DWCOUNT_REG, len / sizeof(u32));
-
-        /* Load bootstrap code into instruction SRAM now,
-         *   to prepare to load "initialize" uCode */
-        iwl_legacy_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_legacy_read_prph(priv, BSM_WR_CTRL_REG);
-                if (!(done & BSM_WR_CTRL_REG_BIT_START))
-                        break;
-                udelay(10);
-        }
-        if (i < 100)
-                IWL_DEBUG_INFO(priv, "BSM write complete, poll %d iterations\n", i);
-        else {
-                IWL_ERR(priv, "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_legacy_write_prph(priv, BSM_WR_CTRL_REG,
-                BSM_WR_CTRL_REG_BIT_START_EN);
-
-        return 0;
-}
-
-static struct iwl_hcmd_ops iwl3945_hcmd = {
-        .rxon_assoc = iwl3945_send_rxon_assoc,
-        .commit_rxon = iwl3945_commit_rxon,
-};
-
-static struct iwl_lib_ops iwl3945_lib = {
-        .txq_attach_buf_to_tfd = iwl3945_hw_txq_attach_buf_to_tfd,
-        .txq_free_tfd = iwl3945_hw_txq_free_tfd,
-        .txq_init = iwl3945_hw_tx_queue_init,
-        .load_ucode = iwl3945_load_bsm,
-        .dump_nic_error_log = iwl3945_dump_nic_error_log,
-        .apm_ops = {
-                .init = iwl3945_apm_init,
-                .config = iwl3945_nic_config,
-        },
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REGULATORY_BAND_1_CHANNELS,
-                        EEPROM_REGULATORY_BAND_2_CHANNELS,
-                        EEPROM_REGULATORY_BAND_3_CHANNELS,
-                        EEPROM_REGULATORY_BAND_4_CHANNELS,
-                        EEPROM_REGULATORY_BAND_5_CHANNELS,
-                        EEPROM_REGULATORY_BAND_NO_HT40,
-                        EEPROM_REGULATORY_BAND_NO_HT40,
-                },
-                .acquire_semaphore = iwl3945_eeprom_acquire_semaphore,
-                .release_semaphore = iwl3945_eeprom_release_semaphore,
-        },
-        .send_tx_power  = iwl3945_send_tx_power,
-        .is_valid_rtc_data_addr = iwl3945_hw_valid_rtc_data_addr,
-
-        .debugfs_ops = {
-                .rx_stats_read = iwl3945_ucode_rx_stats_read,
-                .tx_stats_read = iwl3945_ucode_tx_stats_read,
-                .general_stats_read = iwl3945_ucode_general_stats_read,
-        },
-};
-
-static const struct iwl_legacy_ops iwl3945_legacy_ops = {
-        .post_associate = iwl3945_post_associate,
-        .config_ap = iwl3945_config_ap,
-        .manage_ibss_station = iwl3945_manage_ibss_station,
-};
-
-static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = {
-        .get_hcmd_size = iwl3945_get_hcmd_size,
-        .build_addsta_hcmd = iwl3945_build_addsta_hcmd,
-        .request_scan = iwl3945_request_scan,
-        .post_scan = iwl3945_post_scan,
-};
-
-static const struct iwl_ops iwl3945_ops = {
-        .lib = &iwl3945_lib,
-        .hcmd = &iwl3945_hcmd,
-        .utils = &iwl3945_hcmd_utils,
-        .led = &iwl3945_led_ops,
-        .legacy = &iwl3945_legacy_ops,
-        .ieee80211_ops = &iwl3945_hw_ops,
-};
-
-static struct iwl_base_params iwl3945_base_params = {
-        .eeprom_size = IWL3945_EEPROM_IMG_SIZE,
-        .num_of_queues = IWL39_NUM_QUEUES,
-        .pll_cfg_val = CSR39_ANA_PLL_CFG_VAL,
-        .set_l0s = false,
-        .use_bsm = true,
-        .led_compensation = 64,
-        .wd_timeout = IWL_DEF_WD_TIMEOUT,
-};
-
-static struct iwl_cfg iwl3945_bg_cfg = {
-        .name = "3945BG",
-        .fw_name_pre = IWL3945_FW_PRE,
-        .ucode_api_max = IWL3945_UCODE_API_MAX,
-        .ucode_api_min = IWL3945_UCODE_API_MIN,
-        .sku = IWL_SKU_G,
-        .eeprom_ver = EEPROM_3945_EEPROM_VERSION,
-        .ops = &iwl3945_ops,
-        .mod_params = &iwl3945_mod_params,
-        .base_params = &iwl3945_base_params,
-        .led_mode = IWL_LED_BLINK,
-};
-
-static struct iwl_cfg iwl3945_abg_cfg = {
-        .name = "3945ABG",
-        .fw_name_pre = IWL3945_FW_PRE,
-        .ucode_api_max = IWL3945_UCODE_API_MAX,
-        .ucode_api_min = IWL3945_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G,
-        .eeprom_ver = EEPROM_3945_EEPROM_VERSION,
-        .ops = &iwl3945_ops,
-        .mod_params = &iwl3945_mod_params,
-        .base_params = &iwl3945_base_params,
-        .led_mode = IWL_LED_BLINK,
-};
-
-DEFINE_PCI_DEVICE_TABLE(iwl3945_hw_card_ids) = {
-        {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}
-};
-
-MODULE_DEVICE_TABLE(pci, iwl3945_hw_card_ids);
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945.h b/drivers/net/wireless/iwlegacy/iwl-3945.h
deleted file mode 100644
index b118b59b71de..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-3945.h
+++ /dev/null
@@ -1,308 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-/*
- * Please use this file (iwl-3945.h) for driver implementation definitions.
- * Please use iwl-3945-commands.h for uCode API definitions.
- * Please use iwl-3945-hw.h for hardware-related definitions.
- */
-
-#ifndef __iwl_3945_h__
-#define __iwl_3945_h__
-
-#include <linux/pci.h> /* for struct pci_device_id */
-#include <linux/kernel.h>
-#include <net/ieee80211_radiotap.h>
-
-/* Hardware specific file defines the PCI IDs table for that hardware module */
-extern const struct pci_device_id iwl3945_hw_card_ids[];
-
-#include "iwl-csr.h"
-#include "iwl-prph.h"
-#include "iwl-fh.h"
-#include "iwl-3945-hw.h"
-#include "iwl-debug.h"
-#include "iwl-power.h"
-#include "iwl-dev.h"
-#include "iwl-led.h"
-
-/* Highest firmware API version supported */
-#define IWL3945_UCODE_API_MAX 2
-
-/* Lowest firmware API version supported */
-#define IWL3945_UCODE_API_MIN 1
-
-#define IWL3945_FW_PRE  "iwlwifi-3945-"
-#define _IWL3945_MODULE_FIRMWARE(api) IWL3945_FW_PRE #api ".ucode"
-#define IWL3945_MODULE_FIRMWARE(api) _IWL3945_MODULE_FIRMWARE(api)
-
-/* Default noise level to report when noise measurement is not available.
- *   This may be because we're:
- *   1)  Not associated (4965, no beacon statistics being sent to driver)
- *   2)  Scanning (noise measurement does not apply to associated channel)
- *   3)  Receiving CCK (3945 delivers noise info only for OFDM frames)
- * Use default noise value of -127 ... this is below the range of measurable
- *   Rx dBm for either 3945 or 4965, so it can indicate "unmeasurable" to user.
- *   Also, -127 works better than 0 when averaging frames with/without
- *   noise info (e.g. averaging might be done in app); measured dBm values are
- *   always negative ... using a negative value as the default keeps all
- *   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 struct iwl_mod_params iwl3945_mod_params;
-
-struct iwl3945_rate_scale_data {
-        u64 data;
-        s32 success_counter;
-        s32 success_ratio;
-        s32 counter;
-        s32 average_tpt;
-        unsigned long stamp;
-};
-
-struct iwl3945_rs_sta {
-        spinlock_t lock;
-        struct iwl_priv *priv;
-        s32 *expected_tpt;
-        unsigned long last_partial_flush;
-        unsigned long last_flush;
-        u32 flush_time;
-        u32 last_tx_packets;
-        u32 tx_packets;
-        u8 tgg;
-        u8 flush_pending;
-        u8 start_rate;
-        struct timer_list rate_scale_flush;
-        struct iwl3945_rate_scale_data win[IWL_RATE_COUNT_3945];
-#ifdef CONFIG_MAC80211_DEBUGFS
-        struct dentry *rs_sta_dbgfs_stats_table_file;
-#endif
-
-        /* used to be in sta_info */
-        int last_txrate_idx;
-};
-
-
-/*
- * The common struct MUST be first because it is shared between
- * 3945 and 4965!
- */
-struct iwl3945_sta_priv {
-        struct iwl_station_priv_common common;
-        struct iwl3945_rs_sta rs_sta;
-};
-
-enum iwl3945_antenna {
-        IWL_ANTENNA_DIVERSITY,
-        IWL_ANTENNA_MAIN,
-        IWL_ANTENNA_AUX
-};
-
-/*
- * RTS threshold here is total size [2347] minus 4 FCS bytes
- * Per spec:
- *   a value of 0 means RTS on all data/management packets
- *   a value > max MSDU size means no RTS
- * else RTS for data/management frames where MPDU is larger
- *   than RTS value.
- */
-#define DEFAULT_RTS_THRESHOLD     2347U
-#define MIN_RTS_THRESHOLD         0U
-#define MAX_RTS_THRESHOLD         2347U
-#define MAX_MSDU_SIZE             2304U
-#define MAX_MPDU_SIZE             2346U
-#define DEFAULT_BEACON_INTERVAL   100U
-#define DEFAULT_SHORT_RETRY_LIMIT 7U
-#define DEFAULT_LONG_RETRY_LIMIT  4U
-
-#define IWL_TX_FIFO_AC0 0
-#define IWL_TX_FIFO_AC1 1
-#define IWL_TX_FIFO_AC2 2
-#define IWL_TX_FIFO_AC3 3
-#define IWL_TX_FIFO_HCCA_1      5
-#define IWL_TX_FIFO_HCCA_2      6
-#define IWL_TX_FIFO_NONE        7
-
-#define IEEE80211_DATA_LEN              2304
-#define IEEE80211_4ADDR_LEN             30
-#define IEEE80211_HLEN                  (IEEE80211_4ADDR_LEN)
-#define IEEE80211_FRAME_LEN             (IEEE80211_DATA_LEN + IEEE80211_HLEN)
-
-struct iwl3945_frame {
-        union {
-                struct ieee80211_hdr frame;
-                struct iwl3945_tx_beacon_cmd beacon;
-                u8 raw[IEEE80211_FRAME_LEN];
-                u8 cmd[360];
-        } u;
-        struct list_head list;
-};
-
-#define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)
-#define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)
-#define MAX_SN ((IEEE80211_SCTL_SEQ) >> 4)
-
-#define SUP_RATE_11A_MAX_NUM_CHANNELS  8
-#define SUP_RATE_11B_MAX_NUM_CHANNELS  4
-#define SUP_RATE_11G_MAX_NUM_CHANNELS  12
-
-#define IWL_SUPPORTED_RATES_IE_LEN         8
-
-#define SCAN_INTERVAL 100
-
-#define MAX_TID_COUNT        9
-
-#define IWL_INVALID_RATE     0xFF
-#define IWL_INVALID_VALUE    -1
-
-#define STA_PS_STATUS_WAKE             0
-#define STA_PS_STATUS_SLEEP            1
-
-struct iwl3945_ibss_seq {
-        u8 mac[ETH_ALEN];
-        u16 seq_num;
-        u16 frag_num;
-        unsigned long packet_time;
-        struct list_head list;
-};
-
-#define IWL_RX_HDR(x) ((struct iwl3945_rx_frame_hdr *)(\
-                       x->u.rx_frame.stats.payload + \
-                       x->u.rx_frame.stats.phy_count))
-#define IWL_RX_END(x) ((struct iwl3945_rx_frame_end *)(\
-                       IWL_RX_HDR(x)->payload + \
-                       le16_to_cpu(IWL_RX_HDR(x)->len)))
-#define IWL_RX_STATS(x) (&x->u.rx_frame.stats)
-#define IWL_RX_DATA(x) (IWL_RX_HDR(x)->payload)
-
-
-/******************************************************************************
- *
- * Functions implemented in iwl3945-base.c which are forward declared here
- * for use by iwl-*.c
- *
- *****************************************************************************/
-extern int iwl3945_calc_db_from_ratio(int sig_ratio);
-extern void iwl3945_rx_replenish(void *data);
-extern void iwl3945_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq);
-extern unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,
-                                        struct ieee80211_hdr *hdr, int left);
-extern int iwl3945_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
-                                       char **buf, bool display);
-extern void iwl3945_dump_nic_error_log(struct iwl_priv *priv);
-
-/******************************************************************************
- *
- * Functions implemented in iwl-[34]*.c which are forward declared here
- * for use by iwl3945-base.c
- *
- * NOTE:  The implementation of these functions are hardware specific
- * which is why they are in the hardware specific files (vs. iwl-base.c)
- *
- * Naming convention --
- * iwl3945_         <-- Its part of iwlwifi (should be changed to iwl3945_)
- * iwl3945_hw_      <-- Hardware specific (implemented in iwl-XXXX.c by all HW)
- * iwlXXXX_     <-- Hardware specific (implemented in iwl-XXXX.c for XXXX)
- * iwl3945_bg_      <-- Called from work queue context
- * iwl3945_mac_     <-- mac80211 callback
- *
- ****************************************************************************/
-extern void iwl3945_hw_rx_handler_setup(struct iwl_priv *priv);
-extern void iwl3945_hw_setup_deferred_work(struct iwl_priv *priv);
-extern void iwl3945_hw_cancel_deferred_work(struct iwl_priv *priv);
-extern int iwl3945_hw_rxq_stop(struct iwl_priv *priv);
-extern int iwl3945_hw_set_hw_params(struct iwl_priv *priv);
-extern int iwl3945_hw_nic_init(struct iwl_priv *priv);
-extern int iwl3945_hw_nic_stop_master(struct iwl_priv *priv);
-extern void iwl3945_hw_txq_ctx_free(struct iwl_priv *priv);
-extern void iwl3945_hw_txq_ctx_stop(struct iwl_priv *priv);
-extern int iwl3945_hw_nic_reset(struct iwl_priv *priv);
-extern int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv,
-                                            struct iwl_tx_queue *txq,
-                                            dma_addr_t addr, u16 len,
-                                            u8 reset, u8 pad);
-extern void iwl3945_hw_txq_free_tfd(struct iwl_priv *priv,
-                                    struct iwl_tx_queue *txq);
-extern int iwl3945_hw_get_temperature(struct iwl_priv *priv);
-extern int iwl3945_hw_tx_queue_init(struct iwl_priv *priv,
-                                struct iwl_tx_queue *txq);
-extern unsigned int iwl3945_hw_get_beacon_cmd(struct iwl_priv *priv,
-                                 struct iwl3945_frame *frame, u8 rate);
-void iwl3945_hw_build_tx_cmd_rate(struct iwl_priv *priv,
-                                  struct iwl_device_cmd *cmd,
-                                  struct ieee80211_tx_info *info,
-                                  struct ieee80211_hdr *hdr,
-                                  int sta_id, int tx_id);
-extern int iwl3945_hw_reg_send_txpower(struct iwl_priv *priv);
-extern int iwl3945_hw_reg_set_txpower(struct iwl_priv *priv, s8 power);
-extern void iwl3945_hw_rx_statistics(struct iwl_priv *priv,
-                                 struct iwl_rx_mem_buffer *rxb);
-void iwl3945_reply_statistics(struct iwl_priv *priv,
-                              struct iwl_rx_mem_buffer *rxb);
-extern void iwl3945_disable_events(struct iwl_priv *priv);
-extern int iwl4965_get_temperature(const struct iwl_priv *priv);
-extern void iwl3945_post_associate(struct iwl_priv *priv);
-extern void iwl3945_config_ap(struct iwl_priv *priv);
-
-extern int iwl3945_commit_rxon(struct iwl_priv *priv,
-                               struct iwl_rxon_context *ctx);
-
-/**
- * iwl3945_hw_find_station - Find station id for a given BSSID
- * @bssid: MAC address of station ID to find
- *
- * NOTE:  This should not be hardware specific but the code has
- * not yet been merged into a single common layer for managing the
- * station tables.
- */
-extern u8 iwl3945_hw_find_station(struct iwl_priv *priv, const u8 *bssid);
-
-extern struct ieee80211_ops iwl3945_hw_ops;
-
-/*
- * Forward declare iwl-3945.c functions for iwl3945-base.c
- */
-extern __le32 iwl3945_get_antenna_flags(const struct iwl_priv *priv);
-extern int iwl3945_init_hw_rate_table(struct iwl_priv *priv);
-extern void iwl3945_reg_txpower_periodic(struct iwl_priv *priv);
-extern int iwl3945_txpower_set_from_eeprom(struct iwl_priv *priv);
-
-extern const struct iwl_channel_info *iwl3945_get_channel_info(
-        const struct iwl_priv *priv, enum ieee80211_band band, u16 channel);
-
-extern int iwl3945_rs_next_rate(struct iwl_priv *priv, int rate);
-
-/* scanning */
-int iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif);
-void iwl3945_post_scan(struct iwl_priv *priv);
-
-/* rates */
-extern const struct iwl3945_rate_info iwl3945_rates[IWL_RATE_COUNT_3945];
-
-/* Requires full declaration of iwl_priv before including */
-#include "iwl-io.h"
-
-#endif
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-calib.h b/drivers/net/wireless/iwlegacy/iwl-4965-calib.h
deleted file mode 100644
index f46c80e6e005..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-4965-calib.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/******************************************************************************
- *
- * 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 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2011 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_4965_calib_h__
-#define __iwl_4965_calib_h__
-
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-commands.h"
-
-void iwl4965_chain_noise_calibration(struct iwl_priv *priv, void *stat_resp);
-void iwl4965_sensitivity_calibration(struct iwl_priv *priv, void *resp);
-void iwl4965_init_sensitivity(struct iwl_priv *priv);
-void iwl4965_reset_run_time_calib(struct iwl_priv *priv);
-void iwl4965_calib_free_results(struct iwl_priv *priv);
-
-#endif /* __iwl_4965_calib_h__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c b/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
deleted file mode 100644
index 1c93665766e4..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
+++ /dev/null
@@ -1,774 +0,0 @@
-/******************************************************************************
-*
-* GPL LICENSE SUMMARY
-*
-* Copyright(c) 2008 - 2011 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:
-*  Intel Linux Wireless <ilw@linux.intel.com>
-* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-*****************************************************************************/
-#include "iwl-4965.h"
-#include "iwl-4965-debugfs.h"
-
-static const char *fmt_value = "  %-30s %10u\n";
-static const char *fmt_table = "  %-30s %10u  %10u  %10u  %10u\n";
-static const char *fmt_header =
-        "%-32s    current  cumulative       delta         max\n";
-
-static int iwl4965_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
-{
-        int p = 0;
-        u32 flag;
-
-        flag = le32_to_cpu(priv->_4965.statistics.flag);
-
-        p += scnprintf(buf + p, bufsz - p, "Statistics Flag(0x%X):\n", flag);
-        if (flag & UCODE_STATISTICS_CLEAR_MSK)
-                p += scnprintf(buf + p, bufsz - p,
-                "\tStatistics have been cleared\n");
-        p += scnprintf(buf + p, bufsz - p, "\tOperational Frequency: %s\n",
-                (flag & UCODE_STATISTICS_FREQUENCY_MSK)
-                ? "2.4 GHz" : "5.2 GHz");
-        p += scnprintf(buf + p, bufsz - p, "\tTGj Narrow Band: %s\n",
-                (flag & UCODE_STATISTICS_NARROW_BAND_MSK)
-                 ? "enabled" : "disabled");
-
-        return p;
-}
-
-ssize_t iwl4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
-                                size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        int pos = 0;
-        char *buf;
-        int bufsz = sizeof(struct statistics_rx_phy) * 40 +
-                    sizeof(struct statistics_rx_non_phy) * 40 +
-                    sizeof(struct statistics_rx_ht_phy) * 40 + 400;
-        ssize_t ret;
-        struct statistics_rx_phy *ofdm, *accum_ofdm, *delta_ofdm, *max_ofdm;
-        struct statistics_rx_phy *cck, *accum_cck, *delta_cck, *max_cck;
-        struct statistics_rx_non_phy *general, *accum_general;
-        struct statistics_rx_non_phy *delta_general, *max_general;
-        struct statistics_rx_ht_phy *ht, *accum_ht, *delta_ht, *max_ht;
-
-        if (!iwl_legacy_is_alive(priv))
-                return -EAGAIN;
-
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
-                return -ENOMEM;
-        }
-
-        /*
-         * the statistic information display here is based on
-         * the last statistics notification from uCode
-         * might not reflect the current uCode activity
-         */
-        ofdm = &priv->_4965.statistics.rx.ofdm;
-        cck = &priv->_4965.statistics.rx.cck;
-        general = &priv->_4965.statistics.rx.general;
-        ht = &priv->_4965.statistics.rx.ofdm_ht;
-        accum_ofdm = &priv->_4965.accum_statistics.rx.ofdm;
-        accum_cck = &priv->_4965.accum_statistics.rx.cck;
-        accum_general = &priv->_4965.accum_statistics.rx.general;
-        accum_ht = &priv->_4965.accum_statistics.rx.ofdm_ht;
-        delta_ofdm = &priv->_4965.delta_statistics.rx.ofdm;
-        delta_cck = &priv->_4965.delta_statistics.rx.cck;
-        delta_general = &priv->_4965.delta_statistics.rx.general;
-        delta_ht = &priv->_4965.delta_statistics.rx.ofdm_ht;
-        max_ofdm = &priv->_4965.max_delta.rx.ofdm;
-        max_cck = &priv->_4965.max_delta.rx.cck;
-        max_general = &priv->_4965.max_delta.rx.general;
-        max_ht = &priv->_4965.max_delta.rx.ofdm_ht;
-
-        pos += iwl4965_statistics_flag(priv, buf, bufsz);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_header, "Statistics_Rx - OFDM:");
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "ina_cnt:",
-                         le32_to_cpu(ofdm->ina_cnt),
-                         accum_ofdm->ina_cnt,
-                         delta_ofdm->ina_cnt, max_ofdm->ina_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "fina_cnt:",
-                         le32_to_cpu(ofdm->fina_cnt), accum_ofdm->fina_cnt,
-                         delta_ofdm->fina_cnt, max_ofdm->fina_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "plcp_err:",
-                         le32_to_cpu(ofdm->plcp_err), accum_ofdm->plcp_err,
-                         delta_ofdm->plcp_err, max_ofdm->plcp_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "crc32_err:",
-                         le32_to_cpu(ofdm->crc32_err), accum_ofdm->crc32_err,
-                         delta_ofdm->crc32_err, max_ofdm->crc32_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "overrun_err:",
-                         le32_to_cpu(ofdm->overrun_err),
-                         accum_ofdm->overrun_err, delta_ofdm->overrun_err,
-                         max_ofdm->overrun_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "early_overrun_err:",
-                         le32_to_cpu(ofdm->early_overrun_err),
-                         accum_ofdm->early_overrun_err,
-                         delta_ofdm->early_overrun_err,
-                         max_ofdm->early_overrun_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "crc32_good:",
-                         le32_to_cpu(ofdm->crc32_good),
-                         accum_ofdm->crc32_good, delta_ofdm->crc32_good,
-                         max_ofdm->crc32_good);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "false_alarm_cnt:",
-                         le32_to_cpu(ofdm->false_alarm_cnt),
-                         accum_ofdm->false_alarm_cnt,
-                         delta_ofdm->false_alarm_cnt,
-                         max_ofdm->false_alarm_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "fina_sync_err_cnt:",
-                         le32_to_cpu(ofdm->fina_sync_err_cnt),
-                         accum_ofdm->fina_sync_err_cnt,
-                         delta_ofdm->fina_sync_err_cnt,
-                         max_ofdm->fina_sync_err_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "sfd_timeout:",
-                         le32_to_cpu(ofdm->sfd_timeout),
-                         accum_ofdm->sfd_timeout, delta_ofdm->sfd_timeout,
-                         max_ofdm->sfd_timeout);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "fina_timeout:",
-                         le32_to_cpu(ofdm->fina_timeout),
-                         accum_ofdm->fina_timeout, delta_ofdm->fina_timeout,
-                         max_ofdm->fina_timeout);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "unresponded_rts:",
-                         le32_to_cpu(ofdm->unresponded_rts),
-                         accum_ofdm->unresponded_rts,
-                         delta_ofdm->unresponded_rts,
-                         max_ofdm->unresponded_rts);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "rxe_frame_lmt_ovrun:",
-                         le32_to_cpu(ofdm->rxe_frame_limit_overrun),
-                         accum_ofdm->rxe_frame_limit_overrun,
-                         delta_ofdm->rxe_frame_limit_overrun,
-                         max_ofdm->rxe_frame_limit_overrun);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "sent_ack_cnt:",
-                         le32_to_cpu(ofdm->sent_ack_cnt),
-                         accum_ofdm->sent_ack_cnt, delta_ofdm->sent_ack_cnt,
-                         max_ofdm->sent_ack_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "sent_cts_cnt:",
-                         le32_to_cpu(ofdm->sent_cts_cnt),
-                         accum_ofdm->sent_cts_cnt, delta_ofdm->sent_cts_cnt,
-                         max_ofdm->sent_cts_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "sent_ba_rsp_cnt:",
-                         le32_to_cpu(ofdm->sent_ba_rsp_cnt),
-                         accum_ofdm->sent_ba_rsp_cnt,
-                         delta_ofdm->sent_ba_rsp_cnt,
-                         max_ofdm->sent_ba_rsp_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "dsp_self_kill:",
-                         le32_to_cpu(ofdm->dsp_self_kill),
-                         accum_ofdm->dsp_self_kill,
-                         delta_ofdm->dsp_self_kill,
-                         max_ofdm->dsp_self_kill);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "mh_format_err:",
-                         le32_to_cpu(ofdm->mh_format_err),
-                         accum_ofdm->mh_format_err,
-                         delta_ofdm->mh_format_err,
-                         max_ofdm->mh_format_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "re_acq_main_rssi_sum:",
-                         le32_to_cpu(ofdm->re_acq_main_rssi_sum),
-                         accum_ofdm->re_acq_main_rssi_sum,
-                         delta_ofdm->re_acq_main_rssi_sum,
-                         max_ofdm->re_acq_main_rssi_sum);
-
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_header, "Statistics_Rx - CCK:");
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "ina_cnt:",
-                         le32_to_cpu(cck->ina_cnt), accum_cck->ina_cnt,
-                         delta_cck->ina_cnt, max_cck->ina_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "fina_cnt:",
-                         le32_to_cpu(cck->fina_cnt), accum_cck->fina_cnt,
-                         delta_cck->fina_cnt, max_cck->fina_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "plcp_err:",
-                         le32_to_cpu(cck->plcp_err), accum_cck->plcp_err,
-                         delta_cck->plcp_err, max_cck->plcp_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "crc32_err:",
-                         le32_to_cpu(cck->crc32_err), accum_cck->crc32_err,
-                         delta_cck->crc32_err, max_cck->crc32_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "overrun_err:",
-                         le32_to_cpu(cck->overrun_err),
-                         accum_cck->overrun_err, delta_cck->overrun_err,
-                         max_cck->overrun_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "early_overrun_err:",
-                         le32_to_cpu(cck->early_overrun_err),
-                         accum_cck->early_overrun_err,
-                         delta_cck->early_overrun_err,
-                         max_cck->early_overrun_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "crc32_good:",
-                         le32_to_cpu(cck->crc32_good), accum_cck->crc32_good,
-                         delta_cck->crc32_good, max_cck->crc32_good);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "false_alarm_cnt:",
-                         le32_to_cpu(cck->false_alarm_cnt),
-                         accum_cck->false_alarm_cnt,
-                         delta_cck->false_alarm_cnt, max_cck->false_alarm_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "fina_sync_err_cnt:",
-                         le32_to_cpu(cck->fina_sync_err_cnt),
-                         accum_cck->fina_sync_err_cnt,
-                         delta_cck->fina_sync_err_cnt,
-                         max_cck->fina_sync_err_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "sfd_timeout:",
-                         le32_to_cpu(cck->sfd_timeout),
-                         accum_cck->sfd_timeout, delta_cck->sfd_timeout,
-                         max_cck->sfd_timeout);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "fina_timeout:",
-                         le32_to_cpu(cck->fina_timeout),
-                         accum_cck->fina_timeout, delta_cck->fina_timeout,
-                         max_cck->fina_timeout);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "unresponded_rts:",
-                         le32_to_cpu(cck->unresponded_rts),
-                         accum_cck->unresponded_rts, delta_cck->unresponded_rts,
-                         max_cck->unresponded_rts);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "rxe_frame_lmt_ovrun:",
-                         le32_to_cpu(cck->rxe_frame_limit_overrun),
-                         accum_cck->rxe_frame_limit_overrun,
-                         delta_cck->rxe_frame_limit_overrun,
-                         max_cck->rxe_frame_limit_overrun);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "sent_ack_cnt:",
-                         le32_to_cpu(cck->sent_ack_cnt),
-                         accum_cck->sent_ack_cnt, delta_cck->sent_ack_cnt,
-                         max_cck->sent_ack_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "sent_cts_cnt:",
-                         le32_to_cpu(cck->sent_cts_cnt),
-                         accum_cck->sent_cts_cnt, delta_cck->sent_cts_cnt,
-                         max_cck->sent_cts_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "sent_ba_rsp_cnt:",
-                         le32_to_cpu(cck->sent_ba_rsp_cnt),
-                         accum_cck->sent_ba_rsp_cnt,
-                         delta_cck->sent_ba_rsp_cnt,
-                         max_cck->sent_ba_rsp_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "dsp_self_kill:",
-                         le32_to_cpu(cck->dsp_self_kill),
-                         accum_cck->dsp_self_kill, delta_cck->dsp_self_kill,
-                         max_cck->dsp_self_kill);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "mh_format_err:",
-                         le32_to_cpu(cck->mh_format_err),
-                         accum_cck->mh_format_err, delta_cck->mh_format_err,
-                         max_cck->mh_format_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "re_acq_main_rssi_sum:",
-                         le32_to_cpu(cck->re_acq_main_rssi_sum),
-                         accum_cck->re_acq_main_rssi_sum,
-                         delta_cck->re_acq_main_rssi_sum,
-                         max_cck->re_acq_main_rssi_sum);
-
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_header, "Statistics_Rx - GENERAL:");
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "bogus_cts:",
-                         le32_to_cpu(general->bogus_cts),
-                         accum_general->bogus_cts, delta_general->bogus_cts,
-                         max_general->bogus_cts);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "bogus_ack:",
-                         le32_to_cpu(general->bogus_ack),
-                         accum_general->bogus_ack, delta_general->bogus_ack,
-                         max_general->bogus_ack);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "non_bssid_frames:",
-                         le32_to_cpu(general->non_bssid_frames),
-                         accum_general->non_bssid_frames,
-                         delta_general->non_bssid_frames,
-                         max_general->non_bssid_frames);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "filtered_frames:",
-                         le32_to_cpu(general->filtered_frames),
-                         accum_general->filtered_frames,
-                         delta_general->filtered_frames,
-                         max_general->filtered_frames);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "non_channel_beacons:",
-                         le32_to_cpu(general->non_channel_beacons),
-                         accum_general->non_channel_beacons,
-                         delta_general->non_channel_beacons,
-                         max_general->non_channel_beacons);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "channel_beacons:",
-                         le32_to_cpu(general->channel_beacons),
-                         accum_general->channel_beacons,
-                         delta_general->channel_beacons,
-                         max_general->channel_beacons);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "num_missed_bcon:",
-                         le32_to_cpu(general->num_missed_bcon),
-                         accum_general->num_missed_bcon,
-                         delta_general->num_missed_bcon,
-                         max_general->num_missed_bcon);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "adc_rx_saturation_time:",
-                         le32_to_cpu(general->adc_rx_saturation_time),
-                         accum_general->adc_rx_saturation_time,
-                         delta_general->adc_rx_saturation_time,
-                         max_general->adc_rx_saturation_time);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "ina_detect_search_tm:",
-                         le32_to_cpu(general->ina_detection_search_time),
-                         accum_general->ina_detection_search_time,
-                         delta_general->ina_detection_search_time,
-                         max_general->ina_detection_search_time);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "beacon_silence_rssi_a:",
-                         le32_to_cpu(general->beacon_silence_rssi_a),
-                         accum_general->beacon_silence_rssi_a,
-                         delta_general->beacon_silence_rssi_a,
-                         max_general->beacon_silence_rssi_a);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "beacon_silence_rssi_b:",
-                         le32_to_cpu(general->beacon_silence_rssi_b),
-                         accum_general->beacon_silence_rssi_b,
-                         delta_general->beacon_silence_rssi_b,
-                         max_general->beacon_silence_rssi_b);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "beacon_silence_rssi_c:",
-                         le32_to_cpu(general->beacon_silence_rssi_c),
-                         accum_general->beacon_silence_rssi_c,
-                         delta_general->beacon_silence_rssi_c,
-                         max_general->beacon_silence_rssi_c);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "interference_data_flag:",
-                         le32_to_cpu(general->interference_data_flag),
-                         accum_general->interference_data_flag,
-                         delta_general->interference_data_flag,
-                         max_general->interference_data_flag);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "channel_load:",
-                         le32_to_cpu(general->channel_load),
-                         accum_general->channel_load,
-                         delta_general->channel_load,
-                         max_general->channel_load);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "dsp_false_alarms:",
-                         le32_to_cpu(general->dsp_false_alarms),
-                         accum_general->dsp_false_alarms,
-                         delta_general->dsp_false_alarms,
-                         max_general->dsp_false_alarms);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "beacon_rssi_a:",
-                         le32_to_cpu(general->beacon_rssi_a),
-                         accum_general->beacon_rssi_a,
-                         delta_general->beacon_rssi_a,
-                         max_general->beacon_rssi_a);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "beacon_rssi_b:",
-                         le32_to_cpu(general->beacon_rssi_b),
-                         accum_general->beacon_rssi_b,
-                         delta_general->beacon_rssi_b,
-                         max_general->beacon_rssi_b);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "beacon_rssi_c:",
-                         le32_to_cpu(general->beacon_rssi_c),
-                         accum_general->beacon_rssi_c,
-                         delta_general->beacon_rssi_c,
-                         max_general->beacon_rssi_c);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "beacon_energy_a:",
-                         le32_to_cpu(general->beacon_energy_a),
-                         accum_general->beacon_energy_a,
-                         delta_general->beacon_energy_a,
-                         max_general->beacon_energy_a);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "beacon_energy_b:",
-                         le32_to_cpu(general->beacon_energy_b),
-                         accum_general->beacon_energy_b,
-                         delta_general->beacon_energy_b,
-                         max_general->beacon_energy_b);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "beacon_energy_c:",
-                         le32_to_cpu(general->beacon_energy_c),
-                         accum_general->beacon_energy_c,
-                         delta_general->beacon_energy_c,
-                         max_general->beacon_energy_c);
-
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_header, "Statistics_Rx - OFDM_HT:");
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "plcp_err:",
-                         le32_to_cpu(ht->plcp_err), accum_ht->plcp_err,
-                         delta_ht->plcp_err, max_ht->plcp_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "overrun_err:",
-                         le32_to_cpu(ht->overrun_err), accum_ht->overrun_err,
-                         delta_ht->overrun_err, max_ht->overrun_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "early_overrun_err:",
-                         le32_to_cpu(ht->early_overrun_err),
-                         accum_ht->early_overrun_err,
-                         delta_ht->early_overrun_err,
-                         max_ht->early_overrun_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "crc32_good:",
-                         le32_to_cpu(ht->crc32_good), accum_ht->crc32_good,
-                         delta_ht->crc32_good, max_ht->crc32_good);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "crc32_err:",
-                         le32_to_cpu(ht->crc32_err), accum_ht->crc32_err,
-                         delta_ht->crc32_err, max_ht->crc32_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "mh_format_err:",
-                         le32_to_cpu(ht->mh_format_err),
-                         accum_ht->mh_format_err,
-                         delta_ht->mh_format_err, max_ht->mh_format_err);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "agg_crc32_good:",
-                         le32_to_cpu(ht->agg_crc32_good),
-                         accum_ht->agg_crc32_good,
-                         delta_ht->agg_crc32_good, max_ht->agg_crc32_good);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "agg_mpdu_cnt:",
-                         le32_to_cpu(ht->agg_mpdu_cnt),
-                         accum_ht->agg_mpdu_cnt,
-                         delta_ht->agg_mpdu_cnt, max_ht->agg_mpdu_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "agg_cnt:",
-                         le32_to_cpu(ht->agg_cnt), accum_ht->agg_cnt,
-                         delta_ht->agg_cnt, max_ht->agg_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "unsupport_mcs:",
-                         le32_to_cpu(ht->unsupport_mcs),
-                         accum_ht->unsupport_mcs,
-                         delta_ht->unsupport_mcs, max_ht->unsupport_mcs);
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-ssize_t iwl4965_ucode_tx_stats_read(struct file *file,
-                                char __user *user_buf,
-                                size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        int pos = 0;
-        char *buf;
-        int bufsz = (sizeof(struct statistics_tx) * 48) + 250;
-        ssize_t ret;
-        struct statistics_tx *tx, *accum_tx, *delta_tx, *max_tx;
-
-        if (!iwl_legacy_is_alive(priv))
-                return -EAGAIN;
-
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
-                return -ENOMEM;
-        }
-
-        /* the statistic information display here is based on
-          * the last statistics notification from uCode
-          * might not reflect the current uCode activity
-          */
-        tx = &priv->_4965.statistics.tx;
-        accum_tx = &priv->_4965.accum_statistics.tx;
-        delta_tx = &priv->_4965.delta_statistics.tx;
-        max_tx = &priv->_4965.max_delta.tx;
-
-        pos += iwl4965_statistics_flag(priv, buf, bufsz);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_header, "Statistics_Tx:");
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "preamble:",
-                         le32_to_cpu(tx->preamble_cnt),
-                         accum_tx->preamble_cnt,
-                         delta_tx->preamble_cnt, max_tx->preamble_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "rx_detected_cnt:",
-                         le32_to_cpu(tx->rx_detected_cnt),
-                         accum_tx->rx_detected_cnt,
-                         delta_tx->rx_detected_cnt, max_tx->rx_detected_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "bt_prio_defer_cnt:",
-                         le32_to_cpu(tx->bt_prio_defer_cnt),
-                         accum_tx->bt_prio_defer_cnt,
-                         delta_tx->bt_prio_defer_cnt,
-                         max_tx->bt_prio_defer_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "bt_prio_kill_cnt:",
-                         le32_to_cpu(tx->bt_prio_kill_cnt),
-                         accum_tx->bt_prio_kill_cnt,
-                         delta_tx->bt_prio_kill_cnt,
-                         max_tx->bt_prio_kill_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "few_bytes_cnt:",
-                         le32_to_cpu(tx->few_bytes_cnt),
-                         accum_tx->few_bytes_cnt,
-                         delta_tx->few_bytes_cnt, max_tx->few_bytes_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "cts_timeout:",
-                         le32_to_cpu(tx->cts_timeout), accum_tx->cts_timeout,
-                         delta_tx->cts_timeout, max_tx->cts_timeout);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "ack_timeout:",
-                         le32_to_cpu(tx->ack_timeout),
-                         accum_tx->ack_timeout,
-                         delta_tx->ack_timeout, max_tx->ack_timeout);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "expected_ack_cnt:",
-                         le32_to_cpu(tx->expected_ack_cnt),
-                         accum_tx->expected_ack_cnt,
-                         delta_tx->expected_ack_cnt,
-                         max_tx->expected_ack_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "actual_ack_cnt:",
-                         le32_to_cpu(tx->actual_ack_cnt),
-                         accum_tx->actual_ack_cnt,
-                         delta_tx->actual_ack_cnt,
-                         max_tx->actual_ack_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "dump_msdu_cnt:",
-                         le32_to_cpu(tx->dump_msdu_cnt),
-                         accum_tx->dump_msdu_cnt,
-                         delta_tx->dump_msdu_cnt,
-                         max_tx->dump_msdu_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "abort_nxt_frame_mismatch:",
-                         le32_to_cpu(tx->burst_abort_next_frame_mismatch_cnt),
-                         accum_tx->burst_abort_next_frame_mismatch_cnt,
-                         delta_tx->burst_abort_next_frame_mismatch_cnt,
-                         max_tx->burst_abort_next_frame_mismatch_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "abort_missing_nxt_frame:",
-                         le32_to_cpu(tx->burst_abort_missing_next_frame_cnt),
-                         accum_tx->burst_abort_missing_next_frame_cnt,
-                         delta_tx->burst_abort_missing_next_frame_cnt,
-                         max_tx->burst_abort_missing_next_frame_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "cts_timeout_collision:",
-                         le32_to_cpu(tx->cts_timeout_collision),
-                         accum_tx->cts_timeout_collision,
-                         delta_tx->cts_timeout_collision,
-                         max_tx->cts_timeout_collision);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "ack_ba_timeout_collision:",
-                         le32_to_cpu(tx->ack_or_ba_timeout_collision),
-                         accum_tx->ack_or_ba_timeout_collision,
-                         delta_tx->ack_or_ba_timeout_collision,
-                         max_tx->ack_or_ba_timeout_collision);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "agg ba_timeout:",
-                         le32_to_cpu(tx->agg.ba_timeout),
-                         accum_tx->agg.ba_timeout,
-                         delta_tx->agg.ba_timeout,
-                         max_tx->agg.ba_timeout);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "agg ba_resched_frames:",
-                         le32_to_cpu(tx->agg.ba_reschedule_frames),
-                         accum_tx->agg.ba_reschedule_frames,
-                         delta_tx->agg.ba_reschedule_frames,
-                         max_tx->agg.ba_reschedule_frames);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "agg scd_query_agg_frame:",
-                         le32_to_cpu(tx->agg.scd_query_agg_frame_cnt),
-                         accum_tx->agg.scd_query_agg_frame_cnt,
-                         delta_tx->agg.scd_query_agg_frame_cnt,
-                         max_tx->agg.scd_query_agg_frame_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "agg scd_query_no_agg:",
-                         le32_to_cpu(tx->agg.scd_query_no_agg),
-                         accum_tx->agg.scd_query_no_agg,
-                         delta_tx->agg.scd_query_no_agg,
-                         max_tx->agg.scd_query_no_agg);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "agg scd_query_agg:",
-                         le32_to_cpu(tx->agg.scd_query_agg),
-                         accum_tx->agg.scd_query_agg,
-                         delta_tx->agg.scd_query_agg,
-                         max_tx->agg.scd_query_agg);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "agg scd_query_mismatch:",
-                         le32_to_cpu(tx->agg.scd_query_mismatch),
-                         accum_tx->agg.scd_query_mismatch,
-                         delta_tx->agg.scd_query_mismatch,
-                         max_tx->agg.scd_query_mismatch);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "agg frame_not_ready:",
-                         le32_to_cpu(tx->agg.frame_not_ready),
-                         accum_tx->agg.frame_not_ready,
-                         delta_tx->agg.frame_not_ready,
-                         max_tx->agg.frame_not_ready);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "agg underrun:",
-                         le32_to_cpu(tx->agg.underrun),
-                         accum_tx->agg.underrun,
-                         delta_tx->agg.underrun, max_tx->agg.underrun);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "agg bt_prio_kill:",
-                         le32_to_cpu(tx->agg.bt_prio_kill),
-                         accum_tx->agg.bt_prio_kill,
-                         delta_tx->agg.bt_prio_kill,
-                         max_tx->agg.bt_prio_kill);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "agg rx_ba_rsp_cnt:",
-                         le32_to_cpu(tx->agg.rx_ba_rsp_cnt),
-                         accum_tx->agg.rx_ba_rsp_cnt,
-                         delta_tx->agg.rx_ba_rsp_cnt,
-                         max_tx->agg.rx_ba_rsp_cnt);
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-ssize_t
-iwl4965_ucode_general_stats_read(struct file *file, char __user *user_buf,
-                                     size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        int pos = 0;
-        char *buf;
-        int bufsz = sizeof(struct statistics_general) * 10 + 300;
-        ssize_t ret;
-        struct statistics_general_common *general, *accum_general;
-        struct statistics_general_common *delta_general, *max_general;
-        struct statistics_dbg *dbg, *accum_dbg, *delta_dbg, *max_dbg;
-        struct statistics_div *div, *accum_div, *delta_div, *max_div;
-
-        if (!iwl_legacy_is_alive(priv))
-                return -EAGAIN;
-
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
-                return -ENOMEM;
-        }
-
-        /* the statistic information display here is based on
-          * the last statistics notification from uCode
-          * might not reflect the current uCode activity
-          */
-        general = &priv->_4965.statistics.general.common;
-        dbg = &priv->_4965.statistics.general.common.dbg;
-        div = &priv->_4965.statistics.general.common.div;
-        accum_general = &priv->_4965.accum_statistics.general.common;
-        accum_dbg = &priv->_4965.accum_statistics.general.common.dbg;
-        accum_div = &priv->_4965.accum_statistics.general.common.div;
-        delta_general = &priv->_4965.delta_statistics.general.common;
-        max_general = &priv->_4965.max_delta.general.common;
-        delta_dbg = &priv->_4965.delta_statistics.general.common.dbg;
-        max_dbg = &priv->_4965.max_delta.general.common.dbg;
-        delta_div = &priv->_4965.delta_statistics.general.common.div;
-        max_div = &priv->_4965.max_delta.general.common.div;
-
-        pos += iwl4965_statistics_flag(priv, buf, bufsz);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_header, "Statistics_General:");
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_value, "temperature:",
-                         le32_to_cpu(general->temperature));
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_value, "ttl_timestamp:",
-                         le32_to_cpu(general->ttl_timestamp));
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "burst_check:",
-                         le32_to_cpu(dbg->burst_check),
-                         accum_dbg->burst_check,
-                         delta_dbg->burst_check, max_dbg->burst_check);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "burst_count:",
-                         le32_to_cpu(dbg->burst_count),
-                         accum_dbg->burst_count,
-                         delta_dbg->burst_count, max_dbg->burst_count);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "wait_for_silence_timeout_count:",
-                         le32_to_cpu(dbg->wait_for_silence_timeout_cnt),
-                         accum_dbg->wait_for_silence_timeout_cnt,
-                         delta_dbg->wait_for_silence_timeout_cnt,
-                         max_dbg->wait_for_silence_timeout_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "sleep_time:",
-                         le32_to_cpu(general->sleep_time),
-                         accum_general->sleep_time,
-                         delta_general->sleep_time, max_general->sleep_time);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "slots_out:",
-                         le32_to_cpu(general->slots_out),
-                         accum_general->slots_out,
-                         delta_general->slots_out, max_general->slots_out);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "slots_idle:",
-                         le32_to_cpu(general->slots_idle),
-                         accum_general->slots_idle,
-                         delta_general->slots_idle, max_general->slots_idle);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "tx_on_a:",
-                         le32_to_cpu(div->tx_on_a), accum_div->tx_on_a,
-                         delta_div->tx_on_a, max_div->tx_on_a);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "tx_on_b:",
-                         le32_to_cpu(div->tx_on_b), accum_div->tx_on_b,
-                         delta_div->tx_on_b, max_div->tx_on_b);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "exec_time:",
-                         le32_to_cpu(div->exec_time), accum_div->exec_time,
-                         delta_div->exec_time, max_div->exec_time);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "probe_time:",
-                         le32_to_cpu(div->probe_time), accum_div->probe_time,
-                         delta_div->probe_time, max_div->probe_time);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "rx_enable_counter:",
-                         le32_to_cpu(general->rx_enable_counter),
-                         accum_general->rx_enable_counter,
-                         delta_general->rx_enable_counter,
-                         max_general->rx_enable_counter);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                         fmt_table, "num_of_sos_states:",
-                         le32_to_cpu(general->num_of_sos_states),
-                         accum_general->num_of_sos_states,
-                         delta_general->num_of_sos_states,
-                         max_general->num_of_sos_states);
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h b/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h
deleted file mode 100644
index 6c8e35361a9e..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/******************************************************************************
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *****************************************************************************/
-
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-debug.h"
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
-ssize_t iwl4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
-                                size_t count, loff_t *ppos);
-ssize_t iwl4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,
-                                size_t count, loff_t *ppos);
-ssize_t iwl4965_ucode_general_stats_read(struct file *file,
-                        char __user *user_buf, size_t count, loff_t *ppos);
-#else
-static ssize_t
-iwl4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
-                                       size_t count, loff_t *ppos)
-{
-        return 0;
-}
-static ssize_t
-iwl4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,
-                                       size_t count, loff_t *ppos)
-{
-        return 0;
-}
-static ssize_t
-iwl4965_ucode_general_stats_read(struct file *file, char __user *user_buf,
-                                            size_t count, loff_t *ppos)
-{
-        return 0;
-}
-#endif
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c b/drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c
deleted file mode 100644
index cb9baab1ff7d..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/******************************************************************************
- *
- * 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 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2011 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/slab.h>
-#include <linux/init.h>
-
-#include <net/mac80211.h>
-
-#include "iwl-commands.h"
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-debug.h"
-#include "iwl-4965.h"
-#include "iwl-io.h"
-
-/******************************************************************************
- *
- * EEPROM related functions
- *
-******************************************************************************/
-
-/*
- * 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 iwl_priv *priv)
-{
-        u16 count;
-        int ret;
-
-        for (count = 0; count < EEPROM_SEM_RETRY_LIMIT; count++) {
-                /* Request semaphore */
-                iwl_legacy_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(priv,
-                                "Acquired semaphore after %d tries.\n",
-                                count+1);
-                        return ret;
-                }
-        }
-
-        return ret;
-}
-
-void iwl4965_eeprom_release_semaphore(struct iwl_priv *priv)
-{
-        iwl_legacy_clear_bit(priv, CSR_HW_IF_CONFIG_REG,
-                CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
-
-}
-
-int iwl4965_eeprom_check_version(struct iwl_priv *priv)
-{
-        u16 eeprom_ver;
-        u16 calib_ver;
-
-        eeprom_ver = iwl_legacy_eeprom_query16(priv, EEPROM_VERSION);
-        calib_ver = iwl_legacy_eeprom_query16(priv,
-                        EEPROM_4965_CALIB_VERSION_OFFSET);
-
-        if (eeprom_ver < priv->cfg->eeprom_ver ||
-            calib_ver < priv->cfg->eeprom_calib_ver)
-                goto err;
-
-        IWL_INFO(priv, "device EEPROM VER=0x%x, CALIB=0x%x\n",
-                 eeprom_ver, calib_ver);
-
-        return 0;
-err:
-        IWL_ERR(priv, "Unsupported (too old) EEPROM VER=0x%x < 0x%x "
-                  "CALIB=0x%x < 0x%x\n",
-                  eeprom_ver, priv->cfg->eeprom_ver,
-                  calib_ver,  priv->cfg->eeprom_calib_ver);
-        return -EINVAL;
-
-}
-
-void iwl4965_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac)
-{
-        const u8 *addr = iwl_legacy_eeprom_query_addr(priv,
-                                        EEPROM_MAC_ADDRESS);
-        memcpy(mac, addr, ETH_ALEN);
-}
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-hw.h b/drivers/net/wireless/iwlegacy/iwl-4965-hw.h
deleted file mode 100644
index fc6fa2886d9c..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-4965-hw.h
+++ /dev/null
@@ -1,811 +0,0 @@
-/******************************************************************************
- *
- * 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 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2011 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.
- *
- *****************************************************************************/
-/*
- * Please use this file (iwl-4965-hw.h) only for hardware-related definitions.
- * Use iwl-commands.h for uCode API definitions.
- * Use iwl-dev.h for driver implementation definitions.
- */
-
-#ifndef __iwl_4965_hw_h__
-#define __iwl_4965_hw_h__
-
-#include "iwl-fh.h"
-
-/* EEPROM */
-#define IWL4965_EEPROM_IMG_SIZE                 1024
-
-/*
- * uCode queue management definitions ...
- * The first queue used for block-ack aggregation is #7 (4965 only).
- * All block-ack aggregation queues should map to Tx DMA/FIFO channel 7.
- */
-#define IWL49_FIRST_AMPDU_QUEUE 7
-
-/* Sizes and addresses for instruction and data memory (SRAM) in
- * 4965's embedded processor.  Driver access is via HBUS_TARG_MEM_* regs. */
-#define IWL49_RTC_INST_LOWER_BOUND              (0x000000)
-#define IWL49_RTC_INST_UPPER_BOUND              (0x018000)
-
-#define IWL49_RTC_DATA_LOWER_BOUND              (0x800000)
-#define IWL49_RTC_DATA_UPPER_BOUND              (0x80A000)
-
-#define IWL49_RTC_INST_SIZE  (IWL49_RTC_INST_UPPER_BOUND - \
-                                IWL49_RTC_INST_LOWER_BOUND)
-#define IWL49_RTC_DATA_SIZE  (IWL49_RTC_DATA_UPPER_BOUND - \
-                                IWL49_RTC_DATA_LOWER_BOUND)
-
-#define IWL49_MAX_INST_SIZE IWL49_RTC_INST_SIZE
-#define IWL49_MAX_DATA_SIZE IWL49_RTC_DATA_SIZE
-
-/* Size of uCode instruction memory in bootstrap state machine */
-#define IWL49_MAX_BSM_SIZE BSM_SRAM_SIZE
-
-static inline int iwl4965_hw_valid_rtc_data_addr(u32 addr)
-{
-        return (addr >= IWL49_RTC_DATA_LOWER_BOUND) &&
-               (addr < IWL49_RTC_DATA_UPPER_BOUND);
-}
-
-/********************* START TEMPERATURE *************************************/
-
-/**
- * 4965 temperature calculation.
- *
- * The driver must calculate the device temperature before calculating
- * a txpower setting (amplifier gain is temperature dependent).  The
- * calculation uses 4 measurements, 3 of which (R1, R2, R3) are calibration
- * values used for the life of the driver, and one of which (R4) is the
- * real-time temperature indicator.
- *
- * uCode provides all 4 values to the driver via the "initialize alive"
- * notification (see struct iwl4965_init_alive_resp).  After the runtime uCode
- * image loads, uCode updates the R4 value via statistics notifications
- * (see STATISTICS_NOTIFICATION), which occur after each received beacon
- * when associated, or can be requested via REPLY_STATISTICS_CMD.
- *
- * NOTE:  uCode provides the R4 value as a 23-bit signed value.  Driver
- *        must sign-extend to 32 bits before applying formula below.
- *
- * Formula:
- *
- * degrees Kelvin = ((97 * 259 * (R4 - R2) / (R3 - R1)) / 100) + 8
- *
- * NOTE:  The basic formula is 259 * (R4-R2) / (R3-R1).  The 97/100 is
- * an additional correction, which should be centered around 0 degrees
- * Celsius (273 degrees Kelvin).  The 8 (3 percent of 273) compensates for
- * centering the 97/100 correction around 0 degrees K.
- *
- * Add 273 to Kelvin value to find degrees Celsius, for comparing current
- * temperature with factory-measured temperatures when calculating txpower
- * settings.
- */
-#define TEMPERATURE_CALIB_KELVIN_OFFSET 8
-#define TEMPERATURE_CALIB_A_VAL 259
-
-/* Limit range of calculated temperature to be between these Kelvin values */
-#define IWL_TX_POWER_TEMPERATURE_MIN  (263)
-#define IWL_TX_POWER_TEMPERATURE_MAX  (410)
-
-#define IWL_TX_POWER_TEMPERATURE_OUT_OF_RANGE(t) \
-        (((t) < IWL_TX_POWER_TEMPERATURE_MIN) || \
-         ((t) > IWL_TX_POWER_TEMPERATURE_MAX))
-
-/********************* END TEMPERATURE ***************************************/
-
-/********************* START TXPOWER *****************************************/
-
-/**
- * 4965 txpower calculations rely on information from three sources:
- *
- *     1) EEPROM
- *     2) "initialize" alive notification
- *     3) statistics notifications
- *
- * EEPROM data consists of:
- *
- * 1)  Regulatory information (max txpower and channel usage flags) is provided
- *     separately for each channel that can possibly supported by 4965.
- *     40 MHz wide (.11n HT40) channels are listed separately from 20 MHz
- *     (legacy) channels.
- *
- *     See struct iwl4965_eeprom_channel for format, and struct iwl4965_eeprom
- *     for locations in EEPROM.
- *
- * 2)  Factory txpower calibration information is provided separately for
- *     sub-bands of contiguous channels.  2.4GHz has just one sub-band,
- *     but 5 GHz has several sub-bands.
- *
- *     In addition, per-band (2.4 and 5 Ghz) saturation txpowers are provided.
- *
- *     See struct iwl4965_eeprom_calib_info (and the tree of structures
- *     contained within it) for format, and struct iwl4965_eeprom for
- *     locations in EEPROM.
- *
- * "Initialization alive" notification (see struct iwl4965_init_alive_resp)
- * consists of:
- *
- * 1)  Temperature calculation parameters.
- *
- * 2)  Power supply voltage measurement.
- *
- * 3)  Tx gain compensation to balance 2 transmitters for MIMO use.
- *
- * Statistics notifications deliver:
- *
- * 1)  Current values for temperature param R4.
- */
-
-/**
- * To calculate a txpower setting for a given desired target txpower, channel,
- * modulation bit rate, and transmitter chain (4965 has 2 transmitters to
- * support MIMO and transmit diversity), driver must do the following:
- *
- * 1)  Compare desired txpower vs. (EEPROM) regulatory limit for this channel.
- *     Do not exceed regulatory limit; reduce target txpower if necessary.
- *
- *     If setting up txpowers for MIMO rates (rate indexes 8-15, 24-31),
- *     2 transmitters will be used simultaneously; driver must reduce the
- *     regulatory limit by 3 dB (half-power) for each transmitter, so the
- *     combined total output of the 2 transmitters is within regulatory limits.
- *
- *
- * 2)  Compare target txpower vs. (EEPROM) saturation txpower *reduced by
- *     backoff for this bit rate*.  Do not exceed (saturation - backoff[rate]);
- *     reduce target txpower if necessary.
- *
- *     Backoff values below are in 1/2 dB units (equivalent to steps in
- *     txpower gain tables):
- *
- *     OFDM 6 - 36 MBit:  10 steps (5 dB)
- *     OFDM 48 MBit:      15 steps (7.5 dB)
- *     OFDM 54 MBit:      17 steps (8.5 dB)
- *     OFDM 60 MBit:      20 steps (10 dB)
- *     CCK all rates:     10 steps (5 dB)
- *
- *     Backoff values apply to saturation txpower on a per-transmitter basis;
- *     when using MIMO (2 transmitters), each transmitter uses the same
- *     saturation level provided in EEPROM, and the same backoff values;
- *     no reduction (such as with regulatory txpower limits) is required.
- *
- *     Saturation and Backoff values apply equally to 20 Mhz (legacy) channel
- *     widths and 40 Mhz (.11n HT40) channel widths; there is no separate
- *     factory measurement for ht40 channels.
- *
- *     The result of this step is the final target txpower.  The rest of
- *     the steps figure out the proper settings for the device to achieve
- *     that target txpower.
- *
- *
- * 3)  Determine (EEPROM) calibration sub band for the target channel, by
- *     comparing against first and last channels in each sub band
- *     (see struct iwl4965_eeprom_calib_subband_info).
- *
- *
- * 4)  Linearly interpolate (EEPROM) factory calibration measurement sets,
- *     referencing the 2 factory-measured (sample) channels within the sub band.
- *
- *     Interpolation is based on difference between target channel's frequency
- *     and the sample channels' frequencies.  Since channel numbers are based
- *     on frequency (5 MHz between each channel number), this is equivalent
- *     to interpolating based on channel number differences.
- *
- *     Note that the sample channels may or may not be the channels at the
- *     edges of the sub band.  The target channel may be "outside" of the
- *     span of the sampled channels.
- *
- *     Driver may choose the pair (for 2 Tx chains) of measurements (see
- *     struct iwl4965_eeprom_calib_ch_info) for which the actual measured
- *     txpower comes closest to the desired txpower.  Usually, though,
- *     the middle set of measurements is closest to the regulatory limits,
- *     and is therefore a good choice for all txpower calculations (this
- *     assumes that high accuracy is needed for maximizing legal txpower,
- *     while lower txpower configurations do not need as much accuracy).
- *
- *     Driver should interpolate both members of the chosen measurement pair,
- *     i.e. for both Tx chains (radio transmitters), unless the driver knows
- *     that only one of the chains will be used (e.g. only one tx antenna
- *     connected, but this should be unusual).  The rate scaling algorithm
- *     switches antennas to find best performance, so both Tx chains will
- *     be used (although only one at a time) even for non-MIMO transmissions.
- *
- *     Driver should interpolate factory values for temperature, gain table
- *     index, and actual power.  The power amplifier detector values are
- *     not used by the driver.
- *
- *     Sanity check:  If the target channel happens to be one of the sample
- *     channels, the results should agree with the sample channel's
- *     measurements!
- *
- *
- * 5)  Find difference between desired txpower and (interpolated)
- *     factory-measured txpower.  Using (interpolated) factory gain table index
- *     (shown elsewhere) as a starting point, adjust this index lower to
- *     increase txpower, or higher to decrease txpower, until the target
- *     txpower is reached.  Each step in the gain table is 1/2 dB.
- *
- *     For example, if factory measured txpower is 16 dBm, and target txpower
- *     is 13 dBm, add 6 steps to the factory gain index to reduce txpower
- *     by 3 dB.
- *
- *
- * 6)  Find difference between current device temperature and (interpolated)
- *     factory-measured temperature for sub-band.  Factory values are in
- *     degrees Celsius.  To calculate current temperature, see comments for
- *     "4965 temperature calculation".
- *
- *     If current temperature is higher than factory temperature, driver must
- *     increase gain (lower gain table index), and vice verse.
- *
- *     Temperature affects gain differently for different channels:
- *
- *     2.4 GHz all channels:  3.5 degrees per half-dB step
- *     5 GHz channels 34-43:  4.5 degrees per half-dB step
- *     5 GHz channels >= 44:  4.0 degrees per half-dB step
- *
- *     NOTE:  Temperature can increase rapidly when transmitting, especially
- *            with heavy traffic at high txpowers.  Driver should update
- *            temperature calculations often under these conditions to
- *            maintain strong txpower in the face of rising temperature.
- *
- *
- * 7)  Find difference between current power supply voltage indicator
- *     (from "initialize alive") and factory-measured power supply voltage
- *     indicator (EEPROM).
- *
- *     If the current voltage is higher (indicator is lower) than factory
- *     voltage, gain should be reduced (gain table index increased) by:
- *
- *     (eeprom - current) / 7
- *
- *     If the current voltage is lower (indicator is higher) than factory
- *     voltage, gain should be increased (gain table index decreased) by:
- *
- *     2 * (current - eeprom) / 7
- *
- *     If number of index steps in either direction turns out to be > 2,
- *     something is wrong ... just use 0.
- *
- *     NOTE:  Voltage compensation is independent of band/channel.
- *
- *     NOTE:  "Initialize" uCode measures current voltage, which is assumed
- *            to be constant after this initial measurement.  Voltage
- *            compensation for txpower (number of steps in gain table)
- *            may be calculated once and used until the next uCode bootload.
- *
- *
- * 8)  If setting up txpowers for MIMO rates (rate indexes 8-15, 24-31),
- *     adjust txpower for each transmitter chain, so txpower is balanced
- *     between the two chains.  There are 5 pairs of tx_atten[group][chain]
- *     values in "initialize alive", one pair for each of 5 channel ranges:
- *
- *     Group 0:  5 GHz channel 34-43
- *     Group 1:  5 GHz channel 44-70
- *     Group 2:  5 GHz channel 71-124
- *     Group 3:  5 GHz channel 125-200
- *     Group 4:  2.4 GHz all channels
- *
- *     Add the tx_atten[group][chain] value to the index for the target chain.
- *     The values are signed, but are in pairs of 0 and a non-negative number,
- *     so as to reduce gain (if necessary) of the "hotter" channel.  This
- *     avoids any need to double-check for regulatory compliance after
- *     this step.
- *
- *
- * 9)  If setting up for a CCK rate, lower the gain by adding a CCK compensation
- *     value to the index:
- *
- *     Hardware rev B:  9 steps (4.5 dB)
- *     Hardware rev C:  5 steps (2.5 dB)
- *
- *     Hardware rev for 4965 can be determined by reading CSR_HW_REV_WA_REG,
- *     bits [3:2], 1 = B, 2 = C.
- *
- *     NOTE:  This compensation is in addition to any saturation backoff that
- *            might have been applied in an earlier step.
- *
- *
- * 10) Select the gain table, based on band (2.4 vs 5 GHz).
- *
- *     Limit the adjusted index to stay within the table!
- *
- *
- * 11) Read gain table entries for DSP and radio gain, place into appropriate
- *     location(s) in command (struct iwl4965_txpowertable_cmd).
- */
-
-/**
- * When MIMO is used (2 transmitters operating simultaneously), driver should
- * limit each transmitter to deliver a max of 3 dB below the regulatory limit
- * for the device.  That is, use half power for each transmitter, so total
- * txpower is within regulatory limits.
- *
- * The value "6" represents number of steps in gain table to reduce power 3 dB.
- * Each step is 1/2 dB.
- */
-#define IWL_TX_POWER_MIMO_REGULATORY_COMPENSATION (6)
-
-/**
- * CCK gain compensation.
- *
- * When calculating txpowers for CCK, after making sure that the target power
- * is within regulatory and saturation limits, driver must additionally
- * back off gain by adding these values to the gain table index.
- *
- * Hardware rev for 4965 can be determined by reading CSR_HW_REV_WA_REG,
- * bits [3:2], 1 = B, 2 = C.
- */
-#define IWL_TX_POWER_CCK_COMPENSATION_B_STEP (9)
-#define IWL_TX_POWER_CCK_COMPENSATION_C_STEP (5)
-
-/*
- * 4965 power supply voltage compensation for txpower
- */
-#define TX_POWER_IWL_VOLTAGE_CODES_PER_03V   (7)
-
-/**
- * Gain tables.
- *
- * The following tables contain pair of values for setting txpower, i.e.
- * gain settings for the output of the device's digital signal processor (DSP),
- * and for the analog gain structure of the transmitter.
- *
- * Each entry in the gain tables represents a step of 1/2 dB.  Note that these
- * are *relative* steps, not indications of absolute output power.  Output
- * power varies with temperature, voltage, and channel frequency, and also
- * requires consideration of average power (to satisfy regulatory constraints),
- * and peak power (to avoid distortion of the output signal).
- *
- * Each entry contains two values:
- * 1)  DSP gain (or sometimes called DSP attenuation).  This is a fine-grained
- *     linear value that multiplies the output of the digital signal processor,
- *     before being sent to the analog radio.
- * 2)  Radio gain.  This sets the analog gain of the radio Tx path.
- *     It is a coarser setting, and behaves in a logarithmic (dB) fashion.
- *
- * EEPROM contains factory calibration data for txpower.  This maps actual
- * measured txpower levels to gain settings in the "well known" tables
- * below ("well-known" means here that both factory calibration *and* the
- * driver work with the same table).
- *
- * There are separate tables for 2.4 GHz and 5 GHz bands.  The 5 GHz table
- * has an extension (into negative indexes), in case the driver needs to
- * boost power setting for high device temperatures (higher than would be
- * present during factory calibration).  A 5 Ghz EEPROM index of "40"
- * corresponds to the 49th entry in the table used by the driver.
- */
-#define MIN_TX_GAIN_INDEX               (0)  /* highest gain, lowest idx, 2.4 */
-#define MIN_TX_GAIN_INDEX_52GHZ_EXT     (-9) /* highest gain, lowest idx, 5 */
-
-/**
- * 2.4 GHz gain table
- *
- * Index    Dsp gain   Radio gain
- *   0        110         0x3f      (highest gain)
- *   1        104         0x3f
- *   2         98         0x3f
- *   3        110         0x3e
- *   4        104         0x3e
- *   5         98         0x3e
- *   6        110         0x3d
- *   7        104         0x3d
- *   8         98         0x3d
- *   9        110         0x3c
- *  10        104         0x3c
- *  11         98         0x3c
- *  12        110         0x3b
- *  13        104         0x3b
- *  14         98         0x3b
- *  15        110         0x3a
- *  16        104         0x3a
- *  17         98         0x3a
- *  18        110         0x39
- *  19        104         0x39
- *  20         98         0x39
- *  21        110         0x38
- *  22        104         0x38
- *  23         98         0x38
- *  24        110         0x37
- *  25        104         0x37
- *  26         98         0x37
- *  27        110         0x36
- *  28        104         0x36
- *  29         98         0x36
- *  30        110         0x35
- *  31        104         0x35
- *  32         98         0x35
- *  33        110         0x34
- *  34        104         0x34
- *  35         98         0x34
- *  36        110         0x33
- *  37        104         0x33
- *  38         98         0x33
- *  39        110         0x32
- *  40        104         0x32
- *  41         98         0x32
- *  42        110         0x31
- *  43        104         0x31
- *  44         98         0x31
- *  45        110         0x30
- *  46        104         0x30
- *  47         98         0x30
- *  48        110          0x6
- *  49        104          0x6
- *  50         98          0x6
- *  51        110          0x5
- *  52        104          0x5
- *  53         98          0x5
- *  54        110          0x4
- *  55        104          0x4
- *  56         98          0x4
- *  57        110          0x3
- *  58        104          0x3
- *  59         98          0x3
- *  60        110          0x2
- *  61        104          0x2
- *  62         98          0x2
- *  63        110          0x1
- *  64        104          0x1
- *  65         98          0x1
- *  66        110          0x0
- *  67        104          0x0
- *  68         98          0x0
- *  69         97            0
- *  70         96            0
- *  71         95            0
- *  72         94            0
- *  73         93            0
- *  74         92            0
- *  75         91            0
- *  76         90            0
- *  77         89            0
- *  78         88            0
- *  79         87            0
- *  80         86            0
- *  81         85            0
- *  82         84            0
- *  83         83            0
- *  84         82            0
- *  85         81            0
- *  86         80            0
- *  87         79            0
- *  88         78            0
- *  89         77            0
- *  90         76            0
- *  91         75            0
- *  92         74            0
- *  93         73            0
- *  94         72            0
- *  95         71            0
- *  96         70            0
- *  97         69            0
- *  98         68            0
- */
-
-/**
- * 5 GHz gain table
- *
- * Index    Dsp gain   Radio gain
- *  -9        123         0x3F      (highest gain)
- *  -8        117         0x3F
- *  -7        110         0x3F
- *  -6        104         0x3F
- *  -5         98         0x3F
- *  -4        110         0x3E
- *  -3        104         0x3E
- *  -2         98         0x3E
- *  -1        110         0x3D
- *   0        104         0x3D
- *   1         98         0x3D
- *   2        110         0x3C
- *   3        104         0x3C
- *   4         98         0x3C
- *   5        110         0x3B
- *   6        104         0x3B
- *   7         98         0x3B
- *   8        110         0x3A
- *   9        104         0x3A
- *  10         98         0x3A
- *  11        110         0x39
- *  12        104         0x39
- *  13         98         0x39
- *  14        110         0x38
- *  15        104         0x38
- *  16         98         0x38
- *  17        110         0x37
- *  18        104         0x37
- *  19         98         0x37
- *  20        110         0x36
- *  21        104         0x36
- *  22         98         0x36
- *  23        110         0x35
- *  24        104         0x35
- *  25         98         0x35
- *  26        110         0x34
- *  27        104         0x34
- *  28         98         0x34
- *  29        110         0x33
- *  30        104         0x33
- *  31         98         0x33
- *  32        110         0x32
- *  33        104         0x32
- *  34         98         0x32
- *  35        110         0x31
- *  36        104         0x31
- *  37         98         0x31
- *  38        110         0x30
- *  39        104         0x30
- *  40         98         0x30
- *  41        110         0x25
- *  42        104         0x25
- *  43         98         0x25
- *  44        110         0x24
- *  45        104         0x24
- *  46         98         0x24
- *  47        110         0x23
- *  48        104         0x23
- *  49         98         0x23
- *  50        110         0x22
- *  51        104         0x18
- *  52         98         0x18
- *  53        110         0x17
- *  54        104         0x17
- *  55         98         0x17
- *  56        110         0x16
- *  57        104         0x16
- *  58         98         0x16
- *  59        110         0x15
- *  60        104         0x15
- *  61         98         0x15
- *  62        110         0x14
- *  63        104         0x14
- *  64         98         0x14
- *  65        110         0x13
- *  66        104         0x13
- *  67         98         0x13
- *  68        110         0x12
- *  69        104         0x08
- *  70         98         0x08
- *  71        110         0x07
- *  72        104         0x07
- *  73         98         0x07
- *  74        110         0x06
- *  75        104         0x06
- *  76         98         0x06
- *  77        110         0x05
- *  78        104         0x05
- *  79         98         0x05
- *  80        110         0x04
- *  81        104         0x04
- *  82         98         0x04
- *  83        110         0x03
- *  84        104         0x03
- *  85         98         0x03
- *  86        110         0x02
- *  87        104         0x02
- *  88         98         0x02
- *  89        110         0x01
- *  90        104         0x01
- *  91         98         0x01
- *  92        110         0x00
- *  93        104         0x00
- *  94         98         0x00
- *  95         93         0x00
- *  96         88         0x00
- *  97         83         0x00
- *  98         78         0x00
- */
-
-
-/**
- * Sanity checks and default values for EEPROM regulatory levels.
- * If EEPROM values fall outside MIN/MAX range, use default values.
- *
- * Regulatory limits refer to the maximum average txpower allowed by
- * regulatory agencies in the geographies in which the device is meant
- * to be operated.  These limits are SKU-specific (i.e. geography-specific),
- * and channel-specific; each channel has an individual regulatory limit
- * listed in the EEPROM.
- *
- * Units are in half-dBm (i.e. "34" means 17 dBm).
- */
-#define IWL_TX_POWER_DEFAULT_REGULATORY_24   (34)
-#define IWL_TX_POWER_DEFAULT_REGULATORY_52   (34)
-#define IWL_TX_POWER_REGULATORY_MIN          (0)
-#define IWL_TX_POWER_REGULATORY_MAX          (34)
-
-/**
- * Sanity checks and default values for EEPROM saturation levels.
- * If EEPROM values fall outside MIN/MAX range, use default values.
- *
- * Saturation is the highest level that the output power amplifier can produce
- * without significant clipping distortion.  This is a "peak" power level.
- * Different types of modulation (i.e. various "rates", and OFDM vs. CCK)
- * require differing amounts of backoff, relative to their average power output,
- * in order to avoid clipping distortion.
- *
- * Driver must make sure that it is violating neither the saturation limit,
- * nor the regulatory limit, when calculating Tx power settings for various
- * rates.
- *
- * Units are in half-dBm (i.e. "38" means 19 dBm).
- */
-#define IWL_TX_POWER_DEFAULT_SATURATION_24   (38)
-#define IWL_TX_POWER_DEFAULT_SATURATION_52   (38)
-#define IWL_TX_POWER_SATURATION_MIN          (20)
-#define IWL_TX_POWER_SATURATION_MAX          (50)
-
-/**
- * Channel groups used for Tx Attenuation calibration (MIMO tx channel balance)
- * and thermal Txpower calibration.
- *
- * When calculating txpower, driver must compensate for current device
- * temperature; higher temperature requires higher gain.  Driver must calculate
- * current temperature (see "4965 temperature calculation"), then compare vs.
- * factory calibration temperature in EEPROM; if current temperature is higher
- * than factory temperature, driver must *increase* gain by proportions shown
- * in table below.  If current temperature is lower than factory, driver must
- * *decrease* gain.
- *
- * Different frequency ranges require different compensation, as shown below.
- */
-/* Group 0, 5.2 GHz ch 34-43:  4.5 degrees per 1/2 dB. */
-#define CALIB_IWL_TX_ATTEN_GR1_FCH 34
-#define CALIB_IWL_TX_ATTEN_GR1_LCH 43
-
-/* Group 1, 5.3 GHz ch 44-70:  4.0 degrees per 1/2 dB. */
-#define CALIB_IWL_TX_ATTEN_GR2_FCH 44
-#define CALIB_IWL_TX_ATTEN_GR2_LCH 70
-
-/* Group 2, 5.5 GHz ch 71-124:  4.0 degrees per 1/2 dB. */
-#define CALIB_IWL_TX_ATTEN_GR3_FCH 71
-#define CALIB_IWL_TX_ATTEN_GR3_LCH 124
-
-/* Group 3, 5.7 GHz ch 125-200:  4.0 degrees per 1/2 dB. */
-#define CALIB_IWL_TX_ATTEN_GR4_FCH 125
-#define CALIB_IWL_TX_ATTEN_GR4_LCH 200
-
-/* Group 4, 2.4 GHz all channels:  3.5 degrees per 1/2 dB. */
-#define CALIB_IWL_TX_ATTEN_GR5_FCH 1
-#define CALIB_IWL_TX_ATTEN_GR5_LCH 20
-
-enum {
-        CALIB_CH_GROUP_1 = 0,
-        CALIB_CH_GROUP_2 = 1,
-        CALIB_CH_GROUP_3 = 2,
-        CALIB_CH_GROUP_4 = 3,
-        CALIB_CH_GROUP_5 = 4,
-        CALIB_CH_GROUP_MAX
-};
-
-/********************* END TXPOWER *****************************************/
-
-
-/**
- * Tx/Rx Queues
- *
- * Most communication between driver and 4965 is via queues of data buffers.
- * For example, all commands that the driver issues to device's embedded
- * controller (uCode) are via the command queue (one of the Tx queues).  All
- * uCode command responses/replies/notifications, including Rx frames, are
- * conveyed from uCode to driver via the Rx queue.
- *
- * Most support for these queues, including handshake support, resides in
- * structures in host DRAM, shared between the driver and the device.  When
- * allocating this memory, the driver must make sure that data written by
- * the host CPU updates DRAM immediately (and does not get "stuck" in CPU's
- * cache memory), so DRAM and cache are consistent, and the device can
- * immediately see changes made by the driver.
- *
- * 4965 supports up to 16 DRAM-based Tx queues, and services these queues via
- * up to 7 DMA channels (FIFOs).  Each Tx queue is supported by a circular array
- * in DRAM containing 256 Transmit Frame Descriptors (TFDs).
- */
-#define IWL49_NUM_FIFOS         7
-#define IWL49_CMD_FIFO_NUM      4
-#define IWL49_NUM_QUEUES        16
-#define IWL49_NUM_AMPDU_QUEUES  8
-
-
-/**
- * struct iwl4965_schedq_bc_tbl
- *
- * Byte Count table
- *
- * Each Tx queue uses a byte-count table containing 320 entries:
- * one 16-bit entry for each of 256 TFDs, plus an additional 64 entries that
- * duplicate the first 64 entries (to avoid wrap-around within a Tx window;
- * max Tx window is 64 TFDs).
- *
- * When driver sets up a new TFD, it must also enter the total byte count
- * of the frame to be transmitted into the corresponding entry in the byte
- * count table for the chosen Tx queue.  If the TFD index is 0-63, the driver
- * must duplicate the byte count entry in corresponding index 256-319.
- *
- * padding puts each byte count table on a 1024-byte boundary;
- * 4965 assumes tables are separated by 1024 bytes.
- */
-struct iwl4965_scd_bc_tbl {
-        __le16 tfd_offset[TFD_QUEUE_BC_SIZE];
-        u8 pad[1024 - (TFD_QUEUE_BC_SIZE) * sizeof(__le16)];
-} __packed;
-
-
-#define IWL4965_RTC_INST_LOWER_BOUND            (0x000000)
-
-/* RSSI to dBm */
-#define IWL4965_RSSI_OFFSET     44
-
-/* PCI registers */
-#define PCI_CFG_RETRY_TIMEOUT   0x041
-
-/* PCI register values */
-#define PCI_CFG_LINK_CTRL_VAL_L0S_EN    0x01
-#define PCI_CFG_LINK_CTRL_VAL_L1_EN     0x02
-
-#define IWL4965_DEFAULT_TX_RETRY  15
-
-/* EEPROM */
-#define IWL4965_FIRST_AMPDU_QUEUE       10
-
-
-#endif /* !__iwl_4965_hw_h__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-led.c b/drivers/net/wireless/iwlegacy/iwl-4965-led.c
deleted file mode 100644
index 6862fdcaee62..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-4965-led.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@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/init.h>
-#include <linux/pci.h>
-#include <linux/dma-mapping.h>
-#include <linux/delay.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <net/mac80211.h>
-#include <linux/etherdevice.h>
-#include <asm/unaligned.h>
-
-#include "iwl-commands.h"
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-io.h"
-#include "iwl-4965-led.h"
-
-/* Send led command */
-static int
-iwl4965_send_led_cmd(struct iwl_priv *priv, struct iwl_led_cmd *led_cmd)
-{
-        struct iwl_host_cmd cmd = {
-                .id = REPLY_LEDS_CMD,
-                .len = sizeof(struct iwl_led_cmd),
-                .data = led_cmd,
-                .flags = CMD_ASYNC,
-                .callback = NULL,
-        };
-        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_legacy_send_cmd(priv, &cmd);
-}
-
-/* Set led register off */
-void iwl4965_led_enable(struct iwl_priv *priv)
-{
-        iwl_write32(priv, CSR_LED_REG, CSR_LED_REG_TRUN_ON);
-}
-
-const struct iwl_led_ops iwl4965_led_ops = {
-        .cmd = iwl4965_send_led_cmd,
-};
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-led.h b/drivers/net/wireless/iwlegacy/iwl-4965-led.h
deleted file mode 100644
index 5ed3615fc338..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-4965-led.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-
-#ifndef __iwl_4965_led_h__
-#define __iwl_4965_led_h__
-
-extern const struct iwl_led_ops iwl4965_led_ops;
-void iwl4965_led_enable(struct iwl_priv *priv);
-
-#endif /* __iwl_4965_led_h__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c b/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
deleted file mode 100644
index 2be6d9e3b019..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
+++ /dev/null
@@ -1,1194 +0,0 @@
-/******************************************************************************
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-#include <linux/etherdevice.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-io.h"
-#include "iwl-helpers.h"
-#include "iwl-4965-hw.h"
-#include "iwl-4965.h"
-#include "iwl-sta.h"
-
-void iwl4965_check_abort_status(struct iwl_priv *priv,
-                            u8 frame_count, u32 status)
-{
-        if (frame_count == 1 && status == TX_STATUS_FAIL_RFKILL_FLUSH) {
-                IWL_ERR(priv, "Tx flush command to flush out all frames\n");
-                if (!test_bit(STATUS_EXIT_PENDING, &priv->status))
-                        queue_work(priv->workqueue, &priv->tx_flush);
-        }
-}
-
-/*
- * EEPROM
- */
-struct iwl_mod_params iwl4965_mod_params = {
-        .amsdu_size_8K = 1,
-        .restart_fw = 1,
-        /* the rest are 0 by default */
-};
-
-void iwl4965_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
-{
-        unsigned long flags;
-        int i;
-        spin_lock_irqsave(&rxq->lock, flags);
-        INIT_LIST_HEAD(&rxq->rx_free);
-        INIT_LIST_HEAD(&rxq->rx_used);
-        /* Fill the rx_used queue with _all_ of the Rx buffers */
-        for (i = 0; i < RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++) {
-                /* In the reset function, these buffers may have been allocated
-                 * to an SKB, so we need to unmap and free potential storage */
-                if (rxq->pool[i].page != NULL) {
-                        pci_unmap_page(priv->pci_dev, rxq->pool[i].page_dma,
-                                PAGE_SIZE << priv->hw_params.rx_page_order,
-                                PCI_DMA_FROMDEVICE);
-                        __iwl_legacy_free_pages(priv, rxq->pool[i].page);
-                        rxq->pool[i].page = NULL;
-                }
-                list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
-        }
-
-        for (i = 0; i < RX_QUEUE_SIZE; i++)
-                rxq->queue[i] = NULL;
-
-        /* Set us so that we have processed and used all buffers, but have
-         * not restocked the Rx queue with fresh buffers */
-        rxq->read = rxq->write = 0;
-        rxq->write_actual = 0;
-        rxq->free_count = 0;
-        spin_unlock_irqrestore(&rxq->lock, flags);
-}
-
-int iwl4965_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
-{
-        u32 rb_size;
-        const u32 rfdnlog = RX_QUEUE_SIZE_LOG; /* 256 RBDs */
-        u32 rb_timeout = 0;
-
-        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 */
-        iwl_legacy_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG, 0);
-
-        /* Reset driver's Rx queue write index */
-        iwl_legacy_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_WPTR_REG, 0);
-
-        /* Tell device where to find RBD circular buffer in DRAM */
-        iwl_legacy_write_direct32(priv, FH_RSCSR_CHNL0_RBDCB_BASE_REG,
-                           (u32)(rxq->bd_dma >> 8));
-
-        /* Tell device where in DRAM to update its Rx status */
-        iwl_legacy_write_direct32(priv, FH_RSCSR_CHNL0_STTS_WPTR_REG,
-                           rxq->rb_stts_dma >> 4);
-
-        /* Enable Rx DMA
-         * Direct rx interrupts to hosts
-         * Rx buffer size 4 or 8k
-         * RB timeout 0x10
-         * 256 RBDs
-         */
-        iwl_legacy_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 |
-                           FH_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME_MSK |
-                           rb_size|
-                           (rb_timeout << FH_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS)|
-                           (rfdnlog << FH_RCSR_RX_CONFIG_RBDCB_SIZE_POS));
-
-        /* Set interrupt coalescing timer to default (2048 usecs) */
-        iwl_write8(priv, CSR_INT_COALESCING, IWL_HOST_INT_TIMEOUT_DEF);
-
-        return 0;
-}
-
-static void iwl4965_set_pwr_vmain(struct iwl_priv *priv)
-{
-/*
- * (for documentation purposes)
- * to set power to V_AUX, do:
-
-                if (pci_pme_capable(priv->pci_dev, PCI_D3cold))
-                        iwl_legacy_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,
-                                               APMG_PS_CTRL_VAL_PWR_SRC_VAUX,
-                                               ~APMG_PS_CTRL_MSK_PWR_SRC);
- */
-
-        iwl_legacy_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,
-                               APMG_PS_CTRL_VAL_PWR_SRC_VMAIN,
-                               ~APMG_PS_CTRL_MSK_PWR_SRC);
-}
-
-int iwl4965_hw_nic_init(struct iwl_priv *priv)
-{
-        unsigned long flags;
-        struct iwl_rx_queue *rxq = &priv->rxq;
-        int ret;
-
-        /* nic_init */
-        spin_lock_irqsave(&priv->lock, flags);
-        priv->cfg->ops->lib->apm_ops.init(priv);
-
-        /* Set interrupt coalescing calibration timer to default (512 usecs) */
-        iwl_write8(priv, CSR_INT_COALESCING, IWL_HOST_INT_CALIB_TIMEOUT_DEF);
-
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        iwl4965_set_pwr_vmain(priv);
-
-        priv->cfg->ops->lib->apm_ops.config(priv);
-
-        /* Allocate the RX queue, or reset if it is already allocated */
-        if (!rxq->bd) {
-                ret = iwl_legacy_rx_queue_alloc(priv);
-                if (ret) {
-                        IWL_ERR(priv, "Unable to initialize Rx queue\n");
-                        return -ENOMEM;
-                }
-        } else
-                iwl4965_rx_queue_reset(priv, rxq);
-
-        iwl4965_rx_replenish(priv);
-
-        iwl4965_rx_init(priv, rxq);
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        rxq->need_update = 1;
-        iwl_legacy_rx_queue_update_write_ptr(priv, rxq);
-
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        /* Allocate or reset and init all Tx and Command queues */
-        if (!priv->txq) {
-                ret = iwl4965_txq_ctx_alloc(priv);
-                if (ret)
-                        return ret;
-        } else
-                iwl4965_txq_ctx_reset(priv);
-
-        set_bit(STATUS_INIT, &priv->status);
-
-        return 0;
-}
-
-/**
- * iwl4965_dma_addr2rbd_ptr - convert a DMA address to a uCode read buffer ptr
- */
-static inline __le32 iwl4965_dma_addr2rbd_ptr(struct iwl_priv *priv,
-                                          dma_addr_t dma_addr)
-{
-        return cpu_to_le32((u32)(dma_addr >> 8));
-}
-
-/**
- * iwl4965_rx_queue_restock - refill RX queue from pre-allocated pool
- *
- * If there are slots in the RX queue that need to be restocked,
- * and we have free pre-allocated buffers, fill the ranks as much
- * as we can, pulling from rx_free.
- *
- * This moves the 'write' index forward to catch up with 'processed', and
- * also updates the memory address in the firmware to reference the new
- * target buffer.
- */
-void iwl4965_rx_queue_restock(struct iwl_priv *priv)
-{
-        struct iwl_rx_queue *rxq = &priv->rxq;
-        struct list_head *element;
-        struct iwl_rx_mem_buffer *rxb;
-        unsigned long flags;
-
-        spin_lock_irqsave(&rxq->lock, flags);
-        while ((iwl_legacy_rx_queue_space(rxq) > 0) && (rxq->free_count)) {
-                /* The overwritten rxb must be a used one */
-                rxb = rxq->queue[rxq->write];
-                BUG_ON(rxb && rxb->page);
-
-                /* Get next free Rx buffer, remove from free list */
-                element = rxq->rx_free.next;
-                rxb = list_entry(element, struct iwl_rx_mem_buffer, list);
-                list_del(element);
-
-                /* Point to Rx buffer via next RBD in circular buffer */
-                rxq->bd[rxq->write] = iwl4965_dma_addr2rbd_ptr(priv,
-                                                              rxb->page_dma);
-                rxq->queue[rxq->write] = rxb;
-                rxq->write = (rxq->write + 1) & RX_QUEUE_MASK;
-                rxq->free_count--;
-        }
-        spin_unlock_irqrestore(&rxq->lock, flags);
-        /* If the pre-allocated buffer pool is dropping low, schedule to
-         * refill it */
-        if (rxq->free_count <= RX_LOW_WATERMARK)
-                queue_work(priv->workqueue, &priv->rx_replenish);
-
-
-        /* If we've added more space for the firmware to place data, tell it.
-         * Increment device's write pointer in multiples of 8. */
-        if (rxq->write_actual != (rxq->write & ~0x7)) {
-                spin_lock_irqsave(&rxq->lock, flags);
-                rxq->need_update = 1;
-                spin_unlock_irqrestore(&rxq->lock, flags);
-                iwl_legacy_rx_queue_update_write_ptr(priv, rxq);
-        }
-}
-
-/**
- * iwl4965_rx_replenish - Move all used packet from rx_used to rx_free
- *
- * When moving to rx_free an SKB is allocated for the slot.
- *
- * Also restock the Rx queue via iwl_rx_queue_restock.
- * This is called as a scheduled work item (except for during initialization)
- */
-static void iwl4965_rx_allocate(struct iwl_priv *priv, gfp_t priority)
-{
-        struct iwl_rx_queue *rxq = &priv->rxq;
-        struct list_head *element;
-        struct iwl_rx_mem_buffer *rxb;
-        struct page *page;
-        unsigned long flags;
-        gfp_t gfp_mask = priority;
-
-        while (1) {
-                spin_lock_irqsave(&rxq->lock, flags);
-                if (list_empty(&rxq->rx_used)) {
-                        spin_unlock_irqrestore(&rxq->lock, flags);
-                        return;
-                }
-                spin_unlock_irqrestore(&rxq->lock, flags);
-
-                if (rxq->free_count > RX_LOW_WATERMARK)
-                        gfp_mask |= __GFP_NOWARN;
-
-                if (priv->hw_params.rx_page_order > 0)
-                        gfp_mask |= __GFP_COMP;
-
-                /* Alloc a new receive buffer */
-                page = alloc_pages(gfp_mask, priv->hw_params.rx_page_order);
-                if (!page) {
-                        if (net_ratelimit())
-                                IWL_DEBUG_INFO(priv, "alloc_pages failed, "
-                                               "order: %d\n",
-                                               priv->hw_params.rx_page_order);
-
-                        if ((rxq->free_count <= RX_LOW_WATERMARK) &&
-                            net_ratelimit())
-                                IWL_CRIT(priv,
-                                        "Failed to alloc_pages with %s. "
-                                        "Only %u free buffers remaining.\n",
-                                         priority == GFP_ATOMIC ?
-                                                 "GFP_ATOMIC" : "GFP_KERNEL",
-                                         rxq->free_count);
-                        /* We don't reschedule replenish work here -- we will
-                         * call the restock method and if it still needs
-                         * more buffers it will schedule replenish */
-                        return;
-                }
-
-                spin_lock_irqsave(&rxq->lock, flags);
-
-                if (list_empty(&rxq->rx_used)) {
-                        spin_unlock_irqrestore(&rxq->lock, flags);
-                        __free_pages(page, priv->hw_params.rx_page_order);
-                        return;
-                }
-                element = rxq->rx_used.next;
-                rxb = list_entry(element, struct iwl_rx_mem_buffer, list);
-                list_del(element);
-
-                spin_unlock_irqrestore(&rxq->lock, flags);
-
-                BUG_ON(rxb->page);
-                rxb->page = page;
-                /* Get physical address of the RB */
-                rxb->page_dma = pci_map_page(priv->pci_dev, page, 0,
-                                PAGE_SIZE << priv->hw_params.rx_page_order,
-                                PCI_DMA_FROMDEVICE);
-                /* dma address must be no more than 36 bits */
-                BUG_ON(rxb->page_dma & ~DMA_BIT_MASK(36));
-                /* and also 256 byte aligned! */
-                BUG_ON(rxb->page_dma & DMA_BIT_MASK(8));
-
-                spin_lock_irqsave(&rxq->lock, flags);
-
-                list_add_tail(&rxb->list, &rxq->rx_free);
-                rxq->free_count++;
-                priv->alloc_rxb_page++;
-
-                spin_unlock_irqrestore(&rxq->lock, flags);
-        }
-}
-
-void iwl4965_rx_replenish(struct iwl_priv *priv)
-{
-        unsigned long flags;
-
-        iwl4965_rx_allocate(priv, GFP_KERNEL);
-
-        spin_lock_irqsave(&priv->lock, flags);
-        iwl4965_rx_queue_restock(priv);
-        spin_unlock_irqrestore(&priv->lock, flags);
-}
-
-void iwl4965_rx_replenish_now(struct iwl_priv *priv)
-{
-        iwl4965_rx_allocate(priv, GFP_ATOMIC);
-
-        iwl4965_rx_queue_restock(priv);
-}
-
-/* Assumes that the skb field of the buffers in 'pool' is kept accurate.
- * If an SKB has been detached, the POOL needs to have its SKB set to NULL
- * This free routine walks the list of POOL entries and if SKB is set to
- * non NULL it is unmapped and freed
- */
-void iwl4965_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
-{
-        int i;
-        for (i = 0; i < RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {
-                if (rxq->pool[i].page != NULL) {
-                        pci_unmap_page(priv->pci_dev, rxq->pool[i].page_dma,
-                                PAGE_SIZE << priv->hw_params.rx_page_order,
-                                PCI_DMA_FROMDEVICE);
-                        __iwl_legacy_free_pages(priv, rxq->pool[i].page);
-                        rxq->pool[i].page = NULL;
-                }
-        }
-
-        dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,
-                          rxq->bd_dma);
-        dma_free_coherent(&priv->pci_dev->dev, sizeof(struct iwl_rb_status),
-                          rxq->rb_stts, rxq->rb_stts_dma);
-        rxq->bd = NULL;
-        rxq->rb_stts  = NULL;
-}
-
-int iwl4965_rxq_stop(struct iwl_priv *priv)
-{
-
-        /* stop Rx DMA */
-        iwl_legacy_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG, 0);
-        iwl_poll_direct_bit(priv, FH_MEM_RSSR_RX_STATUS_REG,
-                            FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000);
-
-        return 0;
-}
-
-int iwl4965_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band)
-{
-        int idx = 0;
-        int band_offset = 0;
-
-        /* HT rate format: mac80211 wants an MCS number, which is just LSB */
-        if (rate_n_flags & RATE_MCS_HT_MSK) {
-                idx = (rate_n_flags & 0xff);
-                return idx;
-        /* Legacy rate format, search for match in table */
-        } else {
-                if (band == IEEE80211_BAND_5GHZ)
-                        band_offset = IWL_FIRST_OFDM_RATE;
-                for (idx = band_offset; idx < IWL_RATE_COUNT_LEGACY; idx++)
-                        if (iwlegacy_rates[idx].plcp == (rate_n_flags & 0xFF))
-                                return idx - band_offset;
-        }
-
-        return -1;
-}
-
-static int iwl4965_calc_rssi(struct iwl_priv *priv,
-                             struct iwl_rx_phy_res *rx_resp)
-{
-        /* data from PHY/DSP regarding signal strength, etc.,
-         *   contents are always there, not configurable by host.  */
-        struct iwl4965_rx_non_cfg_phy *ncphy =
-            (struct iwl4965_rx_non_cfg_phy *)rx_resp->non_cfg_phy_buf;
-        u32 agc = (le16_to_cpu(ncphy->agc_info) & IWL49_AGC_DB_MASK)
-                        >> IWL49_AGC_DB_POS;
-
-        u32 valid_antennae =
-            (le16_to_cpu(rx_resp->phy_flags) & IWL49_RX_PHY_FLAGS_ANTENNAE_MASK)
-                        >> IWL49_RX_PHY_FLAGS_ANTENNAE_OFFSET;
-        u8 max_rssi = 0;
-        u32 i;
-
-        /* Find max rssi among 3 possible receivers.
-         * These values are measured by the digital signal processor (DSP).
-         * They should stay fairly constant even as the signal strength varies,
-         *   if the radio's automatic gain control (AGC) is working right.
-         * AGC value (see below) will provide the "interesting" info. */
-        for (i = 0; i < 3; i++)
-                if (valid_antennae & (1 << i))
-                        max_rssi = max(ncphy->rssi_info[i << 1], max_rssi);
-
-        IWL_DEBUG_STATS(priv, "Rssi In A %d B %d C %d Max %d AGC dB %d\n",
-                ncphy->rssi_info[0], ncphy->rssi_info[2], ncphy->rssi_info[4],
-                max_rssi, agc);
-
-        /* dBm = max_rssi dB - agc dB - constant.
-         * Higher AGC (higher radio gain) means lower signal. */
-        return max_rssi - agc - IWL4965_RSSI_OFFSET;
-}
-
-
-static u32 iwl4965_translate_rx_status(struct iwl_priv *priv, 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(priv, "decrypt_in:0x%x  decrypt_out = 0x%x\n",
-                                        decrypt_in, decrypt_out);
-
-        return decrypt_out;
-}
-
-static void iwl4965_pass_packet_to_mac80211(struct iwl_priv *priv,
-                                        struct ieee80211_hdr *hdr,
-                                        u16 len,
-                                        u32 ampdu_status,
-                                        struct iwl_rx_mem_buffer *rxb,
-                                        struct ieee80211_rx_status *stats)
-{
-        struct sk_buff *skb;
-        __le16 fc = hdr->frame_control;
-
-        /* We only process data packets if the interface is open */
-        if (unlikely(!priv->is_open)) {
-                IWL_DEBUG_DROP_LIMIT(priv,
-                    "Dropping packet while interface is not open.\n");
-                return;
-        }
-
-        /* In case of HW accelerated crypto and bad decryption, drop */
-        if (!priv->cfg->mod_params->sw_crypto &&
-            iwl_legacy_set_decrypted_flag(priv, hdr, ampdu_status, stats))
-                return;
-
-        skb = dev_alloc_skb(128);
-        if (!skb) {
-                IWL_ERR(priv, "dev_alloc_skb failed\n");
-                return;
-        }
-
-        skb_add_rx_frag(skb, 0, rxb->page, (void *)hdr - rxb_addr(rxb), len);
-
-        iwl_legacy_update_stats(priv, false, fc, len);
-        memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats));
-
-        ieee80211_rx(priv->hw, skb);
-        priv->alloc_rxb_page--;
-        rxb->page = NULL;
-}
-
-/* Called for REPLY_RX (legacy ABG frames), or
- * REPLY_RX_MPDU_CMD (HT high-throughput N frames). */
-void iwl4965_rx_reply_rx(struct iwl_priv *priv,
-                                struct iwl_rx_mem_buffer *rxb)
-{
-        struct ieee80211_hdr *header;
-        struct ieee80211_rx_status rx_status;
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_rx_phy_res *phy_res;
-        __le32 rx_pkt_status;
-        struct iwl_rx_mpdu_res_start *amsdu;
-        u32 len;
-        u32 ampdu_status;
-        u32 rate_n_flags;
-
-        /**
-         * REPLY_RX and REPLY_RX_MPDU_CMD are handled differently.
-         *      REPLY_RX: physical layer info is in this buffer
-         *      REPLY_RX_MPDU_CMD: physical layer info was sent in separate
-         *              command and cached in priv->last_phy_res
-         *
-         * Here we set up local variables depending on which command is
-         * received.
-         */
-        if (pkt->hdr.cmd == REPLY_RX) {
-                phy_res = (struct iwl_rx_phy_res *)pkt->u.raw;
-                header = (struct ieee80211_hdr *)(pkt->u.raw + sizeof(*phy_res)
-                                + phy_res->cfg_phy_cnt);
-
-                len = le16_to_cpu(phy_res->byte_count);
-                rx_pkt_status = *(__le32 *)(pkt->u.raw + sizeof(*phy_res) +
-                                phy_res->cfg_phy_cnt + len);
-                ampdu_status = le32_to_cpu(rx_pkt_status);
-        } else {
-                if (!priv->_4965.last_phy_res_valid) {
-                        IWL_ERR(priv, "MPDU frame without cached PHY data\n");
-                        return;
-                }
-                phy_res = &priv->_4965.last_phy_res;
-                amsdu = (struct iwl_rx_mpdu_res_start *)pkt->u.raw;
-                header = (struct ieee80211_hdr *)(pkt->u.raw + sizeof(*amsdu));
-                len = le16_to_cpu(amsdu->byte_count);
-                rx_pkt_status = *(__le32 *)(pkt->u.raw + sizeof(*amsdu) + len);
-                ampdu_status = iwl4965_translate_rx_status(priv,
-                                le32_to_cpu(rx_pkt_status));
-        }
-
-        if ((unlikely(phy_res->cfg_phy_cnt > 20))) {
-                IWL_DEBUG_DROP(priv, "dsp size out of range [0,20]: %d/n",
-                                phy_res->cfg_phy_cnt);
-                return;
-        }
-
-        if (!(rx_pkt_status & RX_RES_STATUS_NO_CRC32_ERROR) ||
-            !(rx_pkt_status & RX_RES_STATUS_NO_RXE_OVERFLOW)) {
-                IWL_DEBUG_RX(priv, "Bad CRC or FIFO: 0x%08X.\n",
-                                le32_to_cpu(rx_pkt_status));
-                return;
-        }
-
-        /* This will be used in several places later */
-        rate_n_flags = le32_to_cpu(phy_res->rate_n_flags);
-
-        /* rx_status carries information about the packet to mac80211 */
-        rx_status.mactime = le64_to_cpu(phy_res->timestamp);
-        rx_status.band = (phy_res->phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK) ?
-                                IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
-        rx_status.freq =
-                ieee80211_channel_to_frequency(le16_to_cpu(phy_res->channel),
-                                                        rx_status.band);
-        rx_status.rate_idx =
-                iwl4965_hwrate_to_mac80211_idx(rate_n_flags, rx_status.band);
-        rx_status.flag = 0;
-
-        /* TSF isn't reliable. In order to allow smooth user experience,
-         * this W/A doesn't propagate it to the mac80211 */
-        /*rx_status.flag |= RX_FLAG_MACTIME_MPDU;*/
-
-        priv->ucode_beacon_time = le32_to_cpu(phy_res->beacon_time_stamp);
-
-        /* Find max signal strength (dBm) among 3 antenna/receiver chains */
-        rx_status.signal = iwl4965_calc_rssi(priv, phy_res);
-
-        iwl_legacy_dbg_log_rx_data_frame(priv, len, header);
-        IWL_DEBUG_STATS_LIMIT(priv, "Rssi %d, TSF %llu\n",
-                rx_status.signal, (unsigned long long)rx_status.mactime);
-
-        /*
-         * "antenna number"
-         *
-         * It seems that the antenna field in the phy flags value
-         * is actually a bit field. This is undefined by radiotap,
-         * it wants an actual antenna number but I always get "7"
-         * for most legacy frames I receive indicating that the
-         * same frame was received on all three RX chains.
-         *
-         * I think this field should be removed in favor of a
-         * new 802.11n radiotap field "RX chains" that is defined
-         * as a bitmask.
-         */
-        rx_status.antenna =
-                (le16_to_cpu(phy_res->phy_flags) & RX_RES_PHY_FLAGS_ANTENNA_MSK)
-                >> RX_RES_PHY_FLAGS_ANTENNA_POS;
-
-        /* set the preamble flag if appropriate */
-        if (phy_res->phy_flags & RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)
-                rx_status.flag |= RX_FLAG_SHORTPRE;
-
-        /* Set up the HT phy flags */
-        if (rate_n_flags & RATE_MCS_HT_MSK)
-                rx_status.flag |= RX_FLAG_HT;
-        if (rate_n_flags & RATE_MCS_HT40_MSK)
-                rx_status.flag |= RX_FLAG_40MHZ;
-        if (rate_n_flags & RATE_MCS_SGI_MSK)
-                rx_status.flag |= RX_FLAG_SHORT_GI;
-
-        iwl4965_pass_packet_to_mac80211(priv, header, len, ampdu_status,
-                                    rxb, &rx_status);
-}
-
-/* Cache phy data (Rx signal strength, etc) for HT frame (REPLY_RX_PHY_CMD).
- * This will be used later in iwl_rx_reply_rx() for REPLY_RX_MPDU_CMD. */
-void iwl4965_rx_reply_rx_phy(struct iwl_priv *priv,
-                            struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        priv->_4965.last_phy_res_valid = true;
-        memcpy(&priv->_4965.last_phy_res, pkt->u.raw,
-               sizeof(struct iwl_rx_phy_res));
-}
-
-static int iwl4965_get_channels_for_scan(struct iwl_priv *priv,
-                                     struct ieee80211_vif *vif,
-                                     enum ieee80211_band band,
-                                     u8 is_active, u8 n_probes,
-                                     struct iwl_scan_channel *scan_ch)
-{
-        struct ieee80211_channel *chan;
-        const struct ieee80211_supported_band *sband;
-        const struct iwl_channel_info *ch_info;
-        u16 passive_dwell = 0;
-        u16 active_dwell = 0;
-        int added, i;
-        u16 channel;
-
-        sband = iwl_get_hw_mode(priv, band);
-        if (!sband)
-                return 0;
-
-        active_dwell = iwl_legacy_get_active_dwell_time(priv, band, n_probes);
-        passive_dwell = iwl_legacy_get_passive_dwell_time(priv, band, vif);
-
-        if (passive_dwell <= active_dwell)
-                passive_dwell = active_dwell + 1;
-
-        for (i = 0, added = 0; i < priv->scan_request->n_channels; i++) {
-                chan = priv->scan_request->channels[i];
-
-                if (chan->band != band)
-                        continue;
-
-                channel = chan->hw_value;
-                scan_ch->channel = cpu_to_le16(channel);
-
-                ch_info = iwl_legacy_get_channel_info(priv, band, channel);
-                if (!iwl_legacy_is_channel_valid(ch_info)) {
-                        IWL_DEBUG_SCAN(priv,
-                                 "Channel %d is INVALID for this band.\n",
-                                        channel);
-                        continue;
-                }
-
-                if (!is_active || iwl_legacy_is_channel_passive(ch_info) ||
-                    (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))
-                        scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
-                else
-                        scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
-
-                if (n_probes)
-                        scan_ch->type |= IWL_SCAN_PROBE_MASK(n_probes);
-
-                scan_ch->active_dwell = cpu_to_le16(active_dwell);
-                scan_ch->passive_dwell = cpu_to_le16(passive_dwell);
-
-                /* Set txpower levels to defaults */
-                scan_ch->dsp_atten = 110;
-
-                /* NOTE: if we were doing 6Mb OFDM for scans we'd use
-                 * power level:
-                 * scan_ch->tx_gain = ((1 << 5) | (2 << 3)) | 3;
-                 */
-                if (band == IEEE80211_BAND_5GHZ)
-                        scan_ch->tx_gain = ((1 << 5) | (3 << 3)) | 3;
-                else
-                        scan_ch->tx_gain = ((1 << 5) | (5 << 3));
-
-                IWL_DEBUG_SCAN(priv, "Scanning ch=%d prob=0x%X [%s %d]\n",
-                               channel, le32_to_cpu(scan_ch->type),
-                               (scan_ch->type & SCAN_CHANNEL_TYPE_ACTIVE) ?
-                                "ACTIVE" : "PASSIVE",
-                               (scan_ch->type & SCAN_CHANNEL_TYPE_ACTIVE) ?
-                               active_dwell : passive_dwell);
-
-                scan_ch++;
-                added++;
-        }
-
-        IWL_DEBUG_SCAN(priv, "total channels to scan %d\n", added);
-        return added;
-}
-
-int iwl4965_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
-{
-        struct iwl_host_cmd cmd = {
-                .id = REPLY_SCAN_CMD,
-                .len = sizeof(struct iwl_scan_cmd),
-                .flags = CMD_SIZE_HUGE,
-        };
-        struct iwl_scan_cmd *scan;
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        u32 rate_flags = 0;
-        u16 cmd_len;
-        u16 rx_chain = 0;
-        enum ieee80211_band band;
-        u8 n_probes = 0;
-        u8 rx_ant = priv->hw_params.valid_rx_ant;
-        u8 rate;
-        bool is_active = false;
-        int  chan_mod;
-        u8 active_chains;
-        u8 scan_tx_antennas = priv->hw_params.valid_tx_ant;
-        int ret;
-
-        lockdep_assert_held(&priv->mutex);
-
-        if (vif)
-                ctx = iwl_legacy_rxon_ctx_from_vif(vif);
-
-        if (!priv->scan_cmd) {
-                priv->scan_cmd = kmalloc(sizeof(struct iwl_scan_cmd) +
-                                         IWL_MAX_SCAN_SIZE, GFP_KERNEL);
-                if (!priv->scan_cmd) {
-                        IWL_DEBUG_SCAN(priv,
-                                       "fail to allocate memory for scan\n");
-                        return -ENOMEM;
-                }
-        }
-        scan = priv->scan_cmd;
-        memset(scan, 0, sizeof(struct iwl_scan_cmd) + IWL_MAX_SCAN_SIZE);
-
-        scan->quiet_plcp_th = IWL_PLCP_QUIET_THRESH;
-        scan->quiet_time = IWL_ACTIVE_QUIET_TIME;
-
-        if (iwl_legacy_is_any_associated(priv)) {
-                u16 interval;
-                u32 extra;
-                u32 suspend_time = 100;
-                u32 scan_suspend_time = 100;
-
-                IWL_DEBUG_INFO(priv, "Scanning while associated...\n");
-                interval = vif->bss_conf.beacon_int;
-
-                scan->suspend_time = 0;
-                scan->max_out_time = cpu_to_le32(200 * 1024);
-                if (!interval)
-                        interval = suspend_time;
-
-                extra = (suspend_time / interval) << 22;
-                scan_suspend_time = (extra |
-                    ((suspend_time % interval) * 1024));
-                scan->suspend_time = cpu_to_le32(scan_suspend_time);
-                IWL_DEBUG_SCAN(priv, "suspend_time 0x%X beacon interval %d\n",
-                               scan_suspend_time, interval);
-        }
-
-        if (priv->scan_request->n_ssids) {
-                int i, p = 0;
-                IWL_DEBUG_SCAN(priv, "Kicking off active scan\n");
-                for (i = 0; i < priv->scan_request->n_ssids; i++) {
-                        /* always does wildcard anyway */
-                        if (!priv->scan_request->ssids[i].ssid_len)
-                                continue;
-                        scan->direct_scan[p].id = WLAN_EID_SSID;
-                        scan->direct_scan[p].len =
-                                priv->scan_request->ssids[i].ssid_len;
-                        memcpy(scan->direct_scan[p].ssid,
-                               priv->scan_request->ssids[i].ssid,
-                               priv->scan_request->ssids[i].ssid_len);
-                        n_probes++;
-                        p++;
-                }
-                is_active = true;
-        } else
-                IWL_DEBUG_SCAN(priv, "Start passive scan.\n");
-
-        scan->tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK;
-        scan->tx_cmd.sta_id = ctx->bcast_sta_id;
-        scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
-
-        switch (priv->scan_band) {
-        case IEEE80211_BAND_2GHZ:
-                scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK;
-                chan_mod = le32_to_cpu(
-                        priv->contexts[IWL_RXON_CTX_BSS].active.flags &
-                                                RXON_FLG_CHANNEL_MODE_MSK)
-                                       >> RXON_FLG_CHANNEL_MODE_POS;
-                if (chan_mod == CHANNEL_MODE_PURE_40) {
-                        rate = IWL_RATE_6M_PLCP;
-                } else {
-                        rate = IWL_RATE_1M_PLCP;
-                        rate_flags = RATE_MCS_CCK_MSK;
-                }
-                break;
-        case IEEE80211_BAND_5GHZ:
-                rate = IWL_RATE_6M_PLCP;
-                break;
-        default:
-                IWL_WARN(priv, "Invalid scan band\n");
-                return -EIO;
-        }
-
-        /*
-         * If active scanning is requested but a certain channel is
-         * marked passive, we can do active scanning if we detect
-         * transmissions.
-         *
-         * There is an issue with some firmware versions that triggers
-         * a sysassert on a "good CRC threshold" of zero (== disabled),
-         * on a radar channel even though this means that we should NOT
-         * send probes.
-         *
-         * The "good CRC threshold" is the number of frames that we
-         * need to receive during our dwell time on a channel before
-         * sending out probes -- setting this to a huge value will
-         * mean we never reach it, but at the same time work around
-         * the aforementioned issue. Thus use IWL_GOOD_CRC_TH_NEVER
-         * here instead of IWL_GOOD_CRC_TH_DISABLED.
-         */
-        scan->good_CRC_th = is_active ? IWL_GOOD_CRC_TH_DEFAULT :
-                                        IWL_GOOD_CRC_TH_NEVER;
-
-        band = priv->scan_band;
-
-        if (priv->cfg->scan_rx_antennas[band])
-                rx_ant = priv->cfg->scan_rx_antennas[band];
-
-        priv->scan_tx_ant[band] = iwl4965_toggle_tx_ant(priv,
-                                                priv->scan_tx_ant[band],
-                                                    scan_tx_antennas);
-        rate_flags |= iwl4965_ant_idx_to_flags(priv->scan_tx_ant[band]);
-        scan->tx_cmd.rate_n_flags = iwl4965_hw_set_rate_n_flags(rate, rate_flags);
-
-        /* In power save mode use one chain, otherwise use all chains */
-        if (test_bit(STATUS_POWER_PMI, &priv->status)) {
-                /* rx_ant has been set to all valid chains previously */
-                active_chains = rx_ant &
-                                ((u8)(priv->chain_noise_data.active_chains));
-                if (!active_chains)
-                        active_chains = rx_ant;
-
-                IWL_DEBUG_SCAN(priv, "chain_noise_data.active_chains: %u\n",
-                                priv->chain_noise_data.active_chains);
-
-                rx_ant = iwl4965_first_antenna(active_chains);
-        }
-
-        /* MIMO is not used here, but value is required */
-        rx_chain |= priv->hw_params.valid_rx_ant << RXON_RX_CHAIN_VALID_POS;
-        rx_chain |= rx_ant << RXON_RX_CHAIN_FORCE_MIMO_SEL_POS;
-        rx_chain |= rx_ant << RXON_RX_CHAIN_FORCE_SEL_POS;
-        rx_chain |= 0x1 << RXON_RX_CHAIN_DRIVER_FORCE_POS;
-        scan->rx_chain = cpu_to_le16(rx_chain);
-
-        cmd_len = iwl_legacy_fill_probe_req(priv,
-                                        (struct ieee80211_mgmt *)scan->data,
-                                        vif->addr,
-                                        priv->scan_request->ie,
-                                        priv->scan_request->ie_len,
-                                        IWL_MAX_SCAN_SIZE - sizeof(*scan));
-        scan->tx_cmd.len = cpu_to_le16(cmd_len);
-
-        scan->filter_flags |= (RXON_FILTER_ACCEPT_GRP_MSK |
-                               RXON_FILTER_BCON_AWARE_MSK);
-
-        scan->channel_count = iwl4965_get_channels_for_scan(priv, vif, band,
-                                                is_active, n_probes,
-                                                (void *)&scan->data[cmd_len]);
-        if (scan->channel_count == 0) {
-                IWL_DEBUG_SCAN(priv, "channel count %d\n", scan->channel_count);
-                return -EIO;
-        }
-
-        cmd.len += le16_to_cpu(scan->tx_cmd.len) +
-            scan->channel_count * sizeof(struct iwl_scan_channel);
-        cmd.data = scan;
-        scan->len = cpu_to_le16(cmd.len);
-
-        set_bit(STATUS_SCAN_HW, &priv->status);
-
-        ret = iwl_legacy_send_cmd_sync(priv, &cmd);
-        if (ret)
-                clear_bit(STATUS_SCAN_HW, &priv->status);
-
-        return ret;
-}
-
-int iwl4965_manage_ibss_station(struct iwl_priv *priv,
-                               struct ieee80211_vif *vif, bool add)
-{
-        struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
-
-        if (add)
-                return iwl4965_add_bssid_station(priv, vif_priv->ctx,
-                                                vif->bss_conf.bssid,
-                                                &vif_priv->ibss_bssid_sta_id);
-        return iwl_legacy_remove_station(priv, vif_priv->ibss_bssid_sta_id,
-                                  vif->bss_conf.bssid);
-}
-
-void iwl4965_free_tfds_in_queue(struct iwl_priv *priv,
-                            int sta_id, int tid, int freed)
-{
-        lockdep_assert_held(&priv->sta_lock);
-
-        if (priv->stations[sta_id].tid[tid].tfds_in_queue >= freed)
-                priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;
-        else {
-                IWL_DEBUG_TX(priv, "free more than tfds_in_queue (%u:%d)\n",
-                        priv->stations[sta_id].tid[tid].tfds_in_queue,
-                        freed);
-                priv->stations[sta_id].tid[tid].tfds_in_queue = 0;
-        }
-}
-
-#define IWL_TX_QUEUE_MSK        0xfffff
-
-static bool iwl4965_is_single_rx_stream(struct iwl_priv *priv)
-{
-        return priv->current_ht_config.smps == IEEE80211_SMPS_STATIC ||
-               priv->current_ht_config.single_chain_sufficient;
-}
-
-#define IWL_NUM_RX_CHAINS_MULTIPLE      3
-#define IWL_NUM_RX_CHAINS_SINGLE        2
-#define IWL_NUM_IDLE_CHAINS_DUAL        2
-#define IWL_NUM_IDLE_CHAINS_SINGLE      1
-
-/*
- * Determine how many receiver/antenna chains to use.
- *
- * More provides better reception via diversity.  Fewer saves power
- * at the expense of throughput, but only when not in powersave to
- * start with.
- *
- * 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_active_rx_chain_count(struct iwl_priv *priv)
-{
-        /* # of Rx chains to use when expecting MIMO. */
-        if (iwl4965_is_single_rx_stream(priv))
-                return IWL_NUM_RX_CHAINS_SINGLE;
-        else
-                return IWL_NUM_RX_CHAINS_MULTIPLE;
-}
-
-/*
- * When we are in power saving mode, unless device support spatial
- * multiplexing power save, use the active count for rx chain count.
- */
-static int
-iwl4965_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt)
-{
-        /* # Rx chains when idling, depending on SMPS mode */
-        switch (priv->current_ht_config.smps) {
-        case IEEE80211_SMPS_STATIC:
-        case IEEE80211_SMPS_DYNAMIC:
-                return IWL_NUM_IDLE_CHAINS_SINGLE;
-        case IEEE80211_SMPS_OFF:
-                return active_cnt;
-        default:
-                WARN(1, "invalid SMPS mode %d",
-                     priv->current_ht_config.smps);
-                return active_cnt;
-        }
-}
-
-/* up to 4 chains */
-static u8 iwl4965_count_chain_bitmap(u32 chain_bitmap)
-{
-        u8 res;
-        res = (chain_bitmap & BIT(0)) >> 0;
-        res += (chain_bitmap & BIT(1)) >> 1;
-        res += (chain_bitmap & BIT(2)) >> 2;
-        res += (chain_bitmap & BIT(3)) >> 3;
-        return res;
-}
-
-/**
- * iwl4965_set_rxon_chain - Set up Rx chain usage in "staging" RXON image
- *
- * 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 iwl_priv *priv, struct iwl_rxon_context *ctx)
-{
-        bool is_single = iwl4965_is_single_rx_stream(priv);
-        bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->status);
-        u8 idle_rx_cnt, active_rx_cnt, valid_rx_cnt;
-        u32 active_chains;
-        u16 rx_chain;
-
-        /* Tell uCode which antennas are actually connected.
-         * Before first association, we assume all antennas are connected.
-         * Just after first association, iwl4965_chain_noise_calibration()
-         *    checks which antennas actually *are* connected. */
-        if (priv->chain_noise_data.active_chains)
-                active_chains = priv->chain_noise_data.active_chains;
-        else
-                active_chains = priv->hw_params.valid_rx_ant;
-
-        rx_chain = active_chains << RXON_RX_CHAIN_VALID_POS;
-
-        /* How many receivers should we use? */
-        active_rx_cnt = iwl4965_get_active_rx_chain_count(priv);
-        idle_rx_cnt = iwl4965_get_idle_rx_chain_count(priv, active_rx_cnt);
-
-
-        /* correct rx chain count according hw settings
-         * and chain noise calibration
-         */
-        valid_rx_cnt = iwl4965_count_chain_bitmap(active_chains);
-        if (valid_rx_cnt < active_rx_cnt)
-                active_rx_cnt = valid_rx_cnt;
-
-        if (valid_rx_cnt < idle_rx_cnt)
-                idle_rx_cnt = valid_rx_cnt;
-
-        rx_chain |= active_rx_cnt << RXON_RX_CHAIN_MIMO_CNT_POS;
-        rx_chain |= idle_rx_cnt  << RXON_RX_CHAIN_CNT_POS;
-
-        ctx->staging.rx_chain = cpu_to_le16(rx_chain);
-
-        if (!is_single && (active_rx_cnt >= IWL_NUM_RX_CHAINS_SINGLE) && is_cam)
-                ctx->staging.rx_chain |= RXON_RX_CHAIN_MIMO_FORCE_MSK;
-        else
-                ctx->staging.rx_chain &= ~RXON_RX_CHAIN_MIMO_FORCE_MSK;
-
-        IWL_DEBUG_ASSOC(priv, "rx_chain=0x%X active=%d idle=%d\n",
-                        ctx->staging.rx_chain,
-                        active_rx_cnt, idle_rx_cnt);
-
-        WARN_ON(active_rx_cnt == 0 || idle_rx_cnt == 0 ||
-                active_rx_cnt < idle_rx_cnt);
-}
-
-u8 iwl4965_toggle_tx_ant(struct iwl_priv *priv, u8 ant, u8 valid)
-{
-        int i;
-        u8 ind = ant;
-
-        for (i = 0; i < RATE_ANT_NUM - 1; i++) {
-                ind = (ind + 1) < RATE_ANT_NUM ?  ind + 1 : 0;
-                if (valid & BIT(ind))
-                        return ind;
-        }
-        return ant;
-}
-
-static const char *iwl4965_get_fh_string(int cmd)
-{
-        switch (cmd) {
-        IWL_CMD(FH_RSCSR_CHNL0_STTS_WPTR_REG);
-        IWL_CMD(FH_RSCSR_CHNL0_RBDCB_BASE_REG);
-        IWL_CMD(FH_RSCSR_CHNL0_WPTR);
-        IWL_CMD(FH_MEM_RCSR_CHNL0_CONFIG_REG);
-        IWL_CMD(FH_MEM_RSSR_SHARED_CTRL_REG);
-        IWL_CMD(FH_MEM_RSSR_RX_STATUS_REG);
-        IWL_CMD(FH_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV);
-        IWL_CMD(FH_TSSR_TX_STATUS_REG);
-        IWL_CMD(FH_TSSR_TX_ERROR_REG);
-        default:
-                return "UNKNOWN";
-        }
-}
-
-int iwl4965_dump_fh(struct iwl_priv *priv, char **buf, bool display)
-{
-        int i;
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        int pos = 0;
-        size_t bufsz = 0;
-#endif
-        static const u32 fh_tbl[] = {
-                FH_RSCSR_CHNL0_STTS_WPTR_REG,
-                FH_RSCSR_CHNL0_RBDCB_BASE_REG,
-                FH_RSCSR_CHNL0_WPTR,
-                FH_MEM_RCSR_CHNL0_CONFIG_REG,
-                FH_MEM_RSSR_SHARED_CTRL_REG,
-                FH_MEM_RSSR_RX_STATUS_REG,
-                FH_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV,
-                FH_TSSR_TX_STATUS_REG,
-                FH_TSSR_TX_ERROR_REG
-        };
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        if (display) {
-                bufsz = ARRAY_SIZE(fh_tbl) * 48 + 40;
-                *buf = kmalloc(bufsz, GFP_KERNEL);
-                if (!*buf)
-                        return -ENOMEM;
-                pos += scnprintf(*buf + pos, bufsz - pos,
-                                "FH register values:\n");
-                for (i = 0; i < ARRAY_SIZE(fh_tbl); i++) {
-                        pos += scnprintf(*buf + pos, bufsz - pos,
-                                "  %34s: 0X%08x\n",
-                                iwl4965_get_fh_string(fh_tbl[i]),
-                                iwl_legacy_read_direct32(priv, fh_tbl[i]));
-                }
-                return pos;
-        }
-#endif
-        IWL_ERR(priv, "FH register values:\n");
-        for (i = 0; i <  ARRAY_SIZE(fh_tbl); i++) {
-                IWL_ERR(priv, "  %34s: 0X%08x\n",
-                        iwl4965_get_fh_string(fh_tbl[i]),
-                        iwl_legacy_read_direct32(priv, fh_tbl[i]));
-        }
-        return 0;
-}
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c b/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
deleted file mode 100644
index 57ebe214e68c..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
+++ /dev/null
@@ -1,2871 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2005 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/skbuff.h>
-#include <linux/slab.h>
-#include <net/mac80211.h>
-
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/delay.h>
-
-#include <linux/workqueue.h>
-
-#include "iwl-dev.h"
-#include "iwl-sta.h"
-#include "iwl-core.h"
-#include "iwl-4965.h"
-
-#define IWL4965_RS_NAME "iwl-4965-rs"
-
-#define NUM_TRY_BEFORE_ANT_TOGGLE 1
-#define IWL_NUMBER_TRY      1
-#define IWL_HT_NUMBER_TRY   3
-
-#define IWL_RATE_MAX_WINDOW             62      /* # tx in history window */
-#define IWL_RATE_MIN_FAILURE_TH         6       /* min failures to calc tpt */
-#define IWL_RATE_MIN_SUCCESS_TH         8       /* min successes to calc tpt */
-
-/* max allowed rate miss before sync LQ cmd */
-#define IWL_MISSED_RATE_MAX             15
-/* max time to accum history 2 seconds */
-#define IWL_RATE_SCALE_FLUSH_INTVL   (3*HZ)
-
-static u8 rs_ht_to_legacy[] = {
-        IWL_RATE_6M_INDEX, IWL_RATE_6M_INDEX,
-        IWL_RATE_6M_INDEX, IWL_RATE_6M_INDEX,
-        IWL_RATE_6M_INDEX,
-        IWL_RATE_6M_INDEX, IWL_RATE_9M_INDEX,
-        IWL_RATE_12M_INDEX, IWL_RATE_18M_INDEX,
-        IWL_RATE_24M_INDEX, IWL_RATE_36M_INDEX,
-        IWL_RATE_48M_INDEX, IWL_RATE_54M_INDEX
-};
-
-static const u8 ant_toggle_lookup[] = {
-        /*ANT_NONE -> */ ANT_NONE,
-        /*ANT_A    -> */ ANT_B,
-        /*ANT_B    -> */ ANT_C,
-        /*ANT_AB   -> */ ANT_BC,
-        /*ANT_C    -> */ ANT_A,
-        /*ANT_AC   -> */ ANT_AB,
-        /*ANT_BC   -> */ ANT_AC,
-        /*ANT_ABC  -> */ ANT_ABC,
-};
-
-#define IWL_DECLARE_RATE_INFO(r, s, ip, in, rp, rn, pp, np)    \
-        [IWL_RATE_##r##M_INDEX] = { IWL_RATE_##r##M_PLCP,      \
-                                    IWL_RATE_SISO_##s##M_PLCP, \
-                                    IWL_RATE_MIMO2_##s##M_PLCP,\
-                                    IWL_RATE_##r##M_IEEE,      \
-                                    IWL_RATE_##ip##M_INDEX,    \
-                                    IWL_RATE_##in##M_INDEX,    \
-                                    IWL_RATE_##rp##M_INDEX,    \
-                                    IWL_RATE_##rn##M_INDEX,    \
-                                    IWL_RATE_##pp##M_INDEX,    \
-                                    IWL_RATE_##np##M_INDEX }
-
-/*
- * Parameter order:
- *   rate, ht rate, prev rate, next rate, prev tgg rate, next tgg rate
- *
- * If there isn't a valid next or previous rate then INV is used which
- * maps to IWL_RATE_INVALID
- *
- */
-const struct iwl_rate_info iwlegacy_rates[IWL_RATE_COUNT] = {
-        IWL_DECLARE_RATE_INFO(1, INV, INV, 2, INV, 2, INV, 2),    /*  1mbps */
-        IWL_DECLARE_RATE_INFO(2, INV, 1, 5, 1, 5, 1, 5),          /*  2mbps */
-        IWL_DECLARE_RATE_INFO(5, INV, 2, 6, 2, 11, 2, 11),        /*5.5mbps */
-        IWL_DECLARE_RATE_INFO(11, INV, 9, 12, 9, 12, 5, 18),      /* 11mbps */
-        IWL_DECLARE_RATE_INFO(6, 6, 5, 9, 5, 11, 5, 11),        /*  6mbps */
-        IWL_DECLARE_RATE_INFO(9, 6, 6, 11, 6, 11, 5, 11),       /*  9mbps */
-        IWL_DECLARE_RATE_INFO(12, 12, 11, 18, 11, 18, 11, 18),   /* 12mbps */
-        IWL_DECLARE_RATE_INFO(18, 18, 12, 24, 12, 24, 11, 24),   /* 18mbps */
-        IWL_DECLARE_RATE_INFO(24, 24, 18, 36, 18, 36, 18, 36),   /* 24mbps */
-        IWL_DECLARE_RATE_INFO(36, 36, 24, 48, 24, 48, 24, 48),   /* 36mbps */
-        IWL_DECLARE_RATE_INFO(48, 48, 36, 54, 36, 54, 36, 54),   /* 48mbps */
-        IWL_DECLARE_RATE_INFO(54, 54, 48, INV, 48, INV, 48, INV),/* 54mbps */
-        IWL_DECLARE_RATE_INFO(60, 60, 48, INV, 48, INV, 48, INV),/* 60mbps */
-};
-
-static int iwl4965_hwrate_to_plcp_idx(u32 rate_n_flags)
-{
-        int idx = 0;
-
-        /* HT rate format */
-        if (rate_n_flags & RATE_MCS_HT_MSK) {
-                idx = (rate_n_flags & 0xff);
-
-                if (idx >= IWL_RATE_MIMO2_6M_PLCP)
-                        idx = idx - IWL_RATE_MIMO2_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;
-
-        /* legacy rate format, search for match in table */
-        } else {
-                for (idx = 0; idx < ARRAY_SIZE(iwlegacy_rates); idx++)
-                        if (iwlegacy_rates[idx].plcp == (rate_n_flags & 0xFF))
-                                return idx;
-        }
-
-        return -1;
-}
-
-static void iwl4965_rs_rate_scale_perform(struct iwl_priv *priv,
-                                   struct sk_buff *skb,
-                                   struct ieee80211_sta *sta,
-                                   struct iwl_lq_sta *lq_sta);
-static void iwl4965_rs_fill_link_cmd(struct iwl_priv *priv,
-                             struct iwl_lq_sta *lq_sta, u32 rate_n_flags);
-static void iwl4965_rs_stay_in_table(struct iwl_lq_sta *lq_sta,
-                                        bool force_search);
-
-#ifdef CONFIG_MAC80211_DEBUGFS
-static void iwl4965_rs_dbgfs_set_mcs(struct iwl_lq_sta *lq_sta,
-                             u32 *rate_n_flags, int index);
-#else
-static void iwl4965_rs_dbgfs_set_mcs(struct iwl_lq_sta *lq_sta,
-                             u32 *rate_n_flags, int index)
-{}
-#endif
-
-/**
- * The following tables contain the expected throughput metrics for all rates
- *
- *      1, 2, 5.5, 11, 6, 9, 12, 18, 24, 36, 48, 54, 60 MBits
- *
- * where invalid entries are zeros.
- *
- * CCK rates are only valid in legacy table and will only be used in G
- * (2.4 GHz) band.
- */
-
-static s32 expected_tpt_legacy[IWL_RATE_COUNT] = {
-        7, 13, 35, 58, 40, 57, 72, 98, 121, 154, 177, 186, 0
-};
-
-static s32 expected_tpt_siso20MHz[4][IWL_RATE_COUNT] = {
-        {0, 0, 0, 0, 42, 0,  76, 102, 124, 158, 183, 193, 202}, /* Norm */
-        {0, 0, 0, 0, 46, 0,  82, 110, 132, 167, 192, 202, 210}, /* SGI */
-        {0, 0, 0, 0, 48, 0,  93, 135, 176, 251, 319, 351, 381}, /* AGG */
-        {0, 0, 0, 0, 53, 0, 102, 149, 193, 275, 348, 381, 413}, /* AGG+SGI */
-};
-
-static s32 expected_tpt_siso40MHz[4][IWL_RATE_COUNT] = {
-        {0, 0, 0, 0,  77, 0, 127, 160, 184, 220, 242, 250, 257}, /* Norm */
-        {0, 0, 0, 0,  83, 0, 135, 169, 193, 229, 250, 257, 264}, /* SGI */
-        {0, 0, 0, 0,  96, 0, 182, 259, 328, 451, 553, 598, 640}, /* AGG */
-        {0, 0, 0, 0, 106, 0, 199, 282, 357, 487, 593, 640, 683}, /* AGG+SGI */
-};
-
-static s32 expected_tpt_mimo2_20MHz[4][IWL_RATE_COUNT] = {
-        {0, 0, 0, 0,  74, 0, 123, 155, 179, 213, 235, 243, 250}, /* Norm */
-        {0, 0, 0, 0,  81, 0, 131, 164, 187, 221, 242, 250, 256}, /* SGI */
-        {0, 0, 0, 0,  92, 0, 175, 250, 317, 436, 534, 578, 619}, /* AGG */
-        {0, 0, 0, 0, 102, 0, 192, 273, 344, 470, 573, 619, 660}, /* AGG+SGI*/
-};
-
-static s32 expected_tpt_mimo2_40MHz[4][IWL_RATE_COUNT] = {
-        {0, 0, 0, 0, 123, 0, 182, 214, 235, 264, 279, 285, 289}, /* Norm */
-        {0, 0, 0, 0, 131, 0, 191, 222, 242, 270, 284, 289, 293}, /* SGI */
-        {0, 0, 0, 0, 180, 0, 327, 446, 545, 708, 828, 878, 922}, /* AGG */
-        {0, 0, 0, 0, 197, 0, 355, 481, 584, 752, 872, 922, 966}, /* AGG+SGI */
-};
-
-/* mbps, mcs */
-static const struct iwl_rate_mcs_info iwl_rate_mcs[IWL_RATE_COUNT] = {
-        {  "1", "BPSK DSSS"},
-        {  "2", "QPSK DSSS"},
-        {"5.5", "BPSK CCK"},
-        { "11", "QPSK CCK"},
-        {  "6", "BPSK 1/2"},
-        {  "9", "BPSK 1/2"},
-        { "12", "QPSK 1/2"},
-        { "18", "QPSK 3/4"},
-        { "24", "16QAM 1/2"},
-        { "36", "16QAM 3/4"},
-        { "48", "64QAM 2/3"},
-        { "54", "64QAM 3/4"},
-        { "60", "64QAM 5/6"},
-};
-
-#define MCS_INDEX_PER_STREAM    (8)
-
-static inline u8 iwl4965_rs_extract_rate(u32 rate_n_flags)
-{
-        return (u8)(rate_n_flags & 0xFF);
-}
-
-static void
-iwl4965_rs_rate_scale_clear_window(struct iwl_rate_scale_data *window)
-{
-        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 inline u8 iwl4965_rs_is_valid_ant(u8 valid_antenna, u8 ant_type)
-{
-        return (ant_type & valid_antenna) == ant_type;
-}
-
-/*
- *      removes the old data from the statistics. All data that is older than
- *      TID_MAX_TIME_DIFF, will be deleted.
- */
-static void
-iwl4965_rs_tl_rm_old_stats(struct iwl_traffic_load *tl, u32 curr_time)
-{
-        /* 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 u8 iwl4965_rs_tl_add_packet(struct iwl_lq_sta *lq_data,
-                           struct ieee80211_hdr *hdr)
-{
-        u32 curr_time = jiffies_to_msecs(jiffies);
-        u32 time_diff;
-        s32 index;
-        struct iwl_traffic_load *tl = NULL;
-        u8 tid;
-
-        if (ieee80211_is_data_qos(hdr->frame_control)) {
-                u8 *qc = ieee80211_get_qos_ctl(hdr);
-                tid = qc[0] & 0xf;
-        } else
-                return MAX_TID_COUNT;
-
-        if (unlikely(tid >= TID_MAX_LOAD_COUNT))
-                return MAX_TID_COUNT;
-
-        tl = &lq_data->load[tid];
-
-        curr_time -= curr_time % TID_ROUND_VALUE;
-
-        /* 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 MAX_TID_COUNT;
-        }
-
-        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)
-                iwl4965_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;
-
-        return tid;
-}
-
-/*
-        get the traffic load value for tid
-*/
-static u32 iwl4965_rs_tl_get_load(struct iwl_lq_sta *lq_data, u8 tid)
-{
-        u32 curr_time = jiffies_to_msecs(jiffies);
-        u32 time_diff;
-        s32 index;
-        struct iwl_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)
-                iwl4965_rs_tl_rm_old_stats(tl, curr_time);
-
-        return tl->total;
-}
-
-static int iwl4965_rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
-                                      struct iwl_lq_sta *lq_data, u8 tid,
-                                      struct ieee80211_sta *sta)
-{
-        int ret = -EAGAIN;
-        u32 load;
-
-        load = iwl4965_rs_tl_get_load(lq_data, tid);
-
-        if (load > IWL_AGG_LOAD_THRESHOLD) {
-                IWL_DEBUG_HT(priv, "Starting Tx agg: STA: %pM tid: %d\n",
-                                sta->addr, tid);
-                ret = ieee80211_start_tx_ba_session(sta, tid, 5000);
-                if (ret == -EAGAIN) {
-                        /*
-                         * driver and mac80211 is out of sync
-                         * this might be cause by reloading firmware
-                         * stop the tx ba session here
-                         */
-                        IWL_ERR(priv, "Fail start Tx agg on tid: %d\n",
-                                tid);
-                        ieee80211_stop_tx_ba_session(sta, tid);
-                }
-        } else {
-                IWL_ERR(priv, "Aggregation not enabled for tid %d "
-                        "because load = %u\n", tid, load);
-        }
-        return ret;
-}
-
-static void iwl4965_rs_tl_turn_on_agg(struct iwl_priv *priv, u8 tid,
-                              struct iwl_lq_sta *lq_data,
-                              struct ieee80211_sta *sta)
-{
-        if (tid < TID_MAX_LOAD_COUNT)
-                iwl4965_rs_tl_turn_on_agg_for_tid(priv, lq_data, tid, sta);
-        else
-                IWL_ERR(priv, "tid exceeds max load count: %d/%d\n",
-                        tid, TID_MAX_LOAD_COUNT);
-}
-
-static inline int iwl4965_get_iwl4965_num_of_ant_from_rate(u32 rate_n_flags)
-{
-        return !!(rate_n_flags & RATE_MCS_ANT_A_MSK) +
-               !!(rate_n_flags & RATE_MCS_ANT_B_MSK) +
-               !!(rate_n_flags & RATE_MCS_ANT_C_MSK);
-}
-
-/*
- * Static function to get the expected throughput from an iwl_scale_tbl_info
- * that wraps a NULL pointer check
- */
-static s32
-iwl4965_get_expected_tpt(struct iwl_scale_tbl_info *tbl, int rs_index)
-{
-        if (tbl->expected_tpt)
-                return tbl->expected_tpt[rs_index];
-        return 0;
-}
-
-/**
- * iwl4965_rs_collect_tx_data - Update the success/failure sliding window
- *
- * We keep a sliding window of the last 62 packets transmitted
- * at this rate.  window->data contains the bitmask of successful
- * packets.
- */
-static int iwl4965_rs_collect_tx_data(struct iwl_scale_tbl_info *tbl,
-                              int scale_index, int attempts, int successes)
-{
-        struct iwl_rate_scale_data *window = NULL;
-        static const u64 mask = (((u64)1) << (IWL_RATE_MAX_WINDOW - 1));
-        s32 fail_count, tpt;
-
-        if (scale_index < 0 || scale_index >= IWL_RATE_COUNT)
-                return -EINVAL;
-
-        /* Select window for current tx bit rate */
-        window = &(tbl->win[scale_index]);
-
-        /* Get expected throughput */
-        tpt = iwl4965_get_expected_tpt(tbl, scale_index);
-
-        /*
-         * Keep track of only the latest 62 tx frame attempts in this rate's
-         * history window; anything older isn't really relevant any more.
-         * If we have filled up the sliding window, drop the oldest attempt;
-         * if the oldest attempt (highest bit in bitmap) shows "success",
-         * subtract "1" from the success counter (this is the main reason
-         * we keep these bitmaps!).
-         */
-        while (attempts > 0) {
-                if (window->counter >= IWL_RATE_MAX_WINDOW) {
-
-                        /* remove earliest */
-                        window->counter = IWL_RATE_MAX_WINDOW - 1;
-
-                        if (window->data & mask) {
-                                window->data &= ~mask;
-                                window->success_counter--;
-                        }
-                }
-
-                /* Increment frames-attempted counter */
-                window->counter++;
-
-                /* Shift bitmap by one frame to throw away oldest history */
-                window->data <<= 1;
-
-                /* Mark the most recent #successes attempts as successful */
-                if (successes > 0) {
-                        window->success_counter++;
-                        window->data |= 0x1;
-                        successes--;
-                }
-
-                attempts--;
-        }
-
-        /* Calculate current success ratio, avoid divide-by-0! */
-        if (window->counter > 0)
-                window->success_ratio = 128 * (100 * window->success_counter)
-                                        / window->counter;
-        else
-                window->success_ratio = IWL_INVALID_VALUE;
-
-        fail_count = window->counter - window->success_counter;
-
-        /* Calculate average throughput, if we have enough history. */
-        if ((fail_count >= IWL_RATE_MIN_FAILURE_TH) ||
-            (window->success_counter >= IWL_RATE_MIN_SUCCESS_TH))
-                window->average_tpt = (window->success_ratio * tpt + 64) / 128;
-        else
-                window->average_tpt = IWL_INVALID_VALUE;
-
-        /* Tag this window as having been updated */
-        window->stamp = jiffies;
-
-        return 0;
-}
-
-/*
- * Fill uCode API rate_n_flags field, based on "search" or "active" table.
- */
-static u32 iwl4965_rate_n_flags_from_tbl(struct iwl_priv *priv,
-                                 struct iwl_scale_tbl_info *tbl,
-                                 int index, u8 use_green)
-{
-        u32 rate_n_flags = 0;
-
-        if (is_legacy(tbl->lq_type)) {
-                rate_n_flags = iwlegacy_rates[index].plcp;
-                if (index >= IWL_FIRST_CCK_RATE && index <= IWL_LAST_CCK_RATE)
-                        rate_n_flags |= RATE_MCS_CCK_MSK;
-
-        } else if (is_Ht(tbl->lq_type)) {
-                if (index > IWL_LAST_OFDM_RATE) {
-                        IWL_ERR(priv, "Invalid HT rate index %d\n", index);
-                        index = IWL_LAST_OFDM_RATE;
-                }
-                rate_n_flags = RATE_MCS_HT_MSK;
-
-                if (is_siso(tbl->lq_type))
-                        rate_n_flags |= iwlegacy_rates[index].plcp_siso;
-                else
-                        rate_n_flags |= iwlegacy_rates[index].plcp_mimo2;
-        } else {
-                IWL_ERR(priv, "Invalid tbl->lq_type %d\n", tbl->lq_type);
-        }
-
-        rate_n_flags |= ((tbl->ant_type << RATE_MCS_ANT_POS) &
-                                                     RATE_MCS_ANT_ABC_MSK);
-
-        if (is_Ht(tbl->lq_type)) {
-                if (tbl->is_ht40) {
-                        if (tbl->is_dup)
-                                rate_n_flags |= RATE_MCS_DUP_MSK;
-                        else
-                                rate_n_flags |= RATE_MCS_HT40_MSK;
-                }
-                if (tbl->is_SGI)
-                        rate_n_flags |= RATE_MCS_SGI_MSK;
-
-                if (use_green) {
-                        rate_n_flags |= RATE_MCS_GF_MSK;
-                        if (is_siso(tbl->lq_type) && tbl->is_SGI) {
-                                rate_n_flags &= ~RATE_MCS_SGI_MSK;
-                                IWL_ERR(priv, "GF was set with SGI:SISO\n");
-                        }
-                }
-        }
-        return rate_n_flags;
-}
-
-/*
- * Interpret uCode API's rate_n_flags format,
- * fill "search" or "active" tx mode table.
- */
-static int iwl4965_rs_get_tbl_info_from_mcs(const u32 rate_n_flags,
-                                    enum ieee80211_band band,
-                                    struct iwl_scale_tbl_info *tbl,
-                                    int *rate_idx)
-{
-        u32 ant_msk = (rate_n_flags & RATE_MCS_ANT_ABC_MSK);
-        u8 iwl4965_num_of_ant = iwl4965_get_iwl4965_num_of_ant_from_rate(rate_n_flags);
-        u8 mcs;
-
-        memset(tbl, 0, sizeof(struct iwl_scale_tbl_info));
-        *rate_idx = iwl4965_hwrate_to_plcp_idx(rate_n_flags);
-
-        if (*rate_idx  == IWL_RATE_INVALID) {
-                *rate_idx = -1;
-                return -EINVAL;
-        }
-        tbl->is_SGI = 0;        /* default legacy setup */
-        tbl->is_ht40 = 0;
-        tbl->is_dup = 0;
-        tbl->ant_type = (ant_msk >> RATE_MCS_ANT_POS);
-        tbl->lq_type = LQ_NONE;
-        tbl->max_search = IWL_MAX_SEARCH;
-
-        /* legacy rate format */
-        if (!(rate_n_flags & RATE_MCS_HT_MSK)) {
-                if (iwl4965_num_of_ant == 1) {
-                        if (band == IEEE80211_BAND_5GHZ)
-                                tbl->lq_type = LQ_A;
-                        else
-                                tbl->lq_type = LQ_G;
-                }
-        /* HT rate format */
-        } else {
-                if (rate_n_flags & RATE_MCS_SGI_MSK)
-                        tbl->is_SGI = 1;
-
-                if ((rate_n_flags & RATE_MCS_HT40_MSK) ||
-                    (rate_n_flags & RATE_MCS_DUP_MSK))
-                        tbl->is_ht40 = 1;
-
-                if (rate_n_flags & RATE_MCS_DUP_MSK)
-                        tbl->is_dup = 1;
-
-                mcs = iwl4965_rs_extract_rate(rate_n_flags);
-
-                /* SISO */
-                if (mcs <= IWL_RATE_SISO_60M_PLCP) {
-                        if (iwl4965_num_of_ant == 1)
-                                tbl->lq_type = LQ_SISO; /*else NONE*/
-                /* MIMO2 */
-                } else {
-                        if (iwl4965_num_of_ant == 2)
-                                tbl->lq_type = LQ_MIMO2;
-                }
-        }
-        return 0;
-}
-
-/* switch to another antenna/antennas and return 1 */
-/* if no other valid antenna found, return 0 */
-static int iwl4965_rs_toggle_antenna(u32 valid_ant, u32 *rate_n_flags,
-                             struct iwl_scale_tbl_info *tbl)
-{
-        u8 new_ant_type;
-
-        if (!tbl->ant_type || tbl->ant_type > ANT_ABC)
-                return 0;
-
-        if (!iwl4965_rs_is_valid_ant(valid_ant, tbl->ant_type))
-                return 0;
-
-        new_ant_type = ant_toggle_lookup[tbl->ant_type];
-
-        while ((new_ant_type != tbl->ant_type) &&
-               !iwl4965_rs_is_valid_ant(valid_ant, new_ant_type))
-                new_ant_type = ant_toggle_lookup[new_ant_type];
-
-        if (new_ant_type == tbl->ant_type)
-                return 0;
-
-        tbl->ant_type = new_ant_type;
-        *rate_n_flags &= ~RATE_MCS_ANT_ABC_MSK;
-        *rate_n_flags |= new_ant_type << RATE_MCS_ANT_POS;
-        return 1;
-}
-
-/**
- * Green-field mode is valid if the station supports it and
- * there are no non-GF stations present in the BSS.
- */
-static bool iwl4965_rs_use_green(struct ieee80211_sta *sta)
-{
-        struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
-        struct iwl_rxon_context *ctx = sta_priv->common.ctx;
-
-        return (sta->ht_cap.cap & IEEE80211_HT_CAP_GRN_FLD) &&
-                !(ctx->ht.non_gf_sta_present);
-}
-
-/**
- * iwl4965_rs_get_supported_rates - get the available rates
- *
- * if management frame or broadcast frame only return
- * basic available rates.
- *
- */
-static u16 iwl4965_rs_get_supported_rates(struct iwl_lq_sta *lq_sta,
-                                  struct ieee80211_hdr *hdr,
-                                  enum iwl_table_type rate_type)
-{
-        if (is_legacy(rate_type)) {
-                return lq_sta->active_legacy_rate;
-        } else {
-                if (is_siso(rate_type))
-                        return lq_sta->active_siso_rate;
-                else
-                        return lq_sta->active_mimo2_rate;
-        }
-}
-
-static u16
-iwl4965_rs_get_adjacent_rate(struct iwl_priv *priv, u8 index, u16 rate_mask,
-                                int rate_type)
-{
-        u8 high = IWL_RATE_INVALID;
-        u8 low = IWL_RATE_INVALID;
-
-        /* 802.11A or ht walks to the next literal adjacent rate in
-         * the rate table */
-        if (is_a_band(rate_type) || !is_legacy(rate_type)) {
-                int i;
-                u32 mask;
-
-                /* Find the previous rate that is in the rate mask */
-                i = index - 1;
-                for (mask = (1 << i); i >= 0; i--, mask >>= 1) {
-                        if (rate_mask & mask) {
-                                low = i;
-                                break;
-                        }
-                }
-
-                /* Find the next rate that is in the rate mask */
-                i = index + 1;
-                for (mask = (1 << i); i < IWL_RATE_COUNT; i++, mask <<= 1) {
-                        if (rate_mask & mask) {
-                                high = i;
-                                break;
-                        }
-                }
-
-                return (high << 8) | low;
-        }
-
-        low = index;
-        while (low != IWL_RATE_INVALID) {
-                low = iwlegacy_rates[low].prev_rs;
-                if (low == IWL_RATE_INVALID)
-                        break;
-                if (rate_mask & (1 << low))
-                        break;
-                IWL_DEBUG_RATE(priv, "Skipping masked lower rate: %d\n", low);
-        }
-
-        high = index;
-        while (high != IWL_RATE_INVALID) {
-                high = iwlegacy_rates[high].next_rs;
-                if (high == IWL_RATE_INVALID)
-                        break;
-                if (rate_mask & (1 << high))
-                        break;
-                IWL_DEBUG_RATE(priv, "Skipping masked higher rate: %d\n", high);
-        }
-
-        return (high << 8) | low;
-}
-
-static u32 iwl4965_rs_get_lower_rate(struct iwl_lq_sta *lq_sta,
-                             struct iwl_scale_tbl_info *tbl,
-                             u8 scale_index, u8 ht_possible)
-{
-        s32 low;
-        u16 rate_mask;
-        u16 high_low;
-        u8 switch_to_legacy = 0;
-        u8 is_green = lq_sta->is_green;
-        struct iwl_priv *priv = lq_sta->drv;
-
-        /* check if we need to switch from HT to legacy rates.
-         * assumption is that mandatory rates (1Mbps or 6Mbps)
-         * are always supported (spec demand) */
-        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->band == IEEE80211_BAND_5GHZ)
-                        tbl->lq_type = LQ_A;
-                else
-                        tbl->lq_type = LQ_G;
-
-                if (iwl4965_num_of_ant(tbl->ant_type) > 1)
-                        tbl->ant_type =
-                                iwl4965_first_antenna(priv->hw_params.valid_tx_ant);
-
-                tbl->is_ht40 = 0;
-                tbl->is_SGI = 0;
-                tbl->max_search = IWL_MAX_SEARCH;
-        }
-
-        rate_mask = iwl4965_rs_get_supported_rates(lq_sta, NULL, tbl->lq_type);
-
-        /* Mask with station rate restriction */
-        if (is_legacy(tbl->lq_type)) {
-                /* supp_rates has no CCK bits in A mode */
-                if (lq_sta->band == IEEE80211_BAND_5GHZ)
-                        rate_mask  = (u16)(rate_mask &
-                           (lq_sta->supp_rates << IWL_FIRST_OFDM_RATE));
-                else
-                        rate_mask = (u16)(rate_mask & lq_sta->supp_rates);
-        }
-
-        /* If we switched from HT to legacy, check current rate */
-        if (switch_to_legacy && (rate_mask & (1 << scale_index))) {
-                low = scale_index;
-                goto out;
-        }
-
-        high_low = iwl4965_rs_get_adjacent_rate(lq_sta->drv,
-                                        scale_index, rate_mask,
-                                        tbl->lq_type);
-        low = high_low & 0xff;
-
-        if (low == IWL_RATE_INVALID)
-                low = scale_index;
-
-out:
-        return iwl4965_rate_n_flags_from_tbl(lq_sta->drv, tbl, low, is_green);
-}
-
-/*
- * Simple function to compare two rate scale table types
- */
-static bool iwl4965_table_type_matches(struct iwl_scale_tbl_info *a,
-                               struct iwl_scale_tbl_info *b)
-{
-        return (a->lq_type == b->lq_type) && (a->ant_type == b->ant_type) &&
-                (a->is_SGI == b->is_SGI);
-}
-
-/*
- * mac80211 sends us Tx status
- */
-static void
-iwl4965_rs_tx_status(void *priv_r, struct ieee80211_supported_band *sband,
-                         struct ieee80211_sta *sta, void *priv_sta,
-                         struct sk_buff *skb)
-{
-        int legacy_success;
-        int retries;
-        int rs_index, mac_index, i;
-        struct iwl_lq_sta *lq_sta = priv_sta;
-        struct iwl_link_quality_cmd *table;
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-        struct iwl_priv *priv = (struct iwl_priv *)priv_r;
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-        enum mac80211_rate_control_flags mac_flags;
-        u32 tx_rate;
-        struct iwl_scale_tbl_info tbl_type;
-        struct iwl_scale_tbl_info *curr_tbl, *other_tbl, *tmp_tbl;
-        struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
-        struct iwl_rxon_context *ctx = sta_priv->common.ctx;
-
-        IWL_DEBUG_RATE_LIMIT(priv,
-                "get frame ack response, update rate scale window\n");
-
-        /* Treat uninitialized rate scaling data same as non-existing. */
-        if (!lq_sta) {
-                IWL_DEBUG_RATE(priv, "Station rate scaling not created yet.\n");
-                return;
-        } else if (!lq_sta->drv) {
-                IWL_DEBUG_RATE(priv, "Rate scaling not initialized yet.\n");
-                return;
-        }
-
-        if (!ieee80211_is_data(hdr->frame_control) ||
-            info->flags & IEEE80211_TX_CTL_NO_ACK)
-                return;
-
-        /* This packet was aggregated but doesn't carry status info */
-        if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
-            !(info->flags & IEEE80211_TX_STAT_AMPDU))
-                return;
-
-        /*
-         * Ignore this Tx frame response if its initial rate doesn't match
-         * that of latest Link Quality command.  There may be stragglers
-         * from a previous Link Quality command, but we're no longer interested
-         * in those; they're either from the "active" mode while we're trying
-         * 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).
-         */
-        table = &lq_sta->lq;
-        tx_rate = le32_to_cpu(table->rs_table[0].rate_n_flags);
-        iwl4965_rs_get_tbl_info_from_mcs(tx_rate,
-                         priv->band, &tbl_type, &rs_index);
-        if (priv->band == IEEE80211_BAND_5GHZ)
-                rs_index -= IWL_FIRST_OFDM_RATE;
-        mac_flags = info->status.rates[0].flags;
-        mac_index = info->status.rates[0].idx;
-        /* For HT packets, map MCS to PLCP */
-        if (mac_flags & IEEE80211_TX_RC_MCS) {
-                mac_index &= RATE_MCS_CODE_MSK; /* Remove # of streams */
-                if (mac_index >= (IWL_RATE_9M_INDEX - IWL_FIRST_OFDM_RATE))
-                        mac_index++;
-                /*
-                 * mac80211 HT index is always zero-indexed; we need to move
-                 * HT OFDM rates after CCK rates in 2.4 GHz band
-                 */
-                if (priv->band == IEEE80211_BAND_2GHZ)
-                        mac_index += IWL_FIRST_OFDM_RATE;
-        }
-        /* Here we actually compare this rate to the latest LQ command */
-        if ((mac_index < 0) ||
-            (tbl_type.is_SGI !=
-                        !!(mac_flags & IEEE80211_TX_RC_SHORT_GI)) ||
-            (tbl_type.is_ht40 !=
-                        !!(mac_flags & IEEE80211_TX_RC_40_MHZ_WIDTH)) ||
-            (tbl_type.is_dup !=
-                        !!(mac_flags & IEEE80211_TX_RC_DUP_DATA)) ||
-            (tbl_type.ant_type != info->antenna_sel_tx) ||
-            (!!(tx_rate & RATE_MCS_HT_MSK) !=
-                        !!(mac_flags & IEEE80211_TX_RC_MCS)) ||
-            (!!(tx_rate & RATE_MCS_GF_MSK) !=
-                        !!(mac_flags & IEEE80211_TX_RC_GREEN_FIELD)) ||
-            (rs_index != mac_index)) {
-                IWL_DEBUG_RATE(priv,
-                "initial rate %d does not match %d (0x%x)\n",
-                         mac_index, rs_index, tx_rate);
-                /*
-                 * Since rates mis-match, the last LQ command may have failed.
-                 * After IWL_MISSED_RATE_MAX mis-matches, resync the uCode with
-                 * ... driver.
-                 */
-                lq_sta->missed_rate_counter++;
-                if (lq_sta->missed_rate_counter > IWL_MISSED_RATE_MAX) {
-                        lq_sta->missed_rate_counter = 0;
-                        iwl_legacy_send_lq_cmd(priv, ctx, &lq_sta->lq,
-                                                        CMD_ASYNC, false);
-                }
-                /* Regardless, ignore this status info for outdated rate */
-                return;
-        } else
-                /* Rate did match, so reset the missed_rate_counter */
-                lq_sta->missed_rate_counter = 0;
-
-        /* Figure out if rate scale algorithm is in active or search table */
-        if (iwl4965_table_type_matches(&tbl_type,
-                                &(lq_sta->lq_info[lq_sta->active_tbl]))) {
-                curr_tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
-                other_tbl = &(lq_sta->lq_info[1 - lq_sta->active_tbl]);
-        } else if (iwl4965_table_type_matches(&tbl_type,
-                                &lq_sta->lq_info[1 - lq_sta->active_tbl])) {
-                curr_tbl = &(lq_sta->lq_info[1 - lq_sta->active_tbl]);
-                other_tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
-        } else {
-                IWL_DEBUG_RATE(priv,
-                        "Neither active nor search matches tx rate\n");
-                tmp_tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
-                IWL_DEBUG_RATE(priv, "active- lq:%x, ant:%x, SGI:%d\n",
-                        tmp_tbl->lq_type, tmp_tbl->ant_type, tmp_tbl->is_SGI);
-                tmp_tbl = &(lq_sta->lq_info[1 - lq_sta->active_tbl]);
-                IWL_DEBUG_RATE(priv, "search- lq:%x, ant:%x, SGI:%d\n",
-                        tmp_tbl->lq_type, tmp_tbl->ant_type, tmp_tbl->is_SGI);
-                IWL_DEBUG_RATE(priv, "actual- lq:%x, ant:%x, SGI:%d\n",
-                        tbl_type.lq_type, tbl_type.ant_type, tbl_type.is_SGI);
-                /*
-                 * no matching table found, let's by-pass the data collection
-                 * and continue to perform rate scale to find the rate table
-                 */
-                iwl4965_rs_stay_in_table(lq_sta, true);
-                goto done;
-        }
-
-        /*
-         * Updating the frame history depends on whether packets were
-         * aggregated.
-         *
-         * For aggregation, all packets were transmitted at the same rate, the
-         * first index into rate scale table.
-         */
-        if (info->flags & IEEE80211_TX_STAT_AMPDU) {
-                tx_rate = le32_to_cpu(table->rs_table[0].rate_n_flags);
-                iwl4965_rs_get_tbl_info_from_mcs(tx_rate, priv->band, &tbl_type,
-                                &rs_index);
-                iwl4965_rs_collect_tx_data(curr_tbl, rs_index,
-                                   info->status.ampdu_len,
-                                   info->status.ampdu_ack_len);
-
-                /* Update success/fail counts if not searching for new mode */
-                if (lq_sta->stay_in_tbl) {
-                        lq_sta->total_success += info->status.ampdu_ack_len;
-                        lq_sta->total_failed += (info->status.ampdu_len -
-                                        info->status.ampdu_ack_len);
-                }
-        } else {
-        /*
-         * For legacy, update frame history with for each Tx retry.
-         */
-                retries = info->status.rates[0].count - 1;
-                /* HW doesn't send more than 15 retries */
-                retries = min(retries, 15);
-
-                /* The last transmission may have been successful */
-                legacy_success = !!(info->flags & IEEE80211_TX_STAT_ACK);
-                /* Collect data for each rate used during failed TX attempts */
-                for (i = 0; i <= retries; ++i) {
-                        tx_rate = le32_to_cpu(table->rs_table[i].rate_n_flags);
-                        iwl4965_rs_get_tbl_info_from_mcs(tx_rate, priv->band,
-                                        &tbl_type, &rs_index);
-                        /*
-                         * Only collect stats if retried rate is in the same RS
-                         * table as active/search.
-                         */
-                        if (iwl4965_table_type_matches(&tbl_type, curr_tbl))
-                                tmp_tbl = curr_tbl;
-                        else if (iwl4965_table_type_matches(&tbl_type,
-                                                                 other_tbl))
-                                tmp_tbl = other_tbl;
-                        else
-                                continue;
-                        iwl4965_rs_collect_tx_data(tmp_tbl, rs_index, 1,
-                                           i < retries ? 0 : legacy_success);
-                }
-
-                /* Update success/fail counts if not searching for new mode */
-                if (lq_sta->stay_in_tbl) {
-                        lq_sta->total_success += legacy_success;
-                        lq_sta->total_failed += retries + (1 - legacy_success);
-                }
-        }
-        /* The last TX rate is cached in lq_sta; it's set in if/else above */
-        lq_sta->last_rate_n_flags = tx_rate;
-done:
-        /* See if there's a better rate or modulation mode to try. */
-        if (sta && sta->supp_rates[sband->band])
-                iwl4965_rs_rate_scale_perform(priv, skb, sta, lq_sta);
-}
-
-/*
- * Begin a period of staying with a selected modulation mode.
- * Set "stay_in_tbl" flag to prevent any mode switches.
- * Set frame tx success limits according to legacy vs. high-throughput,
- * and reset overall (spanning all rates) tx success history statistics.
- * These control how long we stay using same modulation mode before
- * searching for a new mode.
- */
-static void iwl4965_rs_set_stay_in_table(struct iwl_priv *priv, u8 is_legacy,
-                                 struct iwl_lq_sta *lq_sta)
-{
-        IWL_DEBUG_RATE(priv, "we are staying in the same table\n");
-        lq_sta->stay_in_tbl = 1;        /* only place this gets set */
-        if (is_legacy) {
-                lq_sta->table_count_limit = IWL_LEGACY_TABLE_COUNT;
-                lq_sta->max_failure_limit = IWL_LEGACY_FAILURE_LIMIT;
-                lq_sta->max_success_limit = IWL_LEGACY_SUCCESS_LIMIT;
-        } else {
-                lq_sta->table_count_limit = IWL_NONE_LEGACY_TABLE_COUNT;
-                lq_sta->max_failure_limit = IWL_NONE_LEGACY_FAILURE_LIMIT;
-                lq_sta->max_success_limit = IWL_NONE_LEGACY_SUCCESS_LIMIT;
-        }
-        lq_sta->table_count = 0;
-        lq_sta->total_failed = 0;
-        lq_sta->total_success = 0;
-        lq_sta->flush_timer = jiffies;
-        lq_sta->action_counter = 0;
-}
-
-/*
- * Find correct throughput table for given mode of modulation
- */
-static void iwl4965_rs_set_expected_tpt_table(struct iwl_lq_sta *lq_sta,
-                                      struct iwl_scale_tbl_info *tbl)
-{
-        /* Used to choose among HT tables */
-        s32 (*ht_tbl_pointer)[IWL_RATE_COUNT];
-
-        /* Check for invalid LQ type */
-        if (WARN_ON_ONCE(!is_legacy(tbl->lq_type) && !is_Ht(tbl->lq_type))) {
-                tbl->expected_tpt = expected_tpt_legacy;
-                return;
-        }
-
-        /* Legacy rates have only one table */
-        if (is_legacy(tbl->lq_type)) {
-                tbl->expected_tpt = expected_tpt_legacy;
-                return;
-        }
-
-        /* Choose among many HT tables depending on number of streams
-         * (SISO/MIMO2), channel width (20/40), SGI, and aggregation
-         * status */
-        if (is_siso(tbl->lq_type) && (!tbl->is_ht40 || lq_sta->is_dup))
-                ht_tbl_pointer = expected_tpt_siso20MHz;
-        else if (is_siso(tbl->lq_type))
-                ht_tbl_pointer = expected_tpt_siso40MHz;
-        else if (is_mimo2(tbl->lq_type) && (!tbl->is_ht40 || lq_sta->is_dup))
-                ht_tbl_pointer = expected_tpt_mimo2_20MHz;
-        else /* if (is_mimo2(tbl->lq_type)) <-- must be true */
-                ht_tbl_pointer = expected_tpt_mimo2_40MHz;
-
-        if (!tbl->is_SGI && !lq_sta->is_agg)            /* Normal */
-                tbl->expected_tpt = ht_tbl_pointer[0];
-        else if (tbl->is_SGI && !lq_sta->is_agg)        /* SGI */
-                tbl->expected_tpt = ht_tbl_pointer[1];
-        else if (!tbl->is_SGI && lq_sta->is_agg)        /* AGG */
-                tbl->expected_tpt = ht_tbl_pointer[2];
-        else                                            /* AGG+SGI */
-                tbl->expected_tpt = ht_tbl_pointer[3];
-}
-
-/*
- * Find starting rate for new "search" high-throughput mode of modulation.
- * Goal is to find lowest expected rate (under perfect conditions) that is
- * above the current measured throughput of "active" mode, to give new mode
- * a fair chance to prove itself without too many challenges.
- *
- * This gets called when transitioning to more aggressive modulation
- * (i.e. legacy to SISO or MIMO, or SISO to MIMO), as well as less aggressive
- * (i.e. MIMO to SISO).  When moving to MIMO, bit rate will typically need
- * 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 iwl4965_rs_get_best_rate(struct iwl_priv *priv,
-                            struct iwl_lq_sta *lq_sta,
-                            struct iwl_scale_tbl_info *tbl,     /* "search" */
-                            u16 rate_mask, s8 index)
-{
-        /* "active" values */
-        struct iwl_scale_tbl_info *active_tbl =
-            &(lq_sta->lq_info[lq_sta->active_tbl]);
-        s32 active_sr = active_tbl->win[index].success_ratio;
-        s32 active_tpt = active_tbl->expected_tpt[index];
-
-        /* expected "search" throughput */
-        s32 *tpt_tbl = tbl->expected_tpt;
-
-        s32 new_rate, high, low, start_hi;
-        u16 high_low;
-        s8 rate = index;
-
-        new_rate = high = low = start_hi = IWL_RATE_INVALID;
-
-        for (; ;) {
-                high_low = iwl4965_rs_get_adjacent_rate(priv, rate, rate_mask,
-                                                tbl->lq_type);
-
-                low = high_low & 0xff;
-                high = (high_low >> 8) & 0xff;
-
-                /*
-                 * Lower the "search" bit rate, to give new "search" mode
-                 * approximately the same throughput as "active" if:
-                 *
-                 * 1) "Active" mode has been working modestly well (but not
-                 *    great), and expected "search" throughput (under perfect
-                 *    conditions) at candidate rate is above the actual
-                 *    measured "active" throughput (but less than expected
-                 *    "active" throughput under perfect conditions).
-                 * OR
-                 * 2) "Active" mode has been working perfectly or very well
-                 *    and expected "search" throughput (under perfect
-                 *    conditions) at candidate rate is above expected
-                 *    "active" throughput (under perfect conditions).
-                 */
-                if ((((100 * tpt_tbl[rate]) > lq_sta->last_tpt) &&
-                     ((active_sr > IWL_RATE_DECREASE_TH) &&
-                      (active_sr <= IWL_RATE_HIGH_TH) &&
-                      (tpt_tbl[rate] <= active_tpt))) ||
-                    ((active_sr >= IWL_RATE_SCALE_SWITCH) &&
-                     (tpt_tbl[rate] > active_tpt))) {
-
-                        /* (2nd or later pass)
-                         * If we've already tried to raise the rate, and are
-                         * now trying to lower it, use the higher rate. */
-                        if (start_hi != IWL_RATE_INVALID) {
-                                new_rate = start_hi;
-                                break;
-                        }
-
-                        new_rate = rate;
-
-                        /* Loop again with lower rate */
-                        if (low != IWL_RATE_INVALID)
-                                rate = low;
-
-                        /* Lower rate not available, use the original */
-                        else
-                                break;
-
-                /* Else try to raise the "search" rate to match "active" */
-                } else {
-                        /* (2nd or later pass)
-                         * If we've already tried to lower the rate, and are
-                         * now trying to raise it, use the lower rate. */
-                        if (new_rate != IWL_RATE_INVALID)
-                                break;
-
-                        /* Loop again with higher rate */
-                        else if (high != IWL_RATE_INVALID) {
-                                start_hi = high;
-                                rate = high;
-
-                        /* Higher rate not available, use the original */
-                        } else {
-                                new_rate = rate;
-                                break;
-                        }
-                }
-        }
-
-        return new_rate;
-}
-
-/*
- * Set up search table for MIMO2
- */
-static int iwl4965_rs_switch_to_mimo2(struct iwl_priv *priv,
-                             struct iwl_lq_sta *lq_sta,
-                             struct ieee80211_conf *conf,
-                             struct ieee80211_sta *sta,
-                             struct iwl_scale_tbl_info *tbl, int index)
-{
-        u16 rate_mask;
-        s32 rate;
-        s8 is_green = lq_sta->is_green;
-        struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
-        struct iwl_rxon_context *ctx = sta_priv->common.ctx;
-
-        if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported)
-                return -1;
-
-        if (((sta->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >> 2)
-                                                == WLAN_HT_CAP_SM_PS_STATIC)
-                return -1;
-
-        /* Need both Tx chains/antennas to support MIMO */
-        if (priv->hw_params.tx_chains_num < 2)
-                return -1;
-
-        IWL_DEBUG_RATE(priv, "LQ: try to switch to MIMO2\n");
-
-        tbl->lq_type = LQ_MIMO2;
-        tbl->is_dup = lq_sta->is_dup;
-        tbl->action = 0;
-        tbl->max_search = IWL_MAX_SEARCH;
-        rate_mask = lq_sta->active_mimo2_rate;
-
-        if (iwl_legacy_is_ht40_tx_allowed(priv, ctx, &sta->ht_cap))
-                tbl->is_ht40 = 1;
-        else
-                tbl->is_ht40 = 0;
-
-        iwl4965_rs_set_expected_tpt_table(lq_sta, tbl);
-
-        rate = iwl4965_rs_get_best_rate(priv, lq_sta, tbl, rate_mask, index);
-
-        IWL_DEBUG_RATE(priv, "LQ: MIMO2 best rate %d mask %X\n",
-                                rate, rate_mask);
-        if ((rate == IWL_RATE_INVALID) || !((1 << rate) & rate_mask)) {
-                IWL_DEBUG_RATE(priv,
-                                "Can't switch with index %d rate mask %x\n",
-                                                rate, rate_mask);
-                return -1;
-        }
-        tbl->current_rate = iwl4965_rate_n_flags_from_tbl(priv,
-                                                 tbl, rate, is_green);
-
-        IWL_DEBUG_RATE(priv, "LQ: Switch to new mcs %X index is green %X\n",
-                     tbl->current_rate, is_green);
-        return 0;
-}
-
-/*
- * Set up search table for SISO
- */
-static int iwl4965_rs_switch_to_siso(struct iwl_priv *priv,
-                             struct iwl_lq_sta *lq_sta,
-                             struct ieee80211_conf *conf,
-                             struct ieee80211_sta *sta,
-                             struct iwl_scale_tbl_info *tbl, int index)
-{
-        u16 rate_mask;
-        u8 is_green = lq_sta->is_green;
-        s32 rate;
-        struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
-        struct iwl_rxon_context *ctx = sta_priv->common.ctx;
-
-        if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported)
-                return -1;
-
-        IWL_DEBUG_RATE(priv, "LQ: try to switch to SISO\n");
-
-        tbl->is_dup = lq_sta->is_dup;
-        tbl->lq_type = LQ_SISO;
-        tbl->action = 0;
-        tbl->max_search = IWL_MAX_SEARCH;
-        rate_mask = lq_sta->active_siso_rate;
-
-        if (iwl_legacy_is_ht40_tx_allowed(priv, ctx, &sta->ht_cap))
-                tbl->is_ht40 = 1;
-        else
-                tbl->is_ht40 = 0;
-
-        if (is_green)
-                tbl->is_SGI = 0; /*11n spec: no SGI in SISO+Greenfield*/
-
-        iwl4965_rs_set_expected_tpt_table(lq_sta, tbl);
-        rate = iwl4965_rs_get_best_rate(priv, lq_sta, tbl, rate_mask, index);
-
-        IWL_DEBUG_RATE(priv, "LQ: get best rate %d mask %X\n", rate, rate_mask);
-        if ((rate == IWL_RATE_INVALID) || !((1 << rate) & rate_mask)) {
-                IWL_DEBUG_RATE(priv,
-                        "can not switch with index %d rate mask %x\n",
-                             rate, rate_mask);
-                return -1;
-        }
-        tbl->current_rate = iwl4965_rate_n_flags_from_tbl(priv,
-                                                tbl, rate, is_green);
-        IWL_DEBUG_RATE(priv, "LQ: Switch to new mcs %X index is green %X\n",
-                     tbl->current_rate, is_green);
-        return 0;
-}
-
-/*
- * Try to switch to new modulation mode from legacy
- */
-static int iwl4965_rs_move_legacy_other(struct iwl_priv *priv,
-                                struct iwl_lq_sta *lq_sta,
-                                struct ieee80211_conf *conf,
-                                struct ieee80211_sta *sta,
-                                int index)
-{
-        struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
-        struct iwl_scale_tbl_info *search_tbl =
-                                &(lq_sta->lq_info[(1 - lq_sta->active_tbl)]);
-        struct iwl_rate_scale_data *window = &(tbl->win[index]);
-        u32 sz = (sizeof(struct iwl_scale_tbl_info) -
-                  (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
-        u8 start_action;
-        u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
-        u8 tx_chains_num = priv->hw_params.tx_chains_num;
-        int ret = 0;
-        u8 update_search_tbl_counter = 0;
-
-        tbl->action = IWL_LEGACY_SWITCH_SISO;
-
-        start_action = tbl->action;
-        for (; ;) {
-                lq_sta->action_counter++;
-                switch (tbl->action) {
-                case IWL_LEGACY_SWITCH_ANTENNA1:
-                case IWL_LEGACY_SWITCH_ANTENNA2:
-                        IWL_DEBUG_RATE(priv, "LQ: Legacy toggle Antenna\n");
-
-                        if ((tbl->action == IWL_LEGACY_SWITCH_ANTENNA1 &&
-                                                        tx_chains_num <= 1) ||
-                            (tbl->action == IWL_LEGACY_SWITCH_ANTENNA2 &&
-                                                        tx_chains_num <= 2))
-                                break;
-
-                        /* Don't change antenna if success has been great */
-                        if (window->success_ratio >= IWL_RS_GOOD_RATIO)
-                                break;
-
-                        /* Set up search table to try other antenna */
-                        memcpy(search_tbl, tbl, sz);
-
-                        if (iwl4965_rs_toggle_antenna(valid_tx_ant,
-                                &search_tbl->current_rate, search_tbl)) {
-                                update_search_tbl_counter = 1;
-                                iwl4965_rs_set_expected_tpt_table(lq_sta,
-                                                                search_tbl);
-                                goto out;
-                        }
-                        break;
-                case IWL_LEGACY_SWITCH_SISO:
-                        IWL_DEBUG_RATE(priv, "LQ: Legacy switch to SISO\n");
-
-                        /* Set up search table to try SISO */
-                        memcpy(search_tbl, tbl, sz);
-                        search_tbl->is_SGI = 0;
-                        ret = iwl4965_rs_switch_to_siso(priv, lq_sta, conf, sta,
-                                                 search_tbl, index);
-                        if (!ret) {
-                                lq_sta->action_counter = 0;
-                                goto out;
-                        }
-
-                        break;
-                case IWL_LEGACY_SWITCH_MIMO2_AB:
-                case IWL_LEGACY_SWITCH_MIMO2_AC:
-                case IWL_LEGACY_SWITCH_MIMO2_BC:
-                        IWL_DEBUG_RATE(priv, "LQ: Legacy switch to MIMO2\n");
-
-                        /* Set up search table to try MIMO */
-                        memcpy(search_tbl, tbl, sz);
-                        search_tbl->is_SGI = 0;
-
-                        if (tbl->action == IWL_LEGACY_SWITCH_MIMO2_AB)
-                                search_tbl->ant_type = ANT_AB;
-                        else if (tbl->action == IWL_LEGACY_SWITCH_MIMO2_AC)
-                                search_tbl->ant_type = ANT_AC;
-                        else
-                                search_tbl->ant_type = ANT_BC;
-
-                        if (!iwl4965_rs_is_valid_ant(valid_tx_ant,
-                                                search_tbl->ant_type))
-                                break;
-
-                        ret = iwl4965_rs_switch_to_mimo2(priv, lq_sta,
-                                                conf, sta,
-                                                 search_tbl, index);
-                        if (!ret) {
-                                lq_sta->action_counter = 0;
-                                goto out;
-                        }
-                        break;
-                }
-                tbl->action++;
-                if (tbl->action > IWL_LEGACY_SWITCH_MIMO2_BC)
-                        tbl->action = IWL_LEGACY_SWITCH_ANTENNA1;
-
-                if (tbl->action == start_action)
-                        break;
-
-        }
-        search_tbl->lq_type = LQ_NONE;
-        return 0;
-
-out:
-        lq_sta->search_better_tbl = 1;
-        tbl->action++;
-        if (tbl->action > IWL_LEGACY_SWITCH_MIMO2_BC)
-                tbl->action = IWL_LEGACY_SWITCH_ANTENNA1;
-        if (update_search_tbl_counter)
-                search_tbl->action = tbl->action;
-        return 0;
-
-}
-
-/*
- * Try to switch to new modulation mode from SISO
- */
-static int iwl4965_rs_move_siso_to_other(struct iwl_priv *priv,
-                                 struct iwl_lq_sta *lq_sta,
-                                 struct ieee80211_conf *conf,
-                                 struct ieee80211_sta *sta, int index)
-{
-        u8 is_green = lq_sta->is_green;
-        struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
-        struct iwl_scale_tbl_info *search_tbl =
-                                &(lq_sta->lq_info[(1 - lq_sta->active_tbl)]);
-        struct iwl_rate_scale_data *window = &(tbl->win[index]);
-        struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
-        u32 sz = (sizeof(struct iwl_scale_tbl_info) -
-                  (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
-        u8 start_action;
-        u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
-        u8 tx_chains_num = priv->hw_params.tx_chains_num;
-        u8 update_search_tbl_counter = 0;
-        int ret;
-
-        start_action = tbl->action;
-
-        for (;;) {
-                lq_sta->action_counter++;
-                switch (tbl->action) {
-                case IWL_SISO_SWITCH_ANTENNA1:
-                case IWL_SISO_SWITCH_ANTENNA2:
-                        IWL_DEBUG_RATE(priv, "LQ: SISO toggle Antenna\n");
-                        if ((tbl->action == IWL_SISO_SWITCH_ANTENNA1 &&
-                                                tx_chains_num <= 1) ||
-                            (tbl->action == IWL_SISO_SWITCH_ANTENNA2 &&
-                                                tx_chains_num <= 2))
-                                break;
-
-                        if (window->success_ratio >= IWL_RS_GOOD_RATIO)
-                                break;
-
-                        memcpy(search_tbl, tbl, sz);
-                        if (iwl4965_rs_toggle_antenna(valid_tx_ant,
-                                       &search_tbl->current_rate, search_tbl)) {
-                                update_search_tbl_counter = 1;
-                                goto out;
-                        }
-                        break;
-                case IWL_SISO_SWITCH_MIMO2_AB:
-                case IWL_SISO_SWITCH_MIMO2_AC:
-                case IWL_SISO_SWITCH_MIMO2_BC:
-                        IWL_DEBUG_RATE(priv, "LQ: SISO switch to MIMO2\n");
-                        memcpy(search_tbl, tbl, sz);
-                        search_tbl->is_SGI = 0;
-
-                        if (tbl->action == IWL_SISO_SWITCH_MIMO2_AB)
-                                search_tbl->ant_type = ANT_AB;
-                        else if (tbl->action == IWL_SISO_SWITCH_MIMO2_AC)
-                                search_tbl->ant_type = ANT_AC;
-                        else
-                                search_tbl->ant_type = ANT_BC;
-
-                        if (!iwl4965_rs_is_valid_ant(valid_tx_ant,
-                                                 search_tbl->ant_type))
-                                break;
-
-                        ret = iwl4965_rs_switch_to_mimo2(priv, lq_sta,
-                                                conf, sta,
-                                                 search_tbl, index);
-                        if (!ret)
-                                goto out;
-                        break;
-                case IWL_SISO_SWITCH_GI:
-                        if (!tbl->is_ht40 && !(ht_cap->cap &
-                                                IEEE80211_HT_CAP_SGI_20))
-                                break;
-                        if (tbl->is_ht40 && !(ht_cap->cap &
-                                                IEEE80211_HT_CAP_SGI_40))
-                                break;
-
-                        IWL_DEBUG_RATE(priv, "LQ: SISO toggle SGI/NGI\n");
-
-                        memcpy(search_tbl, tbl, sz);
-                        if (is_green) {
-                                if (!tbl->is_SGI)
-                                        break;
-                                else
-                                        IWL_ERR(priv,
-                                                "SGI was set in GF+SISO\n");
-                        }
-                        search_tbl->is_SGI = !tbl->is_SGI;
-                        iwl4965_rs_set_expected_tpt_table(lq_sta, search_tbl);
-                        if (tbl->is_SGI) {
-                                s32 tpt = lq_sta->last_tpt / 100;
-                                if (tpt >= search_tbl->expected_tpt[index])
-                                        break;
-                        }
-                        search_tbl->current_rate =
-                                iwl4965_rate_n_flags_from_tbl(priv, search_tbl,
-                                                      index, is_green);
-                        update_search_tbl_counter = 1;
-                        goto out;
-                }
-                tbl->action++;
-                if (tbl->action > IWL_SISO_SWITCH_GI)
-                        tbl->action = IWL_SISO_SWITCH_ANTENNA1;
-
-                if (tbl->action == start_action)
-                        break;
-        }
-        search_tbl->lq_type = LQ_NONE;
-        return 0;
-
- out:
-        lq_sta->search_better_tbl = 1;
-        tbl->action++;
-        if (tbl->action > IWL_SISO_SWITCH_GI)
-                tbl->action = IWL_SISO_SWITCH_ANTENNA1;
-        if (update_search_tbl_counter)
-                search_tbl->action = tbl->action;
-
-        return 0;
-}
-
-/*
- * Try to switch to new modulation mode from MIMO2
- */
-static int iwl4965_rs_move_mimo2_to_other(struct iwl_priv *priv,
-                                 struct iwl_lq_sta *lq_sta,
-                                 struct ieee80211_conf *conf,
-                                 struct ieee80211_sta *sta, int index)
-{
-        s8 is_green = lq_sta->is_green;
-        struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
-        struct iwl_scale_tbl_info *search_tbl =
-                                &(lq_sta->lq_info[(1 - lq_sta->active_tbl)]);
-        struct iwl_rate_scale_data *window = &(tbl->win[index]);
-        struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
-        u32 sz = (sizeof(struct iwl_scale_tbl_info) -
-                  (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
-        u8 start_action;
-        u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
-        u8 tx_chains_num = priv->hw_params.tx_chains_num;
-        u8 update_search_tbl_counter = 0;
-        int ret;
-
-        start_action = tbl->action;
-        for (;;) {
-                lq_sta->action_counter++;
-                switch (tbl->action) {
-                case IWL_MIMO2_SWITCH_ANTENNA1:
-                case IWL_MIMO2_SWITCH_ANTENNA2:
-                        IWL_DEBUG_RATE(priv, "LQ: MIMO2 toggle Antennas\n");
-
-                        if (tx_chains_num <= 2)
-                                break;
-
-                        if (window->success_ratio >= IWL_RS_GOOD_RATIO)
-                                break;
-
-                        memcpy(search_tbl, tbl, sz);
-                        if (iwl4965_rs_toggle_antenna(valid_tx_ant,
-                                       &search_tbl->current_rate, search_tbl)) {
-                                update_search_tbl_counter = 1;
-                                goto out;
-                        }
-                        break;
-                case IWL_MIMO2_SWITCH_SISO_A:
-                case IWL_MIMO2_SWITCH_SISO_B:
-                case IWL_MIMO2_SWITCH_SISO_C:
-                        IWL_DEBUG_RATE(priv, "LQ: MIMO2 switch to SISO\n");
-
-                        /* Set up new search table for SISO */
-                        memcpy(search_tbl, tbl, sz);
-
-                        if (tbl->action == IWL_MIMO2_SWITCH_SISO_A)
-                                search_tbl->ant_type = ANT_A;
-                        else if (tbl->action == IWL_MIMO2_SWITCH_SISO_B)
-                                search_tbl->ant_type = ANT_B;
-                        else
-                                search_tbl->ant_type = ANT_C;
-
-                        if (!iwl4965_rs_is_valid_ant(valid_tx_ant,
-                                                search_tbl->ant_type))
-                                break;
-
-                        ret = iwl4965_rs_switch_to_siso(priv, lq_sta,
-                                                conf, sta,
-                                                 search_tbl, index);
-                        if (!ret)
-                                goto out;
-
-                        break;
-
-                case IWL_MIMO2_SWITCH_GI:
-                        if (!tbl->is_ht40 && !(ht_cap->cap &
-                                                IEEE80211_HT_CAP_SGI_20))
-                                break;
-                        if (tbl->is_ht40 && !(ht_cap->cap &
-                                                IEEE80211_HT_CAP_SGI_40))
-                                break;
-
-                        IWL_DEBUG_RATE(priv, "LQ: MIMO2 toggle SGI/NGI\n");
-
-                        /* Set up new search table for MIMO2 */
-                        memcpy(search_tbl, tbl, sz);
-                        search_tbl->is_SGI = !tbl->is_SGI;
-                        iwl4965_rs_set_expected_tpt_table(lq_sta, search_tbl);
-                        /*
-                         * If active table already uses the fastest possible
-                         * modulation (dual stream with short guard interval),
-                         * and it's working well, there's no need to look
-                         * for a better type of modulation!
-                         */
-                        if (tbl->is_SGI) {
-                                s32 tpt = lq_sta->last_tpt / 100;
-                                if (tpt >= search_tbl->expected_tpt[index])
-                                        break;
-                        }
-                        search_tbl->current_rate =
-                                iwl4965_rate_n_flags_from_tbl(priv, search_tbl,
-                                                      index, is_green);
-                        update_search_tbl_counter = 1;
-                        goto out;
-
-                }
-                tbl->action++;
-                if (tbl->action > IWL_MIMO2_SWITCH_GI)
-                        tbl->action = IWL_MIMO2_SWITCH_ANTENNA1;
-
-                if (tbl->action == start_action)
-                        break;
-        }
-        search_tbl->lq_type = LQ_NONE;
-        return 0;
- out:
-        lq_sta->search_better_tbl = 1;
-        tbl->action++;
-        if (tbl->action > IWL_MIMO2_SWITCH_GI)
-                tbl->action = IWL_MIMO2_SWITCH_ANTENNA1;
-        if (update_search_tbl_counter)
-                search_tbl->action = tbl->action;
-
-        return 0;
-
-}
-
-/*
- * Check whether we should continue using same modulation mode, or
- * begin search for a new mode, based on:
- * 1) # tx successes or failures while using this mode
- * 2) # times calling this function
- * 3) elapsed time in this mode (not used, for now)
- */
-static void
-iwl4965_rs_stay_in_table(struct iwl_lq_sta *lq_sta, bool force_search)
-{
-        struct iwl_scale_tbl_info *tbl;
-        int i;
-        int active_tbl;
-        int flush_interval_passed = 0;
-        struct iwl_priv *priv;
-
-        priv = lq_sta->drv;
-        active_tbl = lq_sta->active_tbl;
-
-        tbl = &(lq_sta->lq_info[active_tbl]);
-
-        /* If we've been disallowing search, see if we should now allow it */
-        if (lq_sta->stay_in_tbl) {
-
-                /* Elapsed time using current modulation mode */
-                if (lq_sta->flush_timer)
-                        flush_interval_passed =
-                        time_after(jiffies,
-                                        (unsigned long)(lq_sta->flush_timer +
-                                        IWL_RATE_SCALE_FLUSH_INTVL));
-
-                /*
-                 * Check if we should allow search for new modulation mode.
-                 * If many frames have failed or succeeded, or we've used
-                 * this same modulation for a long time, allow search, and
-                 * reset history stats that keep track of whether we should
-                 * allow a new search.  Also (below) reset all bitmaps and
-                 * stats in active history.
-                 */
-                if (force_search ||
-                    (lq_sta->total_failed > lq_sta->max_failure_limit) ||
-                    (lq_sta->total_success > lq_sta->max_success_limit) ||
-                    ((!lq_sta->search_better_tbl) && (lq_sta->flush_timer)
-                     && (flush_interval_passed))) {
-                        IWL_DEBUG_RATE(priv, "LQ: stay is expired %d %d %d\n:",
-                                     lq_sta->total_failed,
-                                     lq_sta->total_success,
-                                     flush_interval_passed);
-
-                        /* Allow search for new mode */
-                        lq_sta->stay_in_tbl = 0;        /* only place reset */
-                        lq_sta->total_failed = 0;
-                        lq_sta->total_success = 0;
-                        lq_sta->flush_timer = 0;
-
-                /*
-                 * Else if we've used this modulation mode enough repetitions
-                 * (regardless of elapsed time or success/failure), reset
-                 * history bitmaps and rate-specific stats for all rates in
-                 * active table.
-                 */
-                } else {
-                        lq_sta->table_count++;
-                        if (lq_sta->table_count >=
-                            lq_sta->table_count_limit) {
-                                lq_sta->table_count = 0;
-
-                                IWL_DEBUG_RATE(priv,
-                                        "LQ: stay in table clear win\n");
-                                for (i = 0; i < IWL_RATE_COUNT; i++)
-                                        iwl4965_rs_rate_scale_clear_window(
-                                                &(tbl->win[i]));
-                        }
-                }
-
-                /* If transitioning to allow "search", reset all history
-                 * bitmaps and stats in active table (this will become the new
-                 * "search" table). */
-                if (!lq_sta->stay_in_tbl) {
-                        for (i = 0; i < IWL_RATE_COUNT; i++)
-                                iwl4965_rs_rate_scale_clear_window(
-                                                        &(tbl->win[i]));
-                }
-        }
-}
-
-/*
- * setup rate table in uCode
- * return rate_n_flags as used in the table
- */
-static u32 iwl4965_rs_update_rate_tbl(struct iwl_priv *priv,
-                              struct iwl_rxon_context *ctx,
-                                struct iwl_lq_sta *lq_sta,
-                                struct iwl_scale_tbl_info *tbl,
-                                int index, u8 is_green)
-{
-        u32 rate;
-
-        /* Update uCode's rate table. */
-        rate = iwl4965_rate_n_flags_from_tbl(priv, tbl, index, is_green);
-        iwl4965_rs_fill_link_cmd(priv, lq_sta, rate);
-        iwl_legacy_send_lq_cmd(priv, ctx, &lq_sta->lq, CMD_ASYNC, false);
-
-        return rate;
-}
-
-/*
- * Do rate scaling and search for new modulation mode.
- */
-static void iwl4965_rs_rate_scale_perform(struct iwl_priv *priv,
-                                  struct sk_buff *skb,
-                                  struct ieee80211_sta *sta,
-                                  struct iwl_lq_sta *lq_sta)
-{
-        struct ieee80211_hw *hw = priv->hw;
-        struct ieee80211_conf *conf = &hw->conf;
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-        int low = IWL_RATE_INVALID;
-        int high = IWL_RATE_INVALID;
-        int index;
-        int i;
-        struct iwl_rate_scale_data *window = NULL;
-        int current_tpt = IWL_INVALID_VALUE;
-        int low_tpt = IWL_INVALID_VALUE;
-        int high_tpt = IWL_INVALID_VALUE;
-        u32 fail_count;
-        s8 scale_action = 0;
-        u16 rate_mask;
-        u8 update_lq = 0;
-        struct iwl_scale_tbl_info *tbl, *tbl1;
-        u16 rate_scale_index_msk = 0;
-        u32 rate;
-        u8 is_green = 0;
-        u8 active_tbl = 0;
-        u8 done_search = 0;
-        u16 high_low;
-        s32 sr;
-        u8 tid = MAX_TID_COUNT;
-        struct iwl_tid_data *tid_data;
-        struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
-        struct iwl_rxon_context *ctx = sta_priv->common.ctx;
-
-        IWL_DEBUG_RATE(priv, "rate scale calculate new rate for skb\n");
-
-        /* Send management frames and NO_ACK data using lowest rate. */
-        /* TODO: this could probably be improved.. */
-        if (!ieee80211_is_data(hdr->frame_control) ||
-            info->flags & IEEE80211_TX_CTL_NO_ACK)
-                return;
-
-        if (!sta || !lq_sta)
-                return;
-
-        lq_sta->supp_rates = sta->supp_rates[lq_sta->band];
-
-        tid = iwl4965_rs_tl_add_packet(lq_sta, hdr);
-        if ((tid != MAX_TID_COUNT) && (lq_sta->tx_agg_tid_en & (1 << tid))) {
-                tid_data = &priv->stations[lq_sta->lq.sta_id].tid[tid];
-                if (tid_data->agg.state == IWL_AGG_OFF)
-                        lq_sta->is_agg = 0;
-                else
-                        lq_sta->is_agg = 1;
-        } else
-                lq_sta->is_agg = 0;
-
-        /*
-         * Select rate-scale / modulation-mode table to work with in
-         * the rest of this function:  "search" if searching for better
-         * modulation mode, or "active" if doing rate scaling within a mode.
-         */
-        if (!lq_sta->search_better_tbl)
-                active_tbl = lq_sta->active_tbl;
-        else
-                active_tbl = 1 - lq_sta->active_tbl;
-
-        tbl = &(lq_sta->lq_info[active_tbl]);
-        if (is_legacy(tbl->lq_type))
-                lq_sta->is_green = 0;
-        else
-                lq_sta->is_green = iwl4965_rs_use_green(sta);
-        is_green = lq_sta->is_green;
-
-        /* current tx rate */
-        index = lq_sta->last_txrate_idx;
-
-        IWL_DEBUG_RATE(priv, "Rate scale index %d for type %d\n", index,
-                       tbl->lq_type);
-
-        /* rates available for this association, and for modulation mode */
-        rate_mask = iwl4965_rs_get_supported_rates(lq_sta, hdr, tbl->lq_type);
-
-        IWL_DEBUG_RATE(priv, "mask 0x%04X\n", rate_mask);
-
-        /* mask with station rate restriction */
-        if (is_legacy(tbl->lq_type)) {
-                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));
-                else
-                        rate_scale_index_msk = (u16) (rate_mask &
-                                                      lq_sta->supp_rates);
-
-        } else
-                rate_scale_index_msk = rate_mask;
-
-        if (!rate_scale_index_msk)
-                rate_scale_index_msk = rate_mask;
-
-        if (!((1 << index) & rate_scale_index_msk)) {
-                IWL_ERR(priv, "Current Rate is not valid\n");
-                if (lq_sta->search_better_tbl) {
-                        /* revert to active table if search table is not valid*/
-                        tbl->lq_type = LQ_NONE;
-                        lq_sta->search_better_tbl = 0;
-                        tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
-                        /* get "active" rate info */
-                        index = iwl4965_hwrate_to_plcp_idx(tbl->current_rate);
-                        rate = iwl4965_rs_update_rate_tbl(priv, ctx, lq_sta,
-                                                  tbl, index, is_green);
-                }
-                return;
-        }
-
-        /* Get expected throughput table and history window for current rate */
-        if (!tbl->expected_tpt) {
-                IWL_ERR(priv, "tbl->expected_tpt is NULL\n");
-                return;
-        }
-
-        /* force user max rate if set by user */
-        if ((lq_sta->max_rate_idx != -1) &&
-            (lq_sta->max_rate_idx < index)) {
-                index = lq_sta->max_rate_idx;
-                update_lq = 1;
-                window = &(tbl->win[index]);
-                goto lq_update;
-        }
-
-        window = &(tbl->win[index]);
-
-        /*
-         * If there is not enough history to calculate actual average
-         * throughput, keep analyzing results of more tx frames, without
-         * changing rate or mode (bypass most of the rest of this function).
-         * Set up new rate table in uCode only if old rate is not supported
-         * in current association (use new rate found above).
-         */
-        fail_count = window->counter - window->success_counter;
-        if ((fail_count < IWL_RATE_MIN_FAILURE_TH) &&
-                        (window->success_counter < IWL_RATE_MIN_SUCCESS_TH)) {
-                IWL_DEBUG_RATE(priv, "LQ: still below TH. succ=%d total=%d "
-                               "for index %d\n",
-                               window->success_counter, window->counter, index);
-
-                /* Can't calculate this yet; not enough history */
-                window->average_tpt = IWL_INVALID_VALUE;
-
-                /* Should we stay with this modulation mode,
-                 * or search for a new one? */
-                iwl4965_rs_stay_in_table(lq_sta, false);
-
-                goto out;
-        }
-        /* Else we have enough samples; calculate estimate of
-         * actual average throughput */
-        if (window->average_tpt != ((window->success_ratio *
-                        tbl->expected_tpt[index] + 64) / 128)) {
-                IWL_ERR(priv,
-                         "expected_tpt should have been calculated by now\n");
-                window->average_tpt = ((window->success_ratio *
-                                        tbl->expected_tpt[index] + 64) / 128);
-        }
-
-        /* If we are searching for better modulation mode, check success. */
-        if (lq_sta->search_better_tbl) {
-                /* If good success, continue using the "search" mode;
-                 * no need to send new link quality command, since we're
-                 * continuing to use the setup that we've been trying. */
-                if (window->average_tpt > lq_sta->last_tpt) {
-
-                        IWL_DEBUG_RATE(priv, "LQ: SWITCHING TO NEW TABLE "
-                                        "suc=%d cur-tpt=%d old-tpt=%d\n",
-                                        window->success_ratio,
-                                        window->average_tpt,
-                                        lq_sta->last_tpt);
-
-                        if (!is_legacy(tbl->lq_type))
-                                lq_sta->enable_counter = 1;
-
-                        /* Swap tables; "search" becomes "active" */
-                        lq_sta->active_tbl = active_tbl;
-                        current_tpt = window->average_tpt;
-
-                /* Else poor success; go back to mode in "active" table */
-                } else {
-
-                        IWL_DEBUG_RATE(priv, "LQ: GOING BACK TO THE OLD TABLE "
-                                        "suc=%d cur-tpt=%d old-tpt=%d\n",
-                                        window->success_ratio,
-                                        window->average_tpt,
-                                        lq_sta->last_tpt);
-
-                        /* Nullify "search" table */
-                        tbl->lq_type = LQ_NONE;
-
-                        /* Revert to "active" table */
-                        active_tbl = lq_sta->active_tbl;
-                        tbl = &(lq_sta->lq_info[active_tbl]);
-
-                        /* Revert to "active" rate and throughput info */
-                        index = iwl4965_hwrate_to_plcp_idx(tbl->current_rate);
-                        current_tpt = lq_sta->last_tpt;
-
-                        /* Need to set up a new rate table in uCode */
-                        update_lq = 1;
-                }
-
-                /* Either way, we've made a decision; modulation mode
-                 * search is done, allow rate adjustment next time. */
-                lq_sta->search_better_tbl = 0;
-                done_search = 1;        /* Don't switch modes below! */
-                goto lq_update;
-        }
-
-        /* (Else) not in search of better modulation mode, try for better
-         * starting rate, while staying in this mode. */
-        high_low = iwl4965_rs_get_adjacent_rate(priv, index,
-                                        rate_scale_index_msk,
-                                        tbl->lq_type);
-        low = high_low & 0xff;
-        high = (high_low >> 8) & 0xff;
-
-        /* If user set max rate, dont allow higher than user constrain */
-        if ((lq_sta->max_rate_idx != -1) &&
-            (lq_sta->max_rate_idx < high))
-                high = IWL_RATE_INVALID;
-
-        sr = window->success_ratio;
-
-        /* Collect measured throughputs for current and adjacent rates */
-        current_tpt = window->average_tpt;
-        if (low != IWL_RATE_INVALID)
-                low_tpt = tbl->win[low].average_tpt;
-        if (high != IWL_RATE_INVALID)
-                high_tpt = tbl->win[high].average_tpt;
-
-        scale_action = 0;
-
-        /* Too many failures, decrease rate */
-        if ((sr <= IWL_RATE_DECREASE_TH) || (current_tpt == 0)) {
-                IWL_DEBUG_RATE(priv,
-                        "decrease rate because of low success_ratio\n");
-                scale_action = -1;
-
-        /* No throughput measured yet for adjacent rates; try increase. */
-        } else if ((low_tpt == IWL_INVALID_VALUE) &&
-                   (high_tpt == IWL_INVALID_VALUE)) {
-
-                if (high != IWL_RATE_INVALID && sr >= IWL_RATE_INCREASE_TH)
-                        scale_action = 1;
-                else if (low != IWL_RATE_INVALID)
-                        scale_action = 0;
-        }
-
-        /* Both adjacent throughputs are measured, but neither one has better
-         * throughput; we're using the best rate, don't change it! */
-        else if ((low_tpt != IWL_INVALID_VALUE) &&
-                 (high_tpt != IWL_INVALID_VALUE) &&
-                 (low_tpt < current_tpt) &&
-                 (high_tpt < current_tpt))
-                scale_action = 0;
-
-        /* At least one adjacent rate's throughput is measured,
-         * and may have better performance. */
-        else {
-                /* Higher adjacent rate's throughput is measured */
-                if (high_tpt != IWL_INVALID_VALUE) {
-                        /* Higher rate has better throughput */
-                        if (high_tpt > current_tpt &&
-                                        sr >= IWL_RATE_INCREASE_TH) {
-                                scale_action = 1;
-                        } else {
-                                scale_action = 0;
-                        }
-
-                /* Lower adjacent rate's throughput is measured */
-                } else if (low_tpt != IWL_INVALID_VALUE) {
-                        /* Lower rate has better throughput */
-                        if (low_tpt > current_tpt) {
-                                IWL_DEBUG_RATE(priv,
-                                    "decrease rate because of low tpt\n");
-                                scale_action = -1;
-                        } else if (sr >= IWL_RATE_INCREASE_TH) {
-                                scale_action = 1;
-                        }
-                }
-        }
-
-        /* Sanity check; asked for decrease, but success rate or throughput
-         * has been good at old rate.  Don't change it. */
-        if ((scale_action == -1) && (low != IWL_RATE_INVALID) &&
-                    ((sr > IWL_RATE_HIGH_TH) ||
-                     (current_tpt > (100 * tbl->expected_tpt[low]))))
-                scale_action = 0;
-
-        switch (scale_action) {
-        case -1:
-                /* Decrease starting rate, update uCode's rate table */
-                if (low != IWL_RATE_INVALID) {
-                        update_lq = 1;
-                        index = low;
-                }
-
-                break;
-        case 1:
-                /* Increase starting rate, update uCode's rate table */
-                if (high != IWL_RATE_INVALID) {
-                        update_lq = 1;
-                        index = high;
-                }
-
-                break;
-        case 0:
-                /* No change */
-        default:
-                break;
-        }
-
-        IWL_DEBUG_RATE(priv, "choose rate scale index %d action %d low %d "
-                    "high %d type %d\n",
-                     index, scale_action, low, high, tbl->lq_type);
-
-lq_update:
-        /* Replace uCode's rate table for the destination station. */
-        if (update_lq)
-                rate = iwl4965_rs_update_rate_tbl(priv, ctx, lq_sta,
-                                          tbl, index, is_green);
-
-        /* Should we stay with this modulation mode,
-         * or search for a new one? */
-         iwl4965_rs_stay_in_table(lq_sta, false);
-
-        /*
-         * Search for new modulation mode if we're:
-         * 1)  Not changing rates right now
-         * 2)  Not just finishing up a search
-         * 3)  Allowing a new search
-         */
-        if (!update_lq && !done_search &&
-                !lq_sta->stay_in_tbl && window->counter) {
-                /* Save current throughput to compare with "search" throughput*/
-                lq_sta->last_tpt = current_tpt;
-
-                /* Select a new "search" modulation mode to try.
-                 * If one is found, set up the new "search" table. */
-                if (is_legacy(tbl->lq_type))
-                        iwl4965_rs_move_legacy_other(priv, lq_sta,
-                                                        conf, sta, index);
-                else if (is_siso(tbl->lq_type))
-                        iwl4965_rs_move_siso_to_other(priv, lq_sta,
-                                                        conf, sta, index);
-                else /* (is_mimo2(tbl->lq_type)) */
-                        iwl4965_rs_move_mimo2_to_other(priv, lq_sta,
-                                                        conf, sta, index);
-
-                /* If new "search" mode was selected, set up in uCode table */
-                if (lq_sta->search_better_tbl) {
-                        /* Access the "search" table, clear its history. */
-                        tbl = &(lq_sta->lq_info[(1 - lq_sta->active_tbl)]);
-                        for (i = 0; i < IWL_RATE_COUNT; i++)
-                                iwl4965_rs_rate_scale_clear_window(
-                                                        &(tbl->win[i]));
-
-                        /* Use new "search" start rate */
-                        index = iwl4965_hwrate_to_plcp_idx(tbl->current_rate);
-
-                        IWL_DEBUG_RATE(priv,
-                                "Switch current  mcs: %X index: %d\n",
-                                     tbl->current_rate, index);
-                        iwl4965_rs_fill_link_cmd(priv, lq_sta,
-                                                tbl->current_rate);
-                        iwl_legacy_send_lq_cmd(priv, ctx,
-                                                &lq_sta->lq, CMD_ASYNC, false);
-                } else
-                        done_search = 1;
-        }
-
-        if (done_search && !lq_sta->stay_in_tbl) {
-                /* If the "active" (non-search) mode was legacy,
-                 * and we've tried switching antennas,
-                 * but we haven't been able to try HT modes (not available),
-                 * stay with best antenna legacy modulation for a while
-                 * before next round of mode comparisons. */
-                tbl1 = &(lq_sta->lq_info[lq_sta->active_tbl]);
-                if (is_legacy(tbl1->lq_type) && !conf_is_ht(conf) &&
-                    lq_sta->action_counter > tbl1->max_search) {
-                        IWL_DEBUG_RATE(priv, "LQ: STAY in legacy table\n");
-                        iwl4965_rs_set_stay_in_table(priv, 1, lq_sta);
-                }
-
-                /* If we're in an HT mode, and all 3 mode switch actions
-                 * have been tried and compared, stay in this best modulation
-                 * mode for a while before next round of mode comparisons. */
-                if (lq_sta->enable_counter &&
-                    (lq_sta->action_counter >= tbl1->max_search)) {
-                        if ((lq_sta->last_tpt > IWL_AGG_TPT_THREHOLD) &&
-                            (lq_sta->tx_agg_tid_en & (1 << tid)) &&
-                            (tid != MAX_TID_COUNT)) {
-                                tid_data =
-                                   &priv->stations[lq_sta->lq.sta_id].tid[tid];
-                                if (tid_data->agg.state == IWL_AGG_OFF) {
-                                        IWL_DEBUG_RATE(priv,
-                                                       "try to aggregate tid %d\n",
-                                                       tid);
-                                        iwl4965_rs_tl_turn_on_agg(priv, tid,
-                                                          lq_sta, sta);
-                                }
-                        }
-                        iwl4965_rs_set_stay_in_table(priv, 0, lq_sta);
-                }
-        }
-
-out:
-        tbl->current_rate = iwl4965_rate_n_flags_from_tbl(priv, tbl,
-                                                        index, is_green);
-        i = index;
-        lq_sta->last_txrate_idx = i;
-}
-
-/**
- * iwl4965_rs_initialize_lq - Initialize a station's hardware rate table
- *
- * The uCode's station table contains a table of fallback rates
- * for automatic fallback during transmission.
- *
- * NOTE: This sets up a default set of values.  These will be replaced later
- *       if the driver's iwl-4965-rs rate scaling algorithm is used, instead of
- *       rc80211_simple.
- *
- * NOTE: Run REPLY_ADD_STA command to set up station table entry, before
- *       calling this function (which runs REPLY_TX_LINK_QUALITY_CMD,
- *       which requires station table entry to exist).
- */
-static void iwl4965_rs_initialize_lq(struct iwl_priv *priv,
-                             struct ieee80211_conf *conf,
-                             struct ieee80211_sta *sta,
-                             struct iwl_lq_sta *lq_sta)
-{
-        struct iwl_scale_tbl_info *tbl;
-        int rate_idx;
-        int i;
-        u32 rate;
-        u8 use_green = iwl4965_rs_use_green(sta);
-        u8 active_tbl = 0;
-        u8 valid_tx_ant;
-        struct iwl_station_priv *sta_priv;
-        struct iwl_rxon_context *ctx;
-
-        if (!sta || !lq_sta)
-                return;
-
-        sta_priv = (void *)sta->drv_priv;
-        ctx = sta_priv->common.ctx;
-
-        i = lq_sta->last_txrate_idx;
-
-        valid_tx_ant = priv->hw_params.valid_tx_ant;
-
-        if (!lq_sta->search_better_tbl)
-                active_tbl = lq_sta->active_tbl;
-        else
-                active_tbl = 1 - lq_sta->active_tbl;
-
-        tbl = &(lq_sta->lq_info[active_tbl]);
-
-        if ((i < 0) || (i >= IWL_RATE_COUNT))
-                i = 0;
-
-        rate = iwlegacy_rates[i].plcp;
-        tbl->ant_type = iwl4965_first_antenna(valid_tx_ant);
-        rate |= tbl->ant_type << RATE_MCS_ANT_POS;
-
-        if (i >= IWL_FIRST_CCK_RATE && i <= IWL_LAST_CCK_RATE)
-                rate |= RATE_MCS_CCK_MSK;
-
-        iwl4965_rs_get_tbl_info_from_mcs(rate, priv->band, tbl, &rate_idx);
-        if (!iwl4965_rs_is_valid_ant(valid_tx_ant, tbl->ant_type))
-                iwl4965_rs_toggle_antenna(valid_tx_ant, &rate, tbl);
-
-        rate = iwl4965_rate_n_flags_from_tbl(priv, tbl, rate_idx, use_green);
-        tbl->current_rate = rate;
-        iwl4965_rs_set_expected_tpt_table(lq_sta, tbl);
-        iwl4965_rs_fill_link_cmd(NULL, lq_sta, rate);
-        priv->stations[lq_sta->lq.sta_id].lq = &lq_sta->lq;
-        iwl_legacy_send_lq_cmd(priv, ctx, &lq_sta->lq, CMD_SYNC, true);
-}
-
-static void
-iwl4965_rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta,
-                        struct ieee80211_tx_rate_control *txrc)
-{
-
-        struct sk_buff *skb = txrc->skb;
-        struct ieee80211_supported_band *sband = txrc->sband;
-        struct iwl_priv *priv __maybe_unused = (struct iwl_priv *)priv_r;
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-        struct iwl_lq_sta *lq_sta = priv_sta;
-        int rate_idx;
-
-        IWL_DEBUG_RATE_LIMIT(priv, "rate scale calculate new rate for skb\n");
-
-        /* Get max rate if user set max rate */
-        if (lq_sta) {
-                lq_sta->max_rate_idx = txrc->max_rate_idx;
-                if ((sband->band == IEEE80211_BAND_5GHZ) &&
-                    (lq_sta->max_rate_idx != -1))
-                        lq_sta->max_rate_idx += IWL_FIRST_OFDM_RATE;
-                if ((lq_sta->max_rate_idx < 0) ||
-                    (lq_sta->max_rate_idx >= IWL_RATE_COUNT))
-                        lq_sta->max_rate_idx = -1;
-        }
-
-        /* Treat uninitialized rate scaling data same as non-existing. */
-        if (lq_sta && !lq_sta->drv) {
-                IWL_DEBUG_RATE(priv, "Rate scaling not initialized yet.\n");
-                priv_sta = NULL;
-        }
-
-        /* Send management frames and NO_ACK data using lowest rate. */
-        if (rate_control_send_low(sta, priv_sta, txrc))
-                return;
-
-        if (!lq_sta)
-                return;
-
-        rate_idx  = lq_sta->last_txrate_idx;
-
-        if (lq_sta->last_rate_n_flags & RATE_MCS_HT_MSK) {
-                rate_idx -= IWL_FIRST_OFDM_RATE;
-                /* 6M and 9M shared same MCS index */
-                rate_idx = (rate_idx > 0) ? (rate_idx - 1) : 0;
-                if (iwl4965_rs_extract_rate(lq_sta->last_rate_n_flags) >=
-                         IWL_RATE_MIMO2_6M_PLCP)
-                        rate_idx = rate_idx + MCS_INDEX_PER_STREAM;
-                info->control.rates[0].flags = IEEE80211_TX_RC_MCS;
-                if (lq_sta->last_rate_n_flags & RATE_MCS_SGI_MSK)
-                        info->control.rates[0].flags |=
-                                        IEEE80211_TX_RC_SHORT_GI;
-                if (lq_sta->last_rate_n_flags & RATE_MCS_DUP_MSK)
-                        info->control.rates[0].flags |=
-                                        IEEE80211_TX_RC_DUP_DATA;
-                if (lq_sta->last_rate_n_flags & RATE_MCS_HT40_MSK)
-                        info->control.rates[0].flags |=
-                                        IEEE80211_TX_RC_40_MHZ_WIDTH;
-                if (lq_sta->last_rate_n_flags & RATE_MCS_GF_MSK)
-                        info->control.rates[0].flags |=
-                                        IEEE80211_TX_RC_GREEN_FIELD;
-        } else {
-                /* Check for invalid rates */
-                if ((rate_idx < 0) || (rate_idx >= IWL_RATE_COUNT_LEGACY) ||
-                                ((sband->band == IEEE80211_BAND_5GHZ) &&
-                                 (rate_idx < IWL_FIRST_OFDM_RATE)))
-                        rate_idx = rate_lowest_index(sband, sta);
-                /* On valid 5 GHz rate, adjust index */
-                else if (sband->band == IEEE80211_BAND_5GHZ)
-                        rate_idx -= IWL_FIRST_OFDM_RATE;
-                info->control.rates[0].flags = 0;
-        }
-        info->control.rates[0].idx = rate_idx;
-
-}
-
-static void *iwl4965_rs_alloc_sta(void *priv_rate, struct ieee80211_sta *sta,
-                          gfp_t gfp)
-{
-        struct iwl_lq_sta *lq_sta;
-        struct iwl_station_priv *sta_priv =
-                                (struct iwl_station_priv *) sta->drv_priv;
-        struct iwl_priv *priv;
-
-        priv = (struct iwl_priv *)priv_rate;
-        IWL_DEBUG_RATE(priv, "create station rate scale window\n");
-
-        lq_sta = &sta_priv->lq_sta;
-
-        return lq_sta;
-}
-
-/*
- * Called after adding a new station to initialize rate scaling
- */
-void
-iwl4965_rs_rate_init(struct iwl_priv *priv,
-                        struct ieee80211_sta *sta,
-                        u8 sta_id)
-{
-        int i, j;
-        struct ieee80211_hw *hw = priv->hw;
-        struct ieee80211_conf *conf = &priv->hw->conf;
-        struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
-        struct iwl_station_priv *sta_priv;
-        struct iwl_lq_sta *lq_sta;
-        struct ieee80211_supported_band *sband;
-
-        sta_priv = (struct iwl_station_priv *) sta->drv_priv;
-        lq_sta = &sta_priv->lq_sta;
-        sband = hw->wiphy->bands[conf->channel->band];
-
-
-        lq_sta->lq.sta_id = sta_id;
-
-        for (j = 0; j < LQ_SIZE; j++)
-                for (i = 0; i < IWL_RATE_COUNT; i++)
-                        iwl4965_rs_rate_scale_clear_window(
-                                        &lq_sta->lq_info[j].win[i]);
-
-        lq_sta->flush_timer = 0;
-        lq_sta->supp_rates = sta->supp_rates[sband->band];
-        for (j = 0; j < LQ_SIZE; j++)
-                for (i = 0; i < IWL_RATE_COUNT; i++)
-                        iwl4965_rs_rate_scale_clear_window(
-                                        &lq_sta->lq_info[j].win[i]);
-
-        IWL_DEBUG_RATE(priv, "LQ:"
-                        "*** rate scale station global init for station %d ***\n",
-                       sta_id);
-        /* TODO: what is a good starting rate for STA? About middle? Maybe not
-         * the lowest or the highest rate.. Could consider using RSSI from
-         * previous packets? Need to have IEEE 802.1X auth succeed immediately
-         * after assoc.. */
-
-        lq_sta->is_dup = 0;
-        lq_sta->max_rate_idx = -1;
-        lq_sta->missed_rate_counter = IWL_MISSED_RATE_MAX;
-        lq_sta->is_green = iwl4965_rs_use_green(sta);
-        lq_sta->active_legacy_rate = priv->active_rate & ~(0x1000);
-        lq_sta->band = priv->band;
-        /*
-         * active_siso_rate mask includes 9 MBits (bit 5), and CCK (bits 0-3),
-         * supp_rates[] does not; shift to convert format, force 9 MBits off.
-         */
-        lq_sta->active_siso_rate = ht_cap->mcs.rx_mask[0] << 1;
-        lq_sta->active_siso_rate |= ht_cap->mcs.rx_mask[0] & 0x1;
-        lq_sta->active_siso_rate &= ~((u16)0x2);
-        lq_sta->active_siso_rate <<= IWL_FIRST_OFDM_RATE;
-
-        /* Same here */
-        lq_sta->active_mimo2_rate = ht_cap->mcs.rx_mask[1] << 1;
-        lq_sta->active_mimo2_rate |= ht_cap->mcs.rx_mask[1] & 0x1;
-        lq_sta->active_mimo2_rate &= ~((u16)0x2);
-        lq_sta->active_mimo2_rate <<= IWL_FIRST_OFDM_RATE;
-
-        /* These values will be overridden later */
-        lq_sta->lq.general_params.single_stream_ant_msk =
-                iwl4965_first_antenna(priv->hw_params.valid_tx_ant);
-        lq_sta->lq.general_params.dual_stream_ant_msk =
-                priv->hw_params.valid_tx_ant &
-                ~iwl4965_first_antenna(priv->hw_params.valid_tx_ant);
-        if (!lq_sta->lq.general_params.dual_stream_ant_msk) {
-                lq_sta->lq.general_params.dual_stream_ant_msk = ANT_AB;
-        } else if (iwl4965_num_of_ant(priv->hw_params.valid_tx_ant) == 2) {
-                lq_sta->lq.general_params.dual_stream_ant_msk =
-                        priv->hw_params.valid_tx_ant;
-        }
-
-        /* as default allow aggregation for all tids */
-        lq_sta->tx_agg_tid_en = IWL_AGG_ALL_TID;
-        lq_sta->drv = priv;
-
-        /* Set last_txrate_idx to lowest rate */
-        lq_sta->last_txrate_idx = rate_lowest_index(sband, sta);
-        if (sband->band == IEEE80211_BAND_5GHZ)
-                lq_sta->last_txrate_idx += IWL_FIRST_OFDM_RATE;
-        lq_sta->is_agg = 0;
-
-#ifdef CONFIG_MAC80211_DEBUGFS
-        lq_sta->dbg_fixed_rate = 0;
-#endif
-
-        iwl4965_rs_initialize_lq(priv, conf, sta, lq_sta);
-}
-
-static void iwl4965_rs_fill_link_cmd(struct iwl_priv *priv,
-                             struct iwl_lq_sta *lq_sta, u32 new_rate)
-{
-        struct iwl_scale_tbl_info tbl_type;
-        int index = 0;
-        int rate_idx;
-        int repeat_rate = 0;
-        u8 ant_toggle_cnt = 0;
-        u8 use_ht_possible = 1;
-        u8 valid_tx_ant = 0;
-        struct iwl_link_quality_cmd *lq_cmd = &lq_sta->lq;
-
-        /* Override starting rate (index 0) if needed for debug purposes */
-        iwl4965_rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
-
-        /* Interpret new_rate (rate_n_flags) */
-        iwl4965_rs_get_tbl_info_from_mcs(new_rate, lq_sta->band,
-                                  &tbl_type, &rate_idx);
-
-        /* How many times should we repeat the initial rate? */
-        if (is_legacy(tbl_type.lq_type)) {
-                ant_toggle_cnt = 1;
-                repeat_rate = IWL_NUMBER_TRY;
-        } else {
-                repeat_rate = IWL_HT_NUMBER_TRY;
-        }
-
-        lq_cmd->general_params.mimo_delimiter =
-                        is_mimo(tbl_type.lq_type) ? 1 : 0;
-
-        /* Fill 1st table entry (index 0) */
-        lq_cmd->rs_table[index].rate_n_flags = cpu_to_le32(new_rate);
-
-        if (iwl4965_num_of_ant(tbl_type.ant_type) == 1) {
-                lq_cmd->general_params.single_stream_ant_msk =
-                                                tbl_type.ant_type;
-        } else if (iwl4965_num_of_ant(tbl_type.ant_type) == 2) {
-                lq_cmd->general_params.dual_stream_ant_msk =
-                                                tbl_type.ant_type;
-        } /* otherwise we don't modify the existing value */
-
-        index++;
-        repeat_rate--;
-        if (priv)
-                valid_tx_ant = priv->hw_params.valid_tx_ant;
-
-        /* Fill rest of rate table */
-        while (index < LINK_QUAL_MAX_RETRY_NUM) {
-                /* Repeat initial/next rate.
-                 * For legacy IWL_NUMBER_TRY == 1, this loop will not execute.
-                 * For HT IWL_HT_NUMBER_TRY == 3, this executes twice. */
-                while (repeat_rate > 0 && (index < LINK_QUAL_MAX_RETRY_NUM)) {
-                        if (is_legacy(tbl_type.lq_type)) {
-                                if (ant_toggle_cnt < NUM_TRY_BEFORE_ANT_TOGGLE)
-                                        ant_toggle_cnt++;
-                                else if (priv &&
-                                         iwl4965_rs_toggle_antenna(valid_tx_ant,
-                                                        &new_rate, &tbl_type))
-                                        ant_toggle_cnt = 1;
-                        }
-
-                        /* Override next rate if needed for debug purposes */
-                        iwl4965_rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
-
-                        /* Fill next table entry */
-                        lq_cmd->rs_table[index].rate_n_flags =
-                                        cpu_to_le32(new_rate);
-                        repeat_rate--;
-                        index++;
-                }
-
-                iwl4965_rs_get_tbl_info_from_mcs(new_rate,
-                                                lq_sta->band, &tbl_type,
-                                                &rate_idx);
-
-                /* Indicate to uCode which entries might be MIMO.
-                 * If initial rate was MIMO, this will finally end up
-                 * as (IWL_HT_NUMBER_TRY * 2), after 2nd pass, otherwise 0. */
-                if (is_mimo(tbl_type.lq_type))
-                        lq_cmd->general_params.mimo_delimiter = index;
-
-                /* Get next rate */
-                new_rate = iwl4965_rs_get_lower_rate(lq_sta,
-                                        &tbl_type, rate_idx,
-                                             use_ht_possible);
-
-                /* How many times should we repeat the next rate? */
-                if (is_legacy(tbl_type.lq_type)) {
-                        if (ant_toggle_cnt < NUM_TRY_BEFORE_ANT_TOGGLE)
-                                ant_toggle_cnt++;
-                        else if (priv &&
-                                 iwl4965_rs_toggle_antenna(valid_tx_ant,
-                                                   &new_rate, &tbl_type))
-                                ant_toggle_cnt = 1;
-
-                        repeat_rate = IWL_NUMBER_TRY;
-                } else {
-                        repeat_rate = IWL_HT_NUMBER_TRY;
-                }
-
-                /* Don't allow HT rates after next pass.
-                 * iwl4965_rs_get_lower_rate() will change type to LQ_A or LQ_G. */
-                use_ht_possible = 0;
-
-                /* Override next rate if needed for debug purposes */
-                iwl4965_rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
-
-                /* Fill next table entry */
-                lq_cmd->rs_table[index].rate_n_flags = cpu_to_le32(new_rate);
-
-                index++;
-                repeat_rate--;
-        }
-
-        lq_cmd->agg_params.agg_frame_cnt_limit = LINK_QUAL_AGG_FRAME_LIMIT_DEF;
-        lq_cmd->agg_params.agg_dis_start_th = LINK_QUAL_AGG_DISABLE_START_DEF;
-
-        lq_cmd->agg_params.agg_time_limit =
-                cpu_to_le16(LINK_QUAL_AGG_TIME_LIMIT_DEF);
-}
-
-static void
-*iwl4965_rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
-{
-        return hw->priv;
-}
-/* rate scale requires free function to be implemented */
-static void iwl4965_rs_free(void *priv_rate)
-{
-        return;
-}
-
-static void iwl4965_rs_free_sta(void *priv_r, struct ieee80211_sta *sta,
-                        void *priv_sta)
-{
-        struct iwl_priv *priv __maybe_unused = priv_r;
-
-        IWL_DEBUG_RATE(priv, "enter\n");
-        IWL_DEBUG_RATE(priv, "leave\n");
-}
-
-
-#ifdef CONFIG_MAC80211_DEBUGFS
-static int iwl4965_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-static void iwl4965_rs_dbgfs_set_mcs(struct iwl_lq_sta *lq_sta,
-                             u32 *rate_n_flags, int index)
-{
-        struct iwl_priv *priv;
-        u8 valid_tx_ant;
-        u8 ant_sel_tx;
-
-        priv = lq_sta->drv;
-        valid_tx_ant = priv->hw_params.valid_tx_ant;
-        if (lq_sta->dbg_fixed_rate) {
-                ant_sel_tx =
-                  ((lq_sta->dbg_fixed_rate & RATE_MCS_ANT_ABC_MSK)
-                  >> RATE_MCS_ANT_POS);
-                if ((valid_tx_ant & ant_sel_tx) == ant_sel_tx) {
-                        *rate_n_flags = lq_sta->dbg_fixed_rate;
-                        IWL_DEBUG_RATE(priv, "Fixed rate ON\n");
-                } else {
-                        lq_sta->dbg_fixed_rate = 0;
-                        IWL_ERR(priv,
-                            "Invalid antenna selection 0x%X, Valid is 0x%X\n",
-                            ant_sel_tx, valid_tx_ant);
-                        IWL_DEBUG_RATE(priv, "Fixed rate OFF\n");
-                }
-        } else {
-                IWL_DEBUG_RATE(priv, "Fixed rate OFF\n");
-        }
-}
-
-static ssize_t iwl4965_rs_sta_dbgfs_scale_table_write(struct file *file,
-                        const char __user *user_buf, size_t count, loff_t *ppos)
-{
-        struct iwl_lq_sta *lq_sta = file->private_data;
-        struct iwl_priv *priv;
-        char buf[64];
-        size_t buf_size;
-        u32 parsed_rate;
-        struct iwl_station_priv *sta_priv =
-                container_of(lq_sta, struct iwl_station_priv, lq_sta);
-        struct iwl_rxon_context *ctx = sta_priv->common.ctx;
-
-        priv = lq_sta->drv;
-        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", &parsed_rate) == 1)
-                lq_sta->dbg_fixed_rate = parsed_rate;
-        else
-                lq_sta->dbg_fixed_rate = 0;
-
-        lq_sta->active_legacy_rate = 0x0FFF;    /* 1 - 54 MBits, includes CCK */
-        lq_sta->active_siso_rate   = 0x1FD0;    /* 6 - 60 MBits, no 9, no CCK */
-        lq_sta->active_mimo2_rate  = 0x1FD0;    /* 6 - 60 MBits, no 9, no CCK */
-
-        IWL_DEBUG_RATE(priv, "sta_id %d rate 0x%X\n",
-                lq_sta->lq.sta_id, lq_sta->dbg_fixed_rate);
-
-        if (lq_sta->dbg_fixed_rate) {
-                iwl4965_rs_fill_link_cmd(NULL, lq_sta, lq_sta->dbg_fixed_rate);
-                iwl_legacy_send_lq_cmd(lq_sta->drv, ctx, &lq_sta->lq, CMD_ASYNC,
-                                false);
-        }
-
-        return count;
-}
-
-static ssize_t iwl4965_rs_sta_dbgfs_scale_table_read(struct file *file,
-                        char __user *user_buf, size_t count, loff_t *ppos)
-{
-        char *buff;
-        int desc = 0;
-        int i = 0;
-        int index = 0;
-        ssize_t ret;
-
-        struct iwl_lq_sta *lq_sta = file->private_data;
-        struct iwl_priv *priv;
-        struct iwl_scale_tbl_info *tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
-
-        priv = lq_sta->drv;
-        buff = kmalloc(1024, GFP_KERNEL);
-        if (!buff)
-                return -ENOMEM;
-
-        desc += sprintf(buff+desc, "sta_id %d\n", lq_sta->lq.sta_id);
-        desc += sprintf(buff+desc, "failed=%d success=%d rate=0%X\n",
-                        lq_sta->total_failed, lq_sta->total_success,
-                        lq_sta->active_legacy_rate);
-        desc += sprintf(buff+desc, "fixed rate 0x%X\n",
-                        lq_sta->dbg_fixed_rate);
-        desc += sprintf(buff+desc, "valid_tx_ant %s%s%s\n",
-            (priv->hw_params.valid_tx_ant & ANT_A) ? "ANT_A," : "",
-            (priv->hw_params.valid_tx_ant & ANT_B) ? "ANT_B," : "",
-            (priv->hw_params.valid_tx_ant & ANT_C) ? "ANT_C" : "");
-        desc += sprintf(buff+desc, "lq type %s\n",
-           (is_legacy(tbl->lq_type)) ? "legacy" : "HT");
-        if (is_Ht(tbl->lq_type)) {
-                desc += sprintf(buff+desc, " %s",
-                   (is_siso(tbl->lq_type)) ? "SISO" : "MIMO2");
-                   desc += sprintf(buff+desc, " %s",
-                   (tbl->is_ht40) ? "40MHz" : "20MHz");
-                   desc += sprintf(buff+desc, " %s %s %s\n",
-                        (tbl->is_SGI) ? "SGI" : "",
-                   (lq_sta->is_green) ? "GF enabled" : "",
-                   (lq_sta->is_agg) ? "AGG on" : "");
-        }
-        desc += sprintf(buff+desc, "last tx rate=0x%X\n",
-                lq_sta->last_rate_n_flags);
-        desc += sprintf(buff+desc, "general:"
-                "flags=0x%X mimo-d=%d s-ant0x%x d-ant=0x%x\n",
-                lq_sta->lq.general_params.flags,
-                lq_sta->lq.general_params.mimo_delimiter,
-                lq_sta->lq.general_params.single_stream_ant_msk,
-                lq_sta->lq.general_params.dual_stream_ant_msk);
-
-        desc += sprintf(buff+desc, "agg:"
-                        "time_limit=%d dist_start_th=%d frame_cnt_limit=%d\n",
-                        le16_to_cpu(lq_sta->lq.agg_params.agg_time_limit),
-                        lq_sta->lq.agg_params.agg_dis_start_th,
-                        lq_sta->lq.agg_params.agg_frame_cnt_limit);
-
-        desc += sprintf(buff+desc,
-                        "Start idx [0]=0x%x [1]=0x%x [2]=0x%x [3]=0x%x\n",
-                        lq_sta->lq.general_params.start_rate_index[0],
-                        lq_sta->lq.general_params.start_rate_index[1],
-                        lq_sta->lq.general_params.start_rate_index[2],
-                        lq_sta->lq.general_params.start_rate_index[3]);
-
-        for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++) {
-                index = iwl4965_hwrate_to_plcp_idx(
-                        le32_to_cpu(lq_sta->lq.rs_table[i].rate_n_flags));
-                if (is_legacy(tbl->lq_type)) {
-                        desc += sprintf(buff+desc, " rate[%d] 0x%X %smbps\n",
-                        i,
-                        le32_to_cpu(lq_sta->lq.rs_table[i].rate_n_flags),
-                        iwl_rate_mcs[index].mbps);
-                } else {
-                        desc += sprintf(buff+desc,
-                        " rate[%d] 0x%X %smbps (%s)\n",
-                        i,
-                        le32_to_cpu(lq_sta->lq.rs_table[i].rate_n_flags),
-                        iwl_rate_mcs[index].mbps, iwl_rate_mcs[index].mcs);
-                }
-        }
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);
-        kfree(buff);
-        return ret;
-}
-
-static const struct file_operations rs_sta_dbgfs_scale_table_ops = {
-        .write = iwl4965_rs_sta_dbgfs_scale_table_write,
-        .read = iwl4965_rs_sta_dbgfs_scale_table_read,
-        .open = iwl4965_open_file_generic,
-        .llseek = default_llseek,
-};
-static ssize_t iwl4965_rs_sta_dbgfs_stats_table_read(struct file *file,
-                        char __user *user_buf, size_t count, loff_t *ppos)
-{
-        char *buff;
-        int desc = 0;
-        int i, j;
-        ssize_t ret;
-
-        struct iwl_lq_sta *lq_sta = file->private_data;
-
-        buff = kmalloc(1024, GFP_KERNEL);
-        if (!buff)
-                return -ENOMEM;
-
-        for (i = 0; i < LQ_SIZE; i++) {
-                desc += sprintf(buff+desc,
-                                "%s type=%d SGI=%d HT40=%d DUP=%d GF=%d\n"
-                                "rate=0x%X\n",
-                                lq_sta->active_tbl == i ? "*" : "x",
-                                lq_sta->lq_info[i].lq_type,
-                                lq_sta->lq_info[i].is_SGI,
-                                lq_sta->lq_info[i].is_ht40,
-                                lq_sta->lq_info[i].is_dup,
-                                lq_sta->is_green,
-                                lq_sta->lq_info[i].current_rate);
-                for (j = 0; j < IWL_RATE_COUNT; j++) {
-                        desc += sprintf(buff+desc,
-                                "counter=%d success=%d %%=%d\n",
-                                lq_sta->lq_info[i].win[j].counter,
-                                lq_sta->lq_info[i].win[j].success_counter,
-                                lq_sta->lq_info[i].win[j].success_ratio);
-                }
-        }
-        ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);
-        kfree(buff);
-        return ret;
-}
-
-static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
-        .read = iwl4965_rs_sta_dbgfs_stats_table_read,
-        .open = iwl4965_open_file_generic,
-        .llseek = default_llseek,
-};
-
-static ssize_t iwl4965_rs_sta_dbgfs_rate_scale_data_read(struct file *file,
-                        char __user *user_buf, size_t count, loff_t *ppos)
-{
-        char buff[120];
-        int desc = 0;
-        ssize_t ret;
-
-        struct iwl_lq_sta *lq_sta = file->private_data;
-        struct iwl_priv *priv;
-        struct iwl_scale_tbl_info *tbl = &lq_sta->lq_info[lq_sta->active_tbl];
-
-        priv = lq_sta->drv;
-
-        if (is_Ht(tbl->lq_type))
-                desc += sprintf(buff+desc,
-                                "Bit Rate= %d Mb/s\n",
-                                tbl->expected_tpt[lq_sta->last_txrate_idx]);
-        else
-                desc += sprintf(buff+desc,
-                                "Bit Rate= %d Mb/s\n",
-                                iwlegacy_rates[lq_sta->last_txrate_idx].ieee >> 1);
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);
-        return ret;
-}
-
-static const struct file_operations rs_sta_dbgfs_rate_scale_data_ops = {
-        .read = iwl4965_rs_sta_dbgfs_rate_scale_data_read,
-        .open = iwl4965_open_file_generic,
-        .llseek = default_llseek,
-};
-
-static void iwl4965_rs_add_debugfs(void *priv, void *priv_sta,
-                                        struct dentry *dir)
-{
-        struct iwl_lq_sta *lq_sta = priv_sta;
-        lq_sta->rs_sta_dbgfs_scale_table_file =
-                debugfs_create_file("rate_scale_table", S_IRUSR | S_IWUSR, dir,
-                                lq_sta, &rs_sta_dbgfs_scale_table_ops);
-        lq_sta->rs_sta_dbgfs_stats_table_file =
-                debugfs_create_file("rate_stats_table", S_IRUSR, dir,
-                        lq_sta, &rs_sta_dbgfs_stats_table_ops);
-        lq_sta->rs_sta_dbgfs_rate_scale_data_file =
-                debugfs_create_file("rate_scale_data", S_IRUSR, dir,
-                        lq_sta, &rs_sta_dbgfs_rate_scale_data_ops);
-        lq_sta->rs_sta_dbgfs_tx_agg_tid_en_file =
-                debugfs_create_u8("tx_agg_tid_enable", S_IRUSR | S_IWUSR, dir,
-                &lq_sta->tx_agg_tid_en);
-
-}
-
-static void iwl4965_rs_remove_debugfs(void *priv, void *priv_sta)
-{
-        struct iwl_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);
-        debugfs_remove(lq_sta->rs_sta_dbgfs_rate_scale_data_file);
-        debugfs_remove(lq_sta->rs_sta_dbgfs_tx_agg_tid_en_file);
-}
-#endif
-
-/*
- * Initialization of rate scaling information is done by driver after
- * the station is added. Since mac80211 calls this function before a
- * station is added we ignore it.
- */
-static void
-iwl4965_rs_rate_init_stub(void *priv_r, struct ieee80211_supported_band *sband,
-                         struct ieee80211_sta *sta, void *priv_sta)
-{
-}
-static struct rate_control_ops rs_4965_ops = {
-        .module = NULL,
-        .name = IWL4965_RS_NAME,
-        .tx_status = iwl4965_rs_tx_status,
-        .get_rate = iwl4965_rs_get_rate,
-        .rate_init = iwl4965_rs_rate_init_stub,
-        .alloc = iwl4965_rs_alloc,
-        .free = iwl4965_rs_free,
-        .alloc_sta = iwl4965_rs_alloc_sta,
-        .free_sta = iwl4965_rs_free_sta,
-#ifdef CONFIG_MAC80211_DEBUGFS
-        .add_sta_debugfs = iwl4965_rs_add_debugfs,
-        .remove_sta_debugfs = iwl4965_rs_remove_debugfs,
-#endif
-};
-
-int iwl4965_rate_control_register(void)
-{
-        return ieee80211_rate_control_register(&rs_4965_ops);
-}
-
-void iwl4965_rate_control_unregister(void)
-{
-        ieee80211_rate_control_unregister(&rs_4965_ops);
-}
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-rx.c b/drivers/net/wireless/iwlegacy/iwl-4965-rx.c
deleted file mode 100644
index 2b144bbfc3c5..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-4965-rx.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/******************************************************************************
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2011 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:
- *  Intel Linux Wireless <ilw@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/init.h>
-#include <linux/sched.h>
-
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-4965-calib.h"
-#include "iwl-sta.h"
-#include "iwl-io.h"
-#include "iwl-helpers.h"
-#include "iwl-4965-hw.h"
-#include "iwl-4965.h"
-
-void iwl4965_rx_missed_beacon_notif(struct iwl_priv *priv,
-                                struct iwl_rx_mem_buffer *rxb)
-
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_missed_beacon_notif *missed_beacon;
-
-        missed_beacon = &pkt->u.missed_beacon;
-        if (le32_to_cpu(missed_beacon->consecutive_missed_beacons) >
-            priv->missed_beacon_threshold) {
-                IWL_DEBUG_CALIB(priv,
-                    "missed bcn cnsq %d totl %d rcd %d expctd %d\n",
-                    le32_to_cpu(missed_beacon->consecutive_missed_beacons),
-                    le32_to_cpu(missed_beacon->total_missed_becons),
-                    le32_to_cpu(missed_beacon->num_recvd_beacons),
-                    le32_to_cpu(missed_beacon->num_expected_beacons));
-                if (!test_bit(STATUS_SCANNING, &priv->status))
-                        iwl4965_init_sensitivity(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 iwl_priv *priv)
-{
-        struct statistics_rx_non_phy *rx_info;
-        int num_active_rx = 0;
-        int total_silence = 0;
-        int bcn_silence_a, bcn_silence_b, bcn_silence_c;
-        int last_rx_noise;
-
-        rx_info = &(priv->_4965.statistics.rx.general);
-        bcn_silence_a =
-                le32_to_cpu(rx_info->beacon_silence_rssi_a) & IN_BAND_FILTER;
-        bcn_silence_b =
-                le32_to_cpu(rx_info->beacon_silence_rssi_b) & IN_BAND_FILTER;
-        bcn_silence_c =
-                le32_to_cpu(rx_info->beacon_silence_rssi_c) & IN_BAND_FILTER;
-
-        if (bcn_silence_a) {
-                total_silence += bcn_silence_a;
-                num_active_rx++;
-        }
-        if (bcn_silence_b) {
-                total_silence += bcn_silence_b;
-                num_active_rx++;
-        }
-        if (bcn_silence_c) {
-                total_silence += bcn_silence_c;
-                num_active_rx++;
-        }
-
-        /* Average among active antennas */
-        if (num_active_rx)
-                last_rx_noise = (total_silence / num_active_rx) - 107;
-        else
-                last_rx_noise = IWL_NOISE_MEAS_NOT_AVAILABLE;
-
-        IWL_DEBUG_CALIB(priv, "inband silence a %u, b %u, c %u, dBm %d\n",
-                        bcn_silence_a, bcn_silence_b, bcn_silence_c,
-                        last_rx_noise);
-}
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
-/*
- *  based on the assumption of all statistics counter are in DWORD
- *  FIXME: This function is for debugging, do not deal with
- *  the case of counters roll-over.
- */
-static void iwl4965_accumulative_statistics(struct iwl_priv *priv,
-                                        __le32 *stats)
-{
-        int i, size;
-        __le32 *prev_stats;
-        u32 *accum_stats;
-        u32 *delta, *max_delta;
-        struct statistics_general_common *general, *accum_general;
-        struct statistics_tx *tx, *accum_tx;
-
-        prev_stats = (__le32 *)&priv->_4965.statistics;
-        accum_stats = (u32 *)&priv->_4965.accum_statistics;
-        size = sizeof(struct iwl_notif_statistics);
-        general = &priv->_4965.statistics.general.common;
-        accum_general = &priv->_4965.accum_statistics.general.common;
-        tx = &priv->_4965.statistics.tx;
-        accum_tx = &priv->_4965.accum_statistics.tx;
-        delta = (u32 *)&priv->_4965.delta_statistics;
-        max_delta = (u32 *)&priv->_4965.max_delta;
-
-        for (i = sizeof(__le32); i < size;
-             i += sizeof(__le32), stats++, prev_stats++, delta++,
-             max_delta++, accum_stats++) {
-                if (le32_to_cpu(*stats) > le32_to_cpu(*prev_stats)) {
-                        *delta = (le32_to_cpu(*stats) -
-                                le32_to_cpu(*prev_stats));
-                        *accum_stats += *delta;
-                        if (*delta > *max_delta)
-                                *max_delta = *delta;
-                }
-        }
-
-        /* reset accumulative statistics for "no-counter" type statistics */
-        accum_general->temperature = general->temperature;
-        accum_general->ttl_timestamp = general->ttl_timestamp;
-}
-#endif
-
-#define REG_RECALIB_PERIOD (60)
-
-void iwl4965_rx_statistics(struct iwl_priv *priv,
-                              struct iwl_rx_mem_buffer *rxb)
-{
-        int change;
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-
-        IWL_DEBUG_RX(priv,
-                     "Statistics notification received (%d vs %d).\n",
-                     (int)sizeof(struct iwl_notif_statistics),
-                     le32_to_cpu(pkt->len_n_flags) &
-                     FH_RSCSR_FRAME_SIZE_MSK);
-
-        change = ((priv->_4965.statistics.general.common.temperature !=
-                   pkt->u.stats.general.common.temperature) ||
-                   ((priv->_4965.statistics.flag &
-                   STATISTICS_REPLY_FLG_HT40_MODE_MSK) !=
-                   (pkt->u.stats.flag &
-                   STATISTICS_REPLY_FLG_HT40_MODE_MSK)));
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
-        iwl4965_accumulative_statistics(priv, (__le32 *)&pkt->u.stats);
-#endif
-
-        /* TODO: reading some of statistics is unneeded */
-        memcpy(&priv->_4965.statistics, &pkt->u.stats,
-                sizeof(priv->_4965.statistics));
-
-        set_bit(STATUS_STATISTICS, &priv->status);
-
-        /* Reschedule the statistics timer to occur in
-         * REG_RECALIB_PERIOD seconds to ensure we get a
-         * thermal update even if the uCode doesn't give
-         * us one */
-        mod_timer(&priv->statistics_periodic, jiffies +
-                  msecs_to_jiffies(REG_RECALIB_PERIOD * 1000));
-
-        if (unlikely(!test_bit(STATUS_SCANNING, &priv->status)) &&
-            (pkt->hdr.cmd == STATISTICS_NOTIFICATION)) {
-                iwl4965_rx_calc_noise(priv);
-                queue_work(priv->workqueue, &priv->run_time_calib_work);
-        }
-        if (priv->cfg->ops->lib->temp_ops.temperature && change)
-                priv->cfg->ops->lib->temp_ops.temperature(priv);
-}
-
-void iwl4965_reply_statistics(struct iwl_priv *priv,
-                              struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-
-        if (le32_to_cpu(pkt->u.stats.flag) & UCODE_STATISTICS_CLEAR_MSK) {
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
-                memset(&priv->_4965.accum_statistics, 0,
-                        sizeof(struct iwl_notif_statistics));
-                memset(&priv->_4965.delta_statistics, 0,
-                        sizeof(struct iwl_notif_statistics));
-                memset(&priv->_4965.max_delta, 0,
-                        sizeof(struct iwl_notif_statistics));
-#endif
-                IWL_DEBUG_RX(priv, "Statistics have been cleared\n");
-        }
-        iwl4965_rx_statistics(priv, rxb);
-}
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-sta.c b/drivers/net/wireless/iwlegacy/iwl-4965-sta.c
deleted file mode 100644
index a262c23553d2..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-4965-sta.c
+++ /dev/null
@@ -1,721 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-
-#include <net/mac80211.h>
-
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-sta.h"
-#include "iwl-4965.h"
-
-static struct iwl_link_quality_cmd *
-iwl4965_sta_alloc_lq(struct iwl_priv *priv, u8 sta_id)
-{
-        int i, r;
-        struct iwl_link_quality_cmd *link_cmd;
-        u32 rate_flags = 0;
-        __le32 rate_n_flags;
-
-        link_cmd = kzalloc(sizeof(struct iwl_link_quality_cmd), GFP_KERNEL);
-        if (!link_cmd) {
-                IWL_ERR(priv, "Unable to allocate memory for LQ cmd.\n");
-                return NULL;
-        }
-        /* Set up the rate scaling to start at selected rate, fall back
-         * all the way down to 1M in IEEE order, and then spin on 1M */
-        if (priv->band == IEEE80211_BAND_5GHZ)
-                r = IWL_RATE_6M_INDEX;
-        else
-                r = IWL_RATE_1M_INDEX;
-
-        if (r >= IWL_FIRST_CCK_RATE && r <= IWL_LAST_CCK_RATE)
-                rate_flags |= RATE_MCS_CCK_MSK;
-
-        rate_flags |= iwl4965_first_antenna(priv->hw_params.valid_tx_ant) <<
-                                RATE_MCS_ANT_POS;
-        rate_n_flags = iwl4965_hw_set_rate_n_flags(iwlegacy_rates[r].plcp,
-                                                   rate_flags);
-        for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)
-                link_cmd->rs_table[i].rate_n_flags = rate_n_flags;
-
-        link_cmd->general_params.single_stream_ant_msk =
-                                iwl4965_first_antenna(priv->hw_params.valid_tx_ant);
-
-        link_cmd->general_params.dual_stream_ant_msk =
-                priv->hw_params.valid_tx_ant &
-                ~iwl4965_first_antenna(priv->hw_params.valid_tx_ant);
-        if (!link_cmd->general_params.dual_stream_ant_msk) {
-                link_cmd->general_params.dual_stream_ant_msk = ANT_AB;
-        } else if (iwl4965_num_of_ant(priv->hw_params.valid_tx_ant) == 2) {
-                link_cmd->general_params.dual_stream_ant_msk =
-                        priv->hw_params.valid_tx_ant;
-        }
-
-        link_cmd->agg_params.agg_dis_start_th = LINK_QUAL_AGG_DISABLE_START_DEF;
-        link_cmd->agg_params.agg_time_limit =
-                cpu_to_le16(LINK_QUAL_AGG_TIME_LIMIT_DEF);
-
-        link_cmd->sta_id = sta_id;
-
-        return link_cmd;
-}
-
-/*
- * iwl4965_add_bssid_station - Add the special IBSS BSSID station
- *
- * Function sleeps.
- */
-int
-iwl4965_add_bssid_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
-                             const u8 *addr, u8 *sta_id_r)
-{
-        int ret;
-        u8 sta_id;
-        struct iwl_link_quality_cmd *link_cmd;
-        unsigned long flags;
-
-        if (sta_id_r)
-                *sta_id_r = IWL_INVALID_STATION;
-
-        ret = iwl_legacy_add_station_common(priv, ctx, addr, 0, NULL, &sta_id);
-        if (ret) {
-                IWL_ERR(priv, "Unable to add station %pM\n", addr);
-                return ret;
-        }
-
-        if (sta_id_r)
-                *sta_id_r = sta_id;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        priv->stations[sta_id].used |= IWL_STA_LOCAL;
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        /* Set up default rate scaling table in device's station table */
-        link_cmd = iwl4965_sta_alloc_lq(priv, sta_id);
-        if (!link_cmd) {
-                IWL_ERR(priv,
-                        "Unable to initialize rate scaling for station %pM.\n",
-                        addr);
-                return -ENOMEM;
-        }
-
-        ret = iwl_legacy_send_lq_cmd(priv, ctx, link_cmd, CMD_SYNC, true);
-        if (ret)
-                IWL_ERR(priv, "Link quality command failed (%d)\n", ret);
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        priv->stations[sta_id].lq = link_cmd;
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        return 0;
-}
-
-static int iwl4965_static_wepkey_cmd(struct iwl_priv *priv,
-                                      struct iwl_rxon_context *ctx,
-                                      bool 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 = ctx->wep_key_cmd,
-                .data = wep_cmd,
-                .flags = CMD_SYNC,
-        };
-
-        might_sleep();
-
-        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 (ctx->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 = ctx->wep_keys[i].key_size;
-                memcpy(&wep_cmd->key[i].key[3], ctx->wep_keys[i].key,
-                                ctx->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_legacy_send_cmd(priv, &cmd);
-        else
-                return 0;
-}
-
-int iwl4965_restore_default_wep_keys(struct iwl_priv *priv,
-                                 struct iwl_rxon_context *ctx)
-{
-        lockdep_assert_held(&priv->mutex);
-
-        return iwl4965_static_wepkey_cmd(priv, ctx, false);
-}
-
-int iwl4965_remove_default_wep_key(struct iwl_priv *priv,
-                               struct iwl_rxon_context *ctx,
-                               struct ieee80211_key_conf *keyconf)
-{
-        int ret;
-
-        lockdep_assert_held(&priv->mutex);
-
-        IWL_DEBUG_WEP(priv, "Removing default WEP key: idx=%d\n",
-                      keyconf->keyidx);
-
-        memset(&ctx->wep_keys[keyconf->keyidx], 0, sizeof(ctx->wep_keys[0]));
-        if (iwl_legacy_is_rfkill(priv)) {
-                IWL_DEBUG_WEP(priv,
-                "Not sending REPLY_WEPKEY command due to RFKILL.\n");
-                /* but keys in device are clear anyway so return success */
-                return 0;
-        }
-        ret = iwl4965_static_wepkey_cmd(priv, ctx, 1);
-        IWL_DEBUG_WEP(priv, "Remove default WEP key: idx=%d ret=%d\n",
-                      keyconf->keyidx, ret);
-
-        return ret;
-}
-
-int iwl4965_set_default_wep_key(struct iwl_priv *priv,
-                            struct iwl_rxon_context *ctx,
-                            struct ieee80211_key_conf *keyconf)
-{
-        int ret;
-
-        lockdep_assert_held(&priv->mutex);
-
-        if (keyconf->keylen != WEP_KEY_LEN_128 &&
-            keyconf->keylen != WEP_KEY_LEN_64) {
-                IWL_DEBUG_WEP(priv, "Bad WEP key length %d\n", keyconf->keylen);
-                return -EINVAL;
-        }
-
-        keyconf->flags &= ~IEEE80211_KEY_FLAG_GENERATE_IV;
-        keyconf->hw_key_idx = HW_KEY_DEFAULT;
-        priv->stations[ctx->ap_sta_id].keyinfo.cipher = keyconf->cipher;
-
-        ctx->wep_keys[keyconf->keyidx].key_size = keyconf->keylen;
-        memcpy(&ctx->wep_keys[keyconf->keyidx].key, &keyconf->key,
-                                                        keyconf->keylen);
-
-        ret = iwl4965_static_wepkey_cmd(priv, ctx, false);
-        IWL_DEBUG_WEP(priv, "Set default WEP key: len=%d idx=%d ret=%d\n",
-                keyconf->keylen, keyconf->keyidx, ret);
-
-        return ret;
-}
-
-static int iwl4965_set_wep_dynamic_key_info(struct iwl_priv *priv,
-                                        struct iwl_rxon_context *ctx,
-                                        struct ieee80211_key_conf *keyconf,
-                                        u8 sta_id)
-{
-        unsigned long flags;
-        __le16 key_flags = 0;
-        struct iwl_legacy_addsta_cmd sta_cmd;
-
-        lockdep_assert_held(&priv->mutex);
-
-        keyconf->flags &= ~IEEE80211_KEY_FLAG_GENERATE_IV;
-
-        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 == ctx->bcast_sta_id)
-                key_flags |= STA_KEY_MULTICAST_MSK;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-
-        priv->stations[sta_id].keyinfo.cipher = keyconf->cipher;
-        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);
-
-        if ((priv->stations[sta_id].sta.key.key_flags & STA_KEY_FLG_ENCRYPT_MSK)
-                        == STA_KEY_FLG_NO_ENC)
-                priv->stations[sta_id].sta.key.key_offset =
-                                 iwl_legacy_get_free_ucode_key_index(priv);
-        /* else, we are overriding an existing key => no need to allocated room
-         * in uCode. */
-
-        WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,
-                "no space for a new key");
-
-        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;
-
-        memcpy(&sta_cmd, &priv->stations[sta_id].sta,
-                        sizeof(struct iwl_legacy_addsta_cmd));
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        return iwl_legacy_send_add_sta(priv, &sta_cmd, CMD_SYNC);
-}
-
-static int iwl4965_set_ccmp_dynamic_key_info(struct iwl_priv *priv,
-                                         struct iwl_rxon_context *ctx,
-                                         struct ieee80211_key_conf *keyconf,
-                                         u8 sta_id)
-{
-        unsigned long flags;
-        __le16 key_flags = 0;
-        struct iwl_legacy_addsta_cmd sta_cmd;
-
-        lockdep_assert_held(&priv->mutex);
-
-        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 == ctx->bcast_sta_id)
-                key_flags |= STA_KEY_MULTICAST_MSK;
-
-        keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        priv->stations[sta_id].keyinfo.cipher = keyconf->cipher;
-        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);
-
-        if ((priv->stations[sta_id].sta.key.key_flags & STA_KEY_FLG_ENCRYPT_MSK)
-                        == STA_KEY_FLG_NO_ENC)
-                priv->stations[sta_id].sta.key.key_offset =
-                                 iwl_legacy_get_free_ucode_key_index(priv);
-        /* else, we are overriding an existing key => no need to allocated room
-         * in uCode. */
-
-        WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,
-                "no space for a new key");
-
-        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;
-
-        memcpy(&sta_cmd, &priv->stations[sta_id].sta,
-                         sizeof(struct iwl_legacy_addsta_cmd));
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        return iwl_legacy_send_add_sta(priv, &sta_cmd, CMD_SYNC);
-}
-
-static int iwl4965_set_tkip_dynamic_key_info(struct iwl_priv *priv,
-                                         struct iwl_rxon_context *ctx,
-                                         struct ieee80211_key_conf *keyconf,
-                                         u8 sta_id)
-{
-        unsigned long flags;
-        int ret = 0;
-        __le16 key_flags = 0;
-
-        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 == ctx->bcast_sta_id)
-                key_flags |= STA_KEY_MULTICAST_MSK;
-
-        keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
-        keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-
-        priv->stations[sta_id].keyinfo.cipher = keyconf->cipher;
-        priv->stations[sta_id].keyinfo.keylen = 16;
-
-        if ((priv->stations[sta_id].sta.key.key_flags & STA_KEY_FLG_ENCRYPT_MSK)
-                        == STA_KEY_FLG_NO_ENC)
-                priv->stations[sta_id].sta.key.key_offset =
-                                 iwl_legacy_get_free_ucode_key_index(priv);
-        /* else, we are overriding an existing key => no need to allocated room
-         * in uCode. */
-
-        WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,
-                "no space for a new key");
-
-        priv->stations[sta_id].sta.key.key_flags = key_flags;
-
-
-        /* 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;
-}
-
-void iwl4965_update_tkip_key(struct iwl_priv *priv,
-                         struct iwl_rxon_context *ctx,
-                         struct ieee80211_key_conf *keyconf,
-                         struct ieee80211_sta *sta, u32 iv32, u16 *phase1key)
-{
-        u8 sta_id;
-        unsigned long flags;
-        int i;
-
-        if (iwl_legacy_scan_cancel(priv)) {
-                /* cancel scan failed, just live w/ bad key and rely
-                   briefly on SW decryption */
-                return;
-        }
-
-        sta_id = iwl_legacy_sta_id_or_broadcast(priv, ctx, sta);
-        if (sta_id == IWL_INVALID_STATION)
-                return;
-
-        spin_lock_irqsave(&priv->sta_lock, 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;
-
-        iwl_legacy_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC);
-
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-}
-
-int iwl4965_remove_dynamic_key(struct iwl_priv *priv,
-                           struct iwl_rxon_context *ctx,
-                           struct ieee80211_key_conf *keyconf,
-                           u8 sta_id)
-{
-        unsigned long flags;
-        u16 key_flags;
-        u8 keyidx;
-        struct iwl_legacy_addsta_cmd sta_cmd;
-
-        lockdep_assert_held(&priv->mutex);
-
-        ctx->key_mapping_keys--;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        key_flags = le16_to_cpu(priv->stations[sta_id].sta.key.key_flags);
-        keyidx = (key_flags >> STA_KEY_FLG_KEYID_POS) & 0x3;
-
-        IWL_DEBUG_WEP(priv, "Remove dynamic key: idx=%d sta=%d\n",
-                      keyconf->keyidx, sta_id);
-
-        if (keyconf->keyidx != keyidx) {
-                /* We need to remove a key with index different that the one
-                 * in the uCode. This means that the key we need to remove has
-                 * been replaced by another one with different index.
-                 * Don't do anything and return ok
-                 */
-                spin_unlock_irqrestore(&priv->sta_lock, flags);
-                return 0;
-        }
-
-        if (priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET) {
-                IWL_WARN(priv, "Removing wrong key %d 0x%x\n",
-                            keyconf->keyidx, key_flags);
-                spin_unlock_irqrestore(&priv->sta_lock, flags);
-                return 0;
-        }
-
-        if (!test_and_clear_bit(priv->stations[sta_id].sta.key.key_offset,
-                &priv->ucode_key_table))
-                IWL_ERR(priv, "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 iwl_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 | STA_KEY_FLG_INVALID;
-        priv->stations[sta_id].sta.key.key_offset = WEP_INVALID_OFFSET;
-        priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
-        priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
-
-        if (iwl_legacy_is_rfkill(priv)) {
-                IWL_DEBUG_WEP(priv,
-                 "Not sending REPLY_ADD_STA command because RFKILL enabled.\n");
-                spin_unlock_irqrestore(&priv->sta_lock, flags);
-                return 0;
-        }
-        memcpy(&sta_cmd, &priv->stations[sta_id].sta,
-                        sizeof(struct iwl_legacy_addsta_cmd));
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        return iwl_legacy_send_add_sta(priv, &sta_cmd, CMD_SYNC);
-}
-
-int iwl4965_set_dynamic_key(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
-                        struct ieee80211_key_conf *keyconf, u8 sta_id)
-{
-        int ret;
-
-        lockdep_assert_held(&priv->mutex);
-
-        ctx->key_mapping_keys++;
-        keyconf->hw_key_idx = HW_KEY_DYNAMIC;
-
-        switch (keyconf->cipher) {
-        case WLAN_CIPHER_SUITE_CCMP:
-                ret = iwl4965_set_ccmp_dynamic_key_info(priv, ctx,
-                                                        keyconf, sta_id);
-                break;
-        case WLAN_CIPHER_SUITE_TKIP:
-                ret = iwl4965_set_tkip_dynamic_key_info(priv, ctx,
-                                                        keyconf, sta_id);
-                break;
-        case WLAN_CIPHER_SUITE_WEP40:
-        case WLAN_CIPHER_SUITE_WEP104:
-                ret = iwl4965_set_wep_dynamic_key_info(priv, ctx,
-                                                        keyconf, sta_id);
-                break;
-        default:
-                IWL_ERR(priv,
-                        "Unknown alg: %s cipher = %x\n", __func__,
-                        keyconf->cipher);
-                ret = -EINVAL;
-        }
-
-        IWL_DEBUG_WEP(priv,
-                "Set dynamic key: cipher=%x len=%d idx=%d sta=%d ret=%d\n",
-                      keyconf->cipher, keyconf->keylen, keyconf->keyidx,
-                      sta_id, ret);
-
-        return ret;
-}
-
-/**
- * iwl4965_alloc_bcast_station - add broadcast station into driver's station table.
- *
- * This adds the broadcast station into the driver's station table
- * and marks it driver active, so that it will be restored to the
- * device at the next best time.
- */
-int iwl4965_alloc_bcast_station(struct iwl_priv *priv,
-                               struct iwl_rxon_context *ctx)
-{
-        struct iwl_link_quality_cmd *link_cmd;
-        unsigned long flags;
-        u8 sta_id;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        sta_id = iwl_legacy_prep_station(priv, ctx, iwlegacy_bcast_addr,
-                                                                false, NULL);
-        if (sta_id == IWL_INVALID_STATION) {
-                IWL_ERR(priv, "Unable to prepare broadcast station\n");
-                spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-                return -EINVAL;
-        }
-
-        priv->stations[sta_id].used |= IWL_STA_DRIVER_ACTIVE;
-        priv->stations[sta_id].used |= IWL_STA_BCAST;
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        link_cmd = iwl4965_sta_alloc_lq(priv, sta_id);
-        if (!link_cmd) {
-                IWL_ERR(priv,
-                        "Unable to initialize rate scaling for bcast station.\n");
-                return -ENOMEM;
-        }
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        priv->stations[sta_id].lq = link_cmd;
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        return 0;
-}
-
-/**
- * iwl4965_update_bcast_station - update broadcast station's LQ command
- *
- * Only used by iwl4965. Placed here to have all bcast station management
- * code together.
- */
-static int iwl4965_update_bcast_station(struct iwl_priv *priv,
-                                    struct iwl_rxon_context *ctx)
-{
-        unsigned long flags;
-        struct iwl_link_quality_cmd *link_cmd;
-        u8 sta_id = ctx->bcast_sta_id;
-
-        link_cmd = iwl4965_sta_alloc_lq(priv, sta_id);
-        if (!link_cmd) {
-                IWL_ERR(priv,
-                "Unable to initialize rate scaling for bcast station.\n");
-                return -ENOMEM;
-        }
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        if (priv->stations[sta_id].lq)
-                kfree(priv->stations[sta_id].lq);
-        else
-                IWL_DEBUG_INFO(priv,
-                "Bcast station rate scaling has not been initialized yet.\n");
-        priv->stations[sta_id].lq = link_cmd;
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        return 0;
-}
-
-int iwl4965_update_bcast_stations(struct iwl_priv *priv)
-{
-        struct iwl_rxon_context *ctx;
-        int ret = 0;
-
-        for_each_context(priv, ctx) {
-                ret = iwl4965_update_bcast_station(priv, ctx);
-                if (ret)
-                        break;
-        }
-
-        return ret;
-}
-
-/**
- * iwl4965_sta_tx_modify_enable_tid - Enable Tx for this TID in station table
- */
-int iwl4965_sta_tx_modify_enable_tid(struct iwl_priv *priv, int sta_id, int tid)
-{
-        unsigned long flags;
-        struct iwl_legacy_addsta_cmd sta_cmd;
-
-        lockdep_assert_held(&priv->mutex);
-
-        /* Remove "disable" flag, to enable Tx for this TID */
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_TID_DISABLE_TX;
-        priv->stations[sta_id].sta.tid_disable_tx &= cpu_to_le16(~(1 << tid));
-        priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
-        memcpy(&sta_cmd, &priv->stations[sta_id].sta,
-                                        sizeof(struct iwl_legacy_addsta_cmd));
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        return iwl_legacy_send_add_sta(priv, &sta_cmd, CMD_SYNC);
-}
-
-int iwl4965_sta_rx_agg_start(struct iwl_priv *priv, struct ieee80211_sta *sta,
-                         int tid, u16 ssn)
-{
-        unsigned long flags;
-        int sta_id;
-        struct iwl_legacy_addsta_cmd sta_cmd;
-
-        lockdep_assert_held(&priv->mutex);
-
-        sta_id = iwl_legacy_sta_id(sta);
-        if (sta_id == IWL_INVALID_STATION)
-                return -ENXIO;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        priv->stations[sta_id].sta.station_flags_msk = 0;
-        priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_ADDBA_TID_MSK;
-        priv->stations[sta_id].sta.add_immediate_ba_tid = (u8)tid;
-        priv->stations[sta_id].sta.add_immediate_ba_ssn = cpu_to_le16(ssn);
-        priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
-        memcpy(&sta_cmd, &priv->stations[sta_id].sta,
-                                        sizeof(struct iwl_legacy_addsta_cmd));
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        return iwl_legacy_send_add_sta(priv, &sta_cmd, CMD_SYNC);
-}
-
-int iwl4965_sta_rx_agg_stop(struct iwl_priv *priv, struct ieee80211_sta *sta,
-                        int tid)
-{
-        unsigned long flags;
-        int sta_id;
-        struct iwl_legacy_addsta_cmd sta_cmd;
-
-        lockdep_assert_held(&priv->mutex);
-
-        sta_id = iwl_legacy_sta_id(sta);
-        if (sta_id == IWL_INVALID_STATION) {
-                IWL_ERR(priv, "Invalid station for AGG tid %d\n", tid);
-                return -ENXIO;
-        }
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        priv->stations[sta_id].sta.station_flags_msk = 0;
-        priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_DELBA_TID_MSK;
-        priv->stations[sta_id].sta.remove_immediate_ba_tid = (u8)tid;
-        priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
-        memcpy(&sta_cmd, &priv->stations[sta_id].sta,
-                                sizeof(struct iwl_legacy_addsta_cmd));
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        return iwl_legacy_send_add_sta(priv, &sta_cmd, CMD_SYNC);
-}
-
-void
-iwl4965_sta_modify_sleep_tx_count(struct iwl_priv *priv, int sta_id, int cnt)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        priv->stations[sta_id].sta.station_flags |= STA_FLG_PWR_SAVE_MSK;
-        priv->stations[sta_id].sta.station_flags_msk = STA_FLG_PWR_SAVE_MSK;
-        priv->stations[sta_id].sta.sta.modify_mask =
-                                        STA_MODIFY_SLEEP_TX_COUNT_MSK;
-        priv->stations[sta_id].sta.sleep_tx_count = cpu_to_le16(cnt);
-        priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
-        iwl_legacy_send_add_sta(priv,
-                                &priv->stations[sta_id].sta, CMD_ASYNC);
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-}
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-tx.c b/drivers/net/wireless/iwlegacy/iwl-4965-tx.c
deleted file mode 100644
index 7f12e3638bae..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-4965-tx.c
+++ /dev/null
@@ -1,1378 +0,0 @@
-/******************************************************************************
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2011 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:
- *  Intel Linux Wireless <ilw@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/init.h>
-#include <linux/sched.h>
-
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-sta.h"
-#include "iwl-io.h"
-#include "iwl-helpers.h"
-#include "iwl-4965-hw.h"
-#include "iwl-4965.h"
-
-/*
- * mac80211 queues, ACs, hardware queues, FIFOs.
- *
- * Cf. http://wireless.kernel.org/en/developers/Documentation/mac80211/queues
- *
- * Mac80211 uses the following numbers, which we get as from it
- * by way of skb_get_queue_mapping(skb):
- *
- *      VO      0
- *      VI      1
- *      BE      2
- *      BK      3
- *
- *
- * Regular (not A-MPDU) frames are put into hardware queues corresponding
- * to the FIFOs, see comments in iwl-prph.h. Aggregated frames get their
- * own queue per aggregation session (RA/TID combination), such queues are
- * set up to map into FIFOs too, for which we need an AC->FIFO mapping. In
- * order to map frames to the right queue, we also need an AC->hw queue
- * mapping. This is implemented here.
- *
- * Due to the way hw queues are set up (by the hw specific modules like
- * iwl-4965.c), the AC->hw queue mapping is the identity
- * mapping.
- */
-
-static const u8 tid_to_ac[] = {
-        IEEE80211_AC_BE,
-        IEEE80211_AC_BK,
-        IEEE80211_AC_BK,
-        IEEE80211_AC_BE,
-        IEEE80211_AC_VI,
-        IEEE80211_AC_VI,
-        IEEE80211_AC_VO,
-        IEEE80211_AC_VO
-};
-
-static inline int iwl4965_get_ac_from_tid(u16 tid)
-{
-        if (likely(tid < ARRAY_SIZE(tid_to_ac)))
-                return tid_to_ac[tid];
-
-        /* no support for TIDs 8-15 yet */
-        return -EINVAL;
-}
-
-static inline int
-iwl4965_get_fifo_from_tid(struct iwl_rxon_context *ctx, u16 tid)
-{
-        if (likely(tid < ARRAY_SIZE(tid_to_ac)))
-                return ctx->ac_to_fifo[tid_to_ac[tid]];
-
-        /* no support for TIDs 8-15 yet */
-        return -EINVAL;
-}
-
-/*
- * handle build REPLY_TX command notification.
- */
-static void iwl4965_tx_cmd_build_basic(struct iwl_priv *priv,
-                                        struct sk_buff *skb,
-                                        struct iwl_tx_cmd *tx_cmd,
-                                        struct ieee80211_tx_info *info,
-                                        struct ieee80211_hdr *hdr,
-                                        u8 std_id)
-{
-        __le16 fc = hdr->frame_control;
-        __le32 tx_flags = tx_cmd->tx_flags;
-
-        tx_cmd->stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
-        if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) {
-                tx_flags |= TX_CMD_FLG_ACK_MSK;
-                if (ieee80211_is_mgmt(fc))
-                        tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
-                if (ieee80211_is_probe_resp(fc) &&
-                    !(le16_to_cpu(hdr->seq_ctrl) & 0xf))
-                        tx_flags |= TX_CMD_FLG_TSF_MSK;
-        } else {
-                tx_flags &= (~TX_CMD_FLG_ACK_MSK);
-                tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
-        }
-
-        if (ieee80211_is_back_req(fc))
-                tx_flags |= TX_CMD_FLG_ACK_MSK | TX_CMD_FLG_IMM_BA_RSP_MASK;
-
-        tx_cmd->sta_id = std_id;
-        if (ieee80211_has_morefrags(fc))
-                tx_flags |= TX_CMD_FLG_MORE_FRAG_MSK;
-
-        if (ieee80211_is_data_qos(fc)) {
-                u8 *qc = ieee80211_get_qos_ctl(hdr);
-                tx_cmd->tid_tspec = qc[0] & 0xf;
-                tx_flags &= ~TX_CMD_FLG_SEQ_CTL_MSK;
-        } else {
-                tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
-        }
-
-        iwl_legacy_tx_cmd_protection(priv, info, fc, &tx_flags);
-
-        tx_flags &= ~(TX_CMD_FLG_ANT_SEL_MSK);
-        if (ieee80211_is_mgmt(fc)) {
-                if (ieee80211_is_assoc_req(fc) || ieee80211_is_reassoc_req(fc))
-                        tx_cmd->timeout.pm_frame_timeout = cpu_to_le16(3);
-                else
-                        tx_cmd->timeout.pm_frame_timeout = cpu_to_le16(2);
-        } else {
-                tx_cmd->timeout.pm_frame_timeout = 0;
-        }
-
-        tx_cmd->driver_txop = 0;
-        tx_cmd->tx_flags = tx_flags;
-        tx_cmd->next_frame_len = 0;
-}
-
-#define RTS_DFAULT_RETRY_LIMIT          60
-
-static void iwl4965_tx_cmd_build_rate(struct iwl_priv *priv,
-                              struct iwl_tx_cmd *tx_cmd,
-                              struct ieee80211_tx_info *info,
-                              __le16 fc)
-{
-        u32 rate_flags;
-        int rate_idx;
-        u8 rts_retry_limit;
-        u8 data_retry_limit;
-        u8 rate_plcp;
-
-        /* Set retry limit on DATA packets and Probe Responses*/
-        if (ieee80211_is_probe_resp(fc))
-                data_retry_limit = 3;
-        else
-                data_retry_limit = IWL4965_DEFAULT_TX_RETRY;
-        tx_cmd->data_retry_limit = data_retry_limit;
-
-        /* Set retry limit on RTS packets */
-        rts_retry_limit = RTS_DFAULT_RETRY_LIMIT;
-        if (data_retry_limit < rts_retry_limit)
-                rts_retry_limit = data_retry_limit;
-        tx_cmd->rts_retry_limit = rts_retry_limit;
-
-        /* DATA packets will use the uCode station table for rate/antenna
-         * selection */
-        if (ieee80211_is_data(fc)) {
-                tx_cmd->initial_rate_index = 0;
-                tx_cmd->tx_flags |= TX_CMD_FLG_STA_RATE_MSK;
-                return;
-        }
-
-        /**
-         * If the current TX rate stored in mac80211 has the MCS bit set, it's
-         * not really a TX rate.  Thus, we use the lowest supported rate for
-         * this band.  Also use the lowest supported rate if the stored rate
-         * index is invalid.
-         */
-        rate_idx = info->control.rates[0].idx;
-        if (info->control.rates[0].flags & IEEE80211_TX_RC_MCS ||
-                        (rate_idx < 0) || (rate_idx > IWL_RATE_COUNT_LEGACY))
-                rate_idx = rate_lowest_index(&priv->bands[info->band],
-                                info->control.sta);
-        /* For 5 GHZ band, remap mac80211 rate indices into driver indices */
-        if (info->band == IEEE80211_BAND_5GHZ)
-                rate_idx += IWL_FIRST_OFDM_RATE;
-        /* Get PLCP rate for tx_cmd->rate_n_flags */
-        rate_plcp = iwlegacy_rates[rate_idx].plcp;
-        /* Zero out flags for this packet */
-        rate_flags = 0;
-
-        /* Set CCK flag as needed */
-        if ((rate_idx >= IWL_FIRST_CCK_RATE) && (rate_idx <= IWL_LAST_CCK_RATE))
-                rate_flags |= RATE_MCS_CCK_MSK;
-
-        /* Set up antennas */
-        priv->mgmt_tx_ant = iwl4965_toggle_tx_ant(priv, priv->mgmt_tx_ant,
-                                      priv->hw_params.valid_tx_ant);
-
-        rate_flags |= iwl4965_ant_idx_to_flags(priv->mgmt_tx_ant);
-
-        /* Set the rate in the TX cmd */
-        tx_cmd->rate_n_flags = iwl4965_hw_set_rate_n_flags(rate_plcp, rate_flags);
-}
-
-static void iwl4965_tx_cmd_build_hwcrypto(struct iwl_priv *priv,
-                                      struct ieee80211_tx_info *info,
-                                      struct iwl_tx_cmd *tx_cmd,
-                                      struct sk_buff *skb_frag,
-                                      int sta_id)
-{
-        struct ieee80211_key_conf *keyconf = info->control.hw_key;
-
-        switch (keyconf->cipher) {
-        case WLAN_CIPHER_SUITE_CCMP:
-                tx_cmd->sec_ctl = TX_CMD_SEC_CCM;
-                memcpy(tx_cmd->key, keyconf->key, keyconf->keylen);
-                if (info->flags & IEEE80211_TX_CTL_AMPDU)
-                        tx_cmd->tx_flags |= TX_CMD_FLG_AGG_CCMP_MSK;
-                IWL_DEBUG_TX(priv, "tx_cmd with AES hwcrypto\n");
-                break;
-
-        case WLAN_CIPHER_SUITE_TKIP:
-                tx_cmd->sec_ctl = TX_CMD_SEC_TKIP;
-                ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd->key);
-                IWL_DEBUG_TX(priv, "tx_cmd with tkip hwcrypto\n");
-                break;
-
-        case WLAN_CIPHER_SUITE_WEP104:
-                tx_cmd->sec_ctl |= TX_CMD_SEC_KEY128;
-                /* fall through */
-        case WLAN_CIPHER_SUITE_WEP40:
-                tx_cmd->sec_ctl |= (TX_CMD_SEC_WEP |
-                        (keyconf->keyidx & TX_CMD_SEC_MSK) << TX_CMD_SEC_SHIFT);
-
-                memcpy(&tx_cmd->key[3], keyconf->key, keyconf->keylen);
-
-                IWL_DEBUG_TX(priv, "Configuring packet for WEP encryption "
-                             "with key %d\n", keyconf->keyidx);
-                break;
-
-        default:
-                IWL_ERR(priv, "Unknown encode cipher %x\n", keyconf->cipher);
-                break;
-        }
-}
-
-/*
- * start REPLY_TX command process
- */
-int iwl4965_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
-{
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-        struct ieee80211_sta *sta = info->control.sta;
-        struct iwl_station_priv *sta_priv = NULL;
-        struct iwl_tx_queue *txq;
-        struct iwl_queue *q;
-        struct iwl_device_cmd *out_cmd;
-        struct iwl_cmd_meta *out_meta;
-        struct iwl_tx_cmd *tx_cmd;
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        int txq_id;
-        dma_addr_t phys_addr;
-        dma_addr_t txcmd_phys;
-        dma_addr_t scratch_phys;
-        u16 len, firstlen, secondlen;
-        u16 seq_number = 0;
-        __le16 fc;
-        u8 hdr_len;
-        u8 sta_id;
-        u8 wait_write_ptr = 0;
-        u8 tid = 0;
-        u8 *qc = NULL;
-        unsigned long flags;
-        bool is_agg = false;
-
-        if (info->control.vif)
-                ctx = iwl_legacy_rxon_ctx_from_vif(info->control.vif);
-
-        spin_lock_irqsave(&priv->lock, flags);
-        if (iwl_legacy_is_rfkill(priv)) {
-                IWL_DEBUG_DROP(priv, "Dropping - RF KILL\n");
-                goto drop_unlock;
-        }
-
-        fc = hdr->frame_control;
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        if (ieee80211_is_auth(fc))
-                IWL_DEBUG_TX(priv, "Sending AUTH frame\n");
-        else if (ieee80211_is_assoc_req(fc))
-                IWL_DEBUG_TX(priv, "Sending ASSOC frame\n");
-        else if (ieee80211_is_reassoc_req(fc))
-                IWL_DEBUG_TX(priv, "Sending REASSOC frame\n");
-#endif
-
-        hdr_len = ieee80211_hdrlen(fc);
-
-        /* For management frames use broadcast id to do not break aggregation */
-        if (!ieee80211_is_data(fc))
-                sta_id = ctx->bcast_sta_id;
-        else {
-                /* Find index into station table for destination station */
-                sta_id = iwl_legacy_sta_id_or_broadcast(priv, ctx, info->control.sta);
-
-                if (sta_id == IWL_INVALID_STATION) {
-                        IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",
-                                       hdr->addr1);
-                        goto drop_unlock;
-                }
-        }
-
-        IWL_DEBUG_TX(priv, "station Id %d\n", sta_id);
-
-        if (sta)
-                sta_priv = (void *)sta->drv_priv;
-
-        if (sta_priv && sta_priv->asleep &&
-            (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)) {
-                /*
-                 * This sends an asynchronous command to the device,
-                 * but we can rely on it being processed before the
-                 * next frame is processed -- and the next frame to
-                 * this station is the one that will consume this
-                 * counter.
-                 * For now set the counter to just 1 since we do not
-                 * support uAPSD yet.
-                 */
-                iwl4965_sta_modify_sleep_tx_count(priv, sta_id, 1);
-        }
-
-        /*
-         * Send this frame after DTIM -- there's a special queue
-         * reserved for this for contexts that support AP mode.
-         */
-        if (info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM) {
-                txq_id = ctx->mcast_queue;
-                /*
-                 * The microcode will clear the more data
-                 * bit in the last frame it transmits.
-                 */
-                hdr->frame_control |=
-                        cpu_to_le16(IEEE80211_FCTL_MOREDATA);
-        } else
-                txq_id = ctx->ac_to_queue[skb_get_queue_mapping(skb)];
-
-        /* irqs already disabled/saved above when locking priv->lock */
-        spin_lock(&priv->sta_lock);
-
-        if (ieee80211_is_data_qos(fc)) {
-                qc = ieee80211_get_qos_ctl(hdr);
-                tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK;
-                if (WARN_ON_ONCE(tid >= MAX_TID_COUNT)) {
-                        spin_unlock(&priv->sta_lock);
-                        goto drop_unlock;
-                }
-                seq_number = priv->stations[sta_id].tid[tid].seq_number;
-                seq_number &= IEEE80211_SCTL_SEQ;
-                hdr->seq_ctrl = hdr->seq_ctrl &
-                                cpu_to_le16(IEEE80211_SCTL_FRAG);
-                hdr->seq_ctrl |= cpu_to_le16(seq_number);
-                seq_number += 0x10;
-                /* aggregation is on for this <sta,tid> */
-                if (info->flags & IEEE80211_TX_CTL_AMPDU &&
-                    priv->stations[sta_id].tid[tid].agg.state == IWL_AGG_ON) {
-                        txq_id = priv->stations[sta_id].tid[tid].agg.txq_id;
-                        is_agg = true;
-                }
-        }
-
-        txq = &priv->txq[txq_id];
-        q = &txq->q;
-
-        if (unlikely(iwl_legacy_queue_space(q) < q->high_mark)) {
-                spin_unlock(&priv->sta_lock);
-                goto drop_unlock;
-        }
-
-        if (ieee80211_is_data_qos(fc)) {
-                priv->stations[sta_id].tid[tid].tfds_in_queue++;
-                if (!ieee80211_has_morefrags(fc))
-                        priv->stations[sta_id].tid[tid].seq_number = seq_number;
-        }
-
-        spin_unlock(&priv->sta_lock);
-
-        /* Set up driver data for this TFD */
-        memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl_tx_info));
-        txq->txb[q->write_ptr].skb = skb;
-        txq->txb[q->write_ptr].ctx = ctx;
-
-        /* Set up first empty entry in queue's array of Tx/cmd buffers */
-        out_cmd = txq->cmd[q->write_ptr];
-        out_meta = &txq->meta[q->write_ptr];
-        tx_cmd = &out_cmd->cmd.tx;
-        memset(&out_cmd->hdr, 0, sizeof(out_cmd->hdr));
-        memset(tx_cmd, 0, sizeof(struct iwl_tx_cmd));
-
-        /*
-         * Set up the Tx-command (not MAC!) header.
-         * Store the chosen Tx queue and TFD index within the sequence field;
-         * after Tx, uCode's Tx response will return this value so driver can
-         * locate the frame within the tx queue and do post-tx processing.
-         */
-        out_cmd->hdr.cmd = REPLY_TX;
-        out_cmd->hdr.sequence = cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) |
-                                INDEX_TO_SEQ(q->write_ptr)));
-
-        /* Copy MAC header from skb into command buffer */
-        memcpy(tx_cmd->hdr, hdr, hdr_len);
-
-
-        /* Total # bytes to be transmitted */
-        len = (u16)skb->len;
-        tx_cmd->len = cpu_to_le16(len);
-
-        if (info->control.hw_key)
-                iwl4965_tx_cmd_build_hwcrypto(priv, info, tx_cmd, skb, sta_id);
-
-        /* TODO need this for burst mode later on */
-        iwl4965_tx_cmd_build_basic(priv, skb, tx_cmd, info, hdr, sta_id);
-        iwl_legacy_dbg_log_tx_data_frame(priv, len, hdr);
-
-        iwl4965_tx_cmd_build_rate(priv, tx_cmd, info, fc);
-
-        iwl_legacy_update_stats(priv, true, fc, len);
-        /*
-         * Use the first empty entry in this queue's command buffer array
-         * to contain the Tx command and MAC header concatenated together
-         * (payload data will be in another buffer).
-         * Size of this varies, due to varying MAC header length.
-         * If end is not dword aligned, we'll have 2 extra bytes at the end
-         * of the MAC header (device reads on dword boundaries).
-         * We'll tell device about this padding later.
-         */
-        len = sizeof(struct iwl_tx_cmd) +
-                sizeof(struct iwl_cmd_header) + hdr_len;
-        firstlen = (len + 3) & ~3;
-
-        /* Tell NIC about any 2-byte padding after MAC header */
-        if (firstlen != len)
-                tx_cmd->tx_flags |= TX_CMD_FLG_MH_PAD_MSK;
-
-        /* Physical address of this Tx command's header (not MAC header!),
-         * within command buffer array. */
-        txcmd_phys = pci_map_single(priv->pci_dev,
-                                    &out_cmd->hdr, firstlen,
-                                    PCI_DMA_BIDIRECTIONAL);
-        dma_unmap_addr_set(out_meta, mapping, txcmd_phys);
-        dma_unmap_len_set(out_meta, len, firstlen);
-        /* Add buffer containing Tx command and MAC(!) header to TFD's
-         * first entry */
-        priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,
-                                                   txcmd_phys, firstlen, 1, 0);
-
-        if (!ieee80211_has_morefrags(hdr->frame_control)) {
-                txq->need_update = 1;
-        } else {
-                wait_write_ptr = 1;
-                txq->need_update = 0;
-        }
-
-        /* Set up TFD's 2nd entry to point directly to remainder of skb,
-         * if any (802.11 null frames have no payload). */
-        secondlen = skb->len - hdr_len;
-        if (secondlen > 0) {
-                phys_addr = pci_map_single(priv->pci_dev, skb->data + hdr_len,
-                                           secondlen, PCI_DMA_TODEVICE);
-                priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,
-                                                           phys_addr, secondlen,
-                                                           0, 0);
-        }
-
-        scratch_phys = txcmd_phys + sizeof(struct iwl_cmd_header) +
-                                offsetof(struct iwl_tx_cmd, scratch);
-
-        /* take back ownership of DMA buffer to enable update */
-        pci_dma_sync_single_for_cpu(priv->pci_dev, txcmd_phys,
-                                    firstlen, PCI_DMA_BIDIRECTIONAL);
-        tx_cmd->dram_lsb_ptr = cpu_to_le32(scratch_phys);
-        tx_cmd->dram_msb_ptr = iwl_legacy_get_dma_hi_addr(scratch_phys);
-
-        IWL_DEBUG_TX(priv, "sequence nr = 0X%x\n",
-                     le16_to_cpu(out_cmd->hdr.sequence));
-        IWL_DEBUG_TX(priv, "tx_flags = 0X%x\n", le32_to_cpu(tx_cmd->tx_flags));
-        iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx_cmd, sizeof(*tx_cmd));
-        iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx_cmd->hdr, hdr_len);
-
-        /* Set up entry for this TFD in Tx byte-count array */
-        if (info->flags & IEEE80211_TX_CTL_AMPDU)
-                priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq,
-                                                     le16_to_cpu(tx_cmd->len));
-
-        pci_dma_sync_single_for_device(priv->pci_dev, txcmd_phys,
-                                       firstlen, PCI_DMA_BIDIRECTIONAL);
-
-        trace_iwlwifi_legacy_dev_tx(priv,
-                             &((struct iwl_tfd *)txq->tfds)[txq->q.write_ptr],
-                             sizeof(struct iwl_tfd),
-                             &out_cmd->hdr, firstlen,
-                             skb->data + hdr_len, secondlen);
-
-        /* Tell device the write index *just past* this latest filled TFD */
-        q->write_ptr = iwl_legacy_queue_inc_wrap(q->write_ptr, q->n_bd);
-        iwl_legacy_txq_update_write_ptr(priv, txq);
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        /*
-         * At this point the frame is "transmitted" successfully
-         * and we will get a TX status notification eventually,
-         * regardless of the value of ret. "ret" only indicates
-         * whether or not we should update the write pointer.
-         */
-
-        /*
-         * Avoid atomic ops if it isn't an associated client.
-         * Also, if this is a packet for aggregation, don't
-         * increase the counter because the ucode will stop
-         * aggregation queues when their respective station
-         * goes to sleep.
-         */
-        if (sta_priv && sta_priv->client && !is_agg)
-                atomic_inc(&sta_priv->pending_frames);
-
-        if ((iwl_legacy_queue_space(q) < q->high_mark) &&
-                        priv->mac80211_registered) {
-                if (wait_write_ptr) {
-                        spin_lock_irqsave(&priv->lock, flags);
-                        txq->need_update = 1;
-                        iwl_legacy_txq_update_write_ptr(priv, txq);
-                        spin_unlock_irqrestore(&priv->lock, flags);
-                } else {
-                        iwl_legacy_stop_queue(priv, txq);
-                }
-        }
-
-        return 0;
-
-drop_unlock:
-        spin_unlock_irqrestore(&priv->lock, flags);
-        return -1;
-}
-
-static inline int iwl4965_alloc_dma_ptr(struct iwl_priv *priv,
-                                    struct iwl_dma_ptr *ptr, size_t size)
-{
-        ptr->addr = dma_alloc_coherent(&priv->pci_dev->dev, size, &ptr->dma,
-                                       GFP_KERNEL);
-        if (!ptr->addr)
-                return -ENOMEM;
-        ptr->size = size;
-        return 0;
-}
-
-static inline void iwl4965_free_dma_ptr(struct iwl_priv *priv,
-                                    struct iwl_dma_ptr *ptr)
-{
-        if (unlikely(!ptr->addr))
-                return;
-
-        dma_free_coherent(&priv->pci_dev->dev, ptr->size, ptr->addr, ptr->dma);
-        memset(ptr, 0, sizeof(*ptr));
-}
-
-/**
- * iwl4965_hw_txq_ctx_free - Free TXQ Context
- *
- * Destroy all TX DMA queues and structures
- */
-void iwl4965_hw_txq_ctx_free(struct iwl_priv *priv)
-{
-        int txq_id;
-
-        /* Tx queues */
-        if (priv->txq) {
-                for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++)
-                        if (txq_id == priv->cmd_queue)
-                                iwl_legacy_cmd_queue_free(priv);
-                        else
-                                iwl_legacy_tx_queue_free(priv, txq_id);
-        }
-        iwl4965_free_dma_ptr(priv, &priv->kw);
-
-        iwl4965_free_dma_ptr(priv, &priv->scd_bc_tbls);
-
-        /* free tx queue structure */
-        iwl_legacy_txq_mem(priv);
-}
-
-/**
- * iwl4965_txq_ctx_alloc - allocate TX queue context
- * Allocate all Tx DMA structures and initialize them
- *
- * @param priv
- * @return error code
- */
-int iwl4965_txq_ctx_alloc(struct iwl_priv *priv)
-{
-        int ret;
-        int txq_id, slots_num;
-        unsigned long flags;
-
-        /* Free all tx/cmd queues and keep-warm buffer */
-        iwl4965_hw_txq_ctx_free(priv);
-
-        ret = iwl4965_alloc_dma_ptr(priv, &priv->scd_bc_tbls,
-                                priv->hw_params.scd_bc_tbls_size);
-        if (ret) {
-                IWL_ERR(priv, "Scheduler BC Table allocation failed\n");
-                goto error_bc_tbls;
-        }
-        /* Alloc keep-warm buffer */
-        ret = iwl4965_alloc_dma_ptr(priv, &priv->kw, IWL_KW_SIZE);
-        if (ret) {
-                IWL_ERR(priv, "Keep Warm allocation failed\n");
-                goto error_kw;
-        }
-
-        /* allocate tx queue structure */
-        ret = iwl_legacy_alloc_txq_mem(priv);
-        if (ret)
-                goto error;
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        /* Turn off all Tx DMA fifos */
-        iwl4965_txq_set_sched(priv, 0);
-
-        /* Tell NIC where to find the "keep warm" buffer */
-        iwl_legacy_write_direct32(priv, FH_KW_MEM_ADDR_REG, priv->kw.dma >> 4);
-
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        /* Alloc and init all Tx queues, including the command queue (#4/#9) */
-        for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) {
-                slots_num = (txq_id == priv->cmd_queue) ?
-                                        TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;
-                ret = iwl_legacy_tx_queue_init(priv,
-                                        &priv->txq[txq_id], slots_num,
-                                       txq_id);
-                if (ret) {
-                        IWL_ERR(priv, "Tx %d queue init failed\n", txq_id);
-                        goto error;
-                }
-        }
-
-        return ret;
-
- error:
-        iwl4965_hw_txq_ctx_free(priv);
-        iwl4965_free_dma_ptr(priv, &priv->kw);
- error_kw:
-        iwl4965_free_dma_ptr(priv, &priv->scd_bc_tbls);
- error_bc_tbls:
-        return ret;
-}
-
-void iwl4965_txq_ctx_reset(struct iwl_priv *priv)
-{
-        int txq_id, slots_num;
-        unsigned long flags;
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        /* Turn off all Tx DMA fifos */
-        iwl4965_txq_set_sched(priv, 0);
-
-        /* Tell NIC where to find the "keep warm" buffer */
-        iwl_legacy_write_direct32(priv, FH_KW_MEM_ADDR_REG, priv->kw.dma >> 4);
-
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        /* Alloc and init all Tx queues, including the command queue (#4) */
-        for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) {
-                slots_num = txq_id == priv->cmd_queue ?
-                            TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;
-                iwl_legacy_tx_queue_reset(priv, &priv->txq[txq_id],
-                                                slots_num, txq_id);
-        }
-}
-
-/**
- * iwl4965_txq_ctx_stop - Stop all Tx DMA channels
- */
-void iwl4965_txq_ctx_stop(struct iwl_priv *priv)
-{
-        int ch, txq_id;
-        unsigned long flags;
-
-        /* Turn off all Tx DMA fifos */
-        spin_lock_irqsave(&priv->lock, flags);
-
-        iwl4965_txq_set_sched(priv, 0);
-
-        /* Stop each Tx DMA channel, and wait for it to be idle */
-        for (ch = 0; ch < priv->hw_params.dma_chnl_num; ch++) {
-                iwl_legacy_write_direct32(priv,
-                                FH_TCSR_CHNL_TX_CONFIG_REG(ch), 0x0);
-                if (iwl_poll_direct_bit(priv, FH_TSSR_TX_STATUS_REG,
-                                    FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch),
-                                    1000))
-                        IWL_ERR(priv, "Failing on timeout while stopping"
-                            " DMA channel %d [0x%08x]", ch,
-                            iwl_legacy_read_direct32(priv,
-                                        FH_TSSR_TX_STATUS_REG));
-        }
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        if (!priv->txq)
-                return;
-
-        /* Unmap DMA from host system and free skb's */
-        for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++)
-                if (txq_id == priv->cmd_queue)
-                        iwl_legacy_cmd_queue_unmap(priv);
-                else
-                        iwl_legacy_tx_queue_unmap(priv, txq_id);
-}
-
-/*
- * 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), reserved (5, 6)
- */
-static int iwl4965_txq_ctx_activate_free(struct iwl_priv *priv)
-{
-        int 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;
-}
-
-/**
- * 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_legacy_write_prph(priv,
-                IWL49_SCD_QUEUE_STATUS_BITS(txq_id),
-                (0 << IWL49_SCD_QUEUE_STTS_REG_POS_ACTIVE)|
-                (1 << IWL49_SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN));
-}
-
-/**
- * iwl4965_tx_queue_set_q2ratid - Map unique receiver/tid combination to a queue
- */
-static int iwl4965_tx_queue_set_q2ratid(struct iwl_priv *priv, u16 ra_tid,
-                                        u16 txq_id)
-{
-        u32 tbl_dw_addr;
-        u32 tbl_dw;
-        u16 scd_q2ratid;
-
-        scd_q2ratid = ra_tid & IWL_SCD_QUEUE_RA_TID_MAP_RATID_MSK;
-
-        tbl_dw_addr = priv->scd_base_addr +
-                        IWL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(txq_id);
-
-        tbl_dw = iwl_legacy_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);
-
-        iwl_legacy_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 IWL49_FIRST_AMPDU_QUEUE,
- *        i.e. it must be one of the higher queues used for aggregation
- */
-static int iwl4965_txq_agg_enable(struct iwl_priv *priv, int txq_id,
-                                  int tx_fifo, int sta_id, int tid, u16 ssn_idx)
-{
-        unsigned long flags;
-        u16 ra_tid;
-        int ret;
-
-        if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) ||
-            (IWL49_FIRST_AMPDU_QUEUE +
-                priv->cfg->base_params->num_of_ampdu_queues <= txq_id)) {
-                IWL_WARN(priv,
-                        "queue number out of range: %d, must be %d to %d\n",
-                        txq_id, IWL49_FIRST_AMPDU_QUEUE,
-                        IWL49_FIRST_AMPDU_QUEUE +
-                        priv->cfg->base_params->num_of_ampdu_queues - 1);
-                return -EINVAL;
-        }
-
-        ra_tid = BUILD_RAxTID(sta_id, tid);
-
-        /* Modify device's station table to Tx this TID */
-        ret = iwl4965_sta_tx_modify_enable_tid(priv, sta_id, tid);
-        if (ret)
-                return ret;
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        /* Stop this Tx queue before configuring it */
-        iwl4965_tx_queue_stop_scheduler(priv, txq_id);
-
-        /* Map receiver-address / traffic-ID to this queue */
-        iwl4965_tx_queue_set_q2ratid(priv, ra_tid, txq_id);
-
-        /* Set this queue as a chain-building queue */
-        iwl_legacy_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) */
-        priv->txq[txq_id].q.read_ptr = (ssn_idx & 0xff);
-        priv->txq[txq_id].q.write_ptr = (ssn_idx & 0xff);
-        iwl4965_set_wr_ptrs(priv, txq_id, ssn_idx);
-
-        /* Set up Tx window size and frame limit for this queue */
-        iwl_legacy_write_targ_mem(priv,
-                priv->scd_base_addr + IWL49_SCD_CONTEXT_QUEUE_OFFSET(txq_id),
-                (SCD_WIN_SIZE << IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS) &
-                IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK);
-
-        iwl_legacy_write_targ_mem(priv, priv->scd_base_addr +
-                IWL49_SCD_CONTEXT_QUEUE_OFFSET(txq_id) + sizeof(u32),
-                (SCD_FRAME_LIMIT << IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS)
-                & IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK);
-
-        iwl_legacy_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);
-
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        return 0;
-}
-
-
-int iwl4965_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,
-                        struct ieee80211_sta *sta, u16 tid, u16 *ssn)
-{
-        int sta_id;
-        int tx_fifo;
-        int txq_id;
-        int ret;
-        unsigned long flags;
-        struct iwl_tid_data *tid_data;
-
-        tx_fifo = iwl4965_get_fifo_from_tid(iwl_legacy_rxon_ctx_from_vif(vif), tid);
-        if (unlikely(tx_fifo < 0))
-                return tx_fifo;
-
-        IWL_WARN(priv, "%s on ra = %pM tid = %d\n",
-                        __func__, sta->addr, tid);
-
-        sta_id = iwl_legacy_sta_id(sta);
-        if (sta_id == IWL_INVALID_STATION) {
-                IWL_ERR(priv, "Start AGG on invalid station\n");
-                return -ENXIO;
-        }
-        if (unlikely(tid >= MAX_TID_COUNT))
-                return -EINVAL;
-
-        if (priv->stations[sta_id].tid[tid].agg.state != IWL_AGG_OFF) {
-                IWL_ERR(priv, "Start AGG when state is not IWL_AGG_OFF !\n");
-                return -ENXIO;
-        }
-
-        txq_id = iwl4965_txq_ctx_activate_free(priv);
-        if (txq_id == -1) {
-                IWL_ERR(priv, "No free aggregation queue available\n");
-                return -ENXIO;
-        }
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        tid_data = &priv->stations[sta_id].tid[tid];
-        *ssn = SEQ_TO_SN(tid_data->seq_number);
-        tid_data->agg.txq_id = txq_id;
-        iwl_legacy_set_swq_id(&priv->txq[txq_id],
-                                iwl4965_get_ac_from_tid(tid), txq_id);
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        ret = iwl4965_txq_agg_enable(priv, txq_id, tx_fifo,
-                                                  sta_id, tid, *ssn);
-        if (ret)
-                return ret;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        tid_data = &priv->stations[sta_id].tid[tid];
-        if (tid_data->tfds_in_queue == 0) {
-                IWL_DEBUG_HT(priv, "HW queue is empty\n");
-                tid_data->agg.state = IWL_AGG_ON;
-                ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
-        } else {
-                IWL_DEBUG_HT(priv,
-                        "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;
-        }
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-        return ret;
-}
-
-/**
- * txq_id must be greater than IWL49_FIRST_AMPDU_QUEUE
- * priv->lock must be held by the caller
- */
-static int iwl4965_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,
-                                   u16 ssn_idx, u8 tx_fifo)
-{
-        if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) ||
-            (IWL49_FIRST_AMPDU_QUEUE +
-                priv->cfg->base_params->num_of_ampdu_queues <= txq_id)) {
-                IWL_WARN(priv,
-                        "queue number out of range: %d, must be %d to %d\n",
-                        txq_id, IWL49_FIRST_AMPDU_QUEUE,
-                        IWL49_FIRST_AMPDU_QUEUE +
-                        priv->cfg->base_params->num_of_ampdu_queues - 1);
-                return -EINVAL;
-        }
-
-        iwl4965_tx_queue_stop_scheduler(priv, txq_id);
-
-        iwl_legacy_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_legacy_clear_bits_prph(priv,
-                         IWL49_SCD_INTERRUPT_MASK, (1 << txq_id));
-        iwl_txq_ctx_deactivate(priv, txq_id);
-        iwl4965_tx_queue_set_status(priv, &priv->txq[txq_id], tx_fifo, 0);
-
-        return 0;
-}
-
-int iwl4965_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
-                       struct ieee80211_sta *sta, u16 tid)
-{
-        int tx_fifo_id, txq_id, sta_id, ssn;
-        struct iwl_tid_data *tid_data;
-        int write_ptr, read_ptr;
-        unsigned long flags;
-
-        tx_fifo_id = iwl4965_get_fifo_from_tid(iwl_legacy_rxon_ctx_from_vif(vif), tid);
-        if (unlikely(tx_fifo_id < 0))
-                return tx_fifo_id;
-
-        sta_id = iwl_legacy_sta_id(sta);
-
-        if (sta_id == IWL_INVALID_STATION) {
-                IWL_ERR(priv, "Invalid station for AGG tid %d\n", tid);
-                return -ENXIO;
-        }
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-
-        tid_data = &priv->stations[sta_id].tid[tid];
-        ssn = (tid_data->seq_number & IEEE80211_SCTL_SEQ) >> 4;
-        txq_id = tid_data->agg.txq_id;
-
-        switch (priv->stations[sta_id].tid[tid].agg.state) {
-        case IWL_EMPTYING_HW_QUEUE_ADDBA:
-                /*
-                 * This can happen if the peer stops aggregation
-                 * again before we've had a chance to drain the
-                 * queue we selected previously, i.e. before the
-                 * session was really started completely.
-                 */
-                IWL_DEBUG_HT(priv, "AGG stop before setup done\n");
-                goto turn_off;
-        case IWL_AGG_ON:
-                break;
-        default:
-                IWL_WARN(priv, "Stopping AGG while state not ON or starting\n");
-        }
-
-        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(priv, "Stopping a non empty AGG HW QUEUE\n");
-                priv->stations[sta_id].tid[tid].agg.state =
-                                IWL_EMPTYING_HW_QUEUE_DELBA;
-                spin_unlock_irqrestore(&priv->sta_lock, flags);
-                return 0;
-        }
-
-        IWL_DEBUG_HT(priv, "HW queue is empty\n");
- turn_off:
-        priv->stations[sta_id].tid[tid].agg.state = IWL_AGG_OFF;
-
-        /* do not restore/save irqs */
-        spin_unlock(&priv->sta_lock);
-        spin_lock(&priv->lock);
-
-        /*
-         * the only reason this call can fail is queue number out of range,
-         * which can happen if uCode is reloaded and all the station
-         * information are lost. if it is outside the range, there is no need
-         * to deactivate the uCode queue, just return "success" to allow
-         *  mac80211 to clean up it own data.
-         */
-        iwl4965_txq_agg_disable(priv, txq_id, ssn, tx_fifo_id);
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
-
-        return 0;
-}
-
-int iwl4965_txq_check_empty(struct iwl_priv *priv,
-                           int sta_id, u8 tid, int txq_id)
-{
-        struct iwl_queue *q = &priv->txq[txq_id].q;
-        u8 *addr = priv->stations[sta_id].sta.sta.addr;
-        struct iwl_tid_data *tid_data = &priv->stations[sta_id].tid[tid];
-        struct iwl_rxon_context *ctx;
-
-        ctx = &priv->contexts[priv->stations[sta_id].ctxid];
-
-        lockdep_assert_held(&priv->sta_lock);
-
-        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 = iwl4965_get_fifo_from_tid(ctx, tid);
-                        IWL_DEBUG_HT(priv,
-                                "HW queue empty: continue DELBA flow\n");
-                        iwl4965_txq_agg_disable(priv, txq_id, ssn, tx_fifo);
-                        tid_data->agg.state = IWL_AGG_OFF;
-                        ieee80211_stop_tx_ba_cb_irqsafe(ctx->vif, 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(priv,
-                                "HW queue empty: continue ADDBA flow\n");
-                        tid_data->agg.state = IWL_AGG_ON;
-                        ieee80211_start_tx_ba_cb_irqsafe(ctx->vif, addr, tid);
-                }
-                break;
-        }
-
-        return 0;
-}
-
-static void iwl4965_non_agg_tx_status(struct iwl_priv *priv,
-                                     struct iwl_rxon_context *ctx,
-                                     const u8 *addr1)
-{
-        struct ieee80211_sta *sta;
-        struct iwl_station_priv *sta_priv;
-
-        rcu_read_lock();
-        sta = ieee80211_find_sta(ctx->vif, addr1);
-        if (sta) {
-                sta_priv = (void *)sta->drv_priv;
-                /* avoid atomic ops if this isn't a client */
-                if (sta_priv->client &&
-                    atomic_dec_return(&sta_priv->pending_frames) == 0)
-                        ieee80211_sta_block_awake(priv->hw, sta, false);
-        }
-        rcu_read_unlock();
-}
-
-static void
-iwl4965_tx_status(struct iwl_priv *priv, struct iwl_tx_info *tx_info,
-                             bool is_agg)
-{
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx_info->skb->data;
-
-        if (!is_agg)
-                iwl4965_non_agg_tx_status(priv, tx_info->ctx, hdr->addr1);
-
-        ieee80211_tx_status_irqsafe(priv->hw, tx_info->skb);
-}
-
-int iwl4965_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)
-{
-        struct iwl_tx_queue *txq = &priv->txq[txq_id];
-        struct iwl_queue *q = &txq->q;
-        struct iwl_tx_info *tx_info;
-        int nfreed = 0;
-        struct ieee80211_hdr *hdr;
-
-        if ((index >= q->n_bd) || (iwl_legacy_queue_used(q, index) == 0)) {
-                IWL_ERR(priv, "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 = iwl_legacy_queue_inc_wrap(index, q->n_bd);
-             q->read_ptr != index;
-             q->read_ptr = iwl_legacy_queue_inc_wrap(q->read_ptr, q->n_bd)) {
-
-                tx_info = &txq->txb[txq->q.read_ptr];
-
-                if (WARN_ON_ONCE(tx_info->skb == NULL))
-                        continue;
-
-                hdr = (struct ieee80211_hdr *)tx_info->skb->data;
-                if (ieee80211_is_data_qos(hdr->frame_control))
-                        nfreed++;
-
-                iwl4965_tx_status(priv, tx_info,
-                                 txq_id >= IWL4965_FIRST_AMPDU_QUEUE);
-                tx_info->skb = NULL;
-
-                priv->cfg->ops->lib->txq_free_tfd(priv, txq);
-        }
-        return nfreed;
-}
-
-/**
- * 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 iwl_priv *priv,
-                                 struct iwl_ht_agg *agg,
-                                 struct iwl_compressed_ba_resp *ba_resp)
-
-{
-        int i, sh, ack;
-        u16 seq_ctl = le16_to_cpu(ba_resp->seq_ctl);
-        u16 scd_flow = le16_to_cpu(ba_resp->scd_flow);
-        int successes = 0;
-        struct ieee80211_tx_info *info;
-        u64 bitmap, sent_bitmap;
-
-        if (unlikely(!agg->wait_for_ba))  {
-                if (unlikely(ba_resp->bitmap))
-                        IWL_ERR(priv, "Received BA when not expected\n");
-                return -EINVAL;
-        }
-
-        /* Mark that the expected block-ack response arrived */
-        agg->wait_for_ba = 0;
-        IWL_DEBUG_TX_REPLY(priv, "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(seq_ctl >> 4);
-        if (sh < 0) /* tbw something is wrong with indices */
-                sh += 0x100;
-
-        if (agg->frame_count > (64 - sh)) {
-                IWL_DEBUG_TX_REPLY(priv, "more frames than bitmap size");
-                return -1;
-        }
-
-        /* don't use 64-bit values for now */
-        bitmap = le64_to_cpu(ba_resp->bitmap) >> sh;
-
-        /* check for success or failure according to the
-         * transmitted bitmap and block-ack bitmap */
-        sent_bitmap = bitmap & agg->bitmap;
-
-        /* For each frame attempted in aggregation,
-         * update driver's record of tx frame's status. */
-        i = 0;
-        while (sent_bitmap) {
-                ack = sent_bitmap & 1ULL;
-                successes += ack;
-                IWL_DEBUG_TX_REPLY(priv, "%s ON i=%d idx=%d raw=%d\n",
-                        ack ? "ACK" : "NACK", i,
-                        (agg->start_idx + i) & 0xff,
-                        agg->start_idx + i);
-                sent_bitmap >>= 1;
-                ++i;
-        }
-
-        IWL_DEBUG_TX_REPLY(priv, "Bitmap %llx\n",
-                                   (unsigned long long)bitmap);
-
-        info = IEEE80211_SKB_CB(priv->txq[scd_flow].txb[agg->start_idx].skb);
-        memset(&info->status, 0, sizeof(info->status));
-        info->flags |= IEEE80211_TX_STAT_ACK;
-        info->flags |= IEEE80211_TX_STAT_AMPDU;
-        info->status.ampdu_ack_len = successes;
-        info->status.ampdu_len = agg->frame_count;
-        iwl4965_hwrate_to_tx_control(priv, agg->rate_n_flags, info);
-
-        return 0;
-}
-
-/**
- * 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_info *info)
-{
-        struct ieee80211_tx_rate *r = &info->control.rates[0];
-
-        info->antenna_sel_tx =
-                ((rate_n_flags & RATE_MCS_ANT_ABC_MSK) >> RATE_MCS_ANT_POS);
-        if (rate_n_flags & RATE_MCS_HT_MSK)
-                r->flags |= IEEE80211_TX_RC_MCS;
-        if (rate_n_flags & RATE_MCS_GF_MSK)
-                r->flags |= IEEE80211_TX_RC_GREEN_FIELD;
-        if (rate_n_flags & RATE_MCS_HT40_MSK)
-                r->flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
-        if (rate_n_flags & RATE_MCS_DUP_MSK)
-                r->flags |= IEEE80211_TX_RC_DUP_DATA;
-        if (rate_n_flags & RATE_MCS_SGI_MSK)
-                r->flags |= IEEE80211_TX_RC_SHORT_GI;
-        r->idx = iwl4965_hwrate_to_mac80211_idx(rate_n_flags, info->band);
-}
-
-/**
- * iwl4965_rx_reply_compressed_ba - Handler for REPLY_COMPRESSED_BA
- *
- * Handles block-acknowledge notification from device, which reports success
- * of frames sent via aggregation.
- */
-void iwl4965_rx_reply_compressed_ba(struct iwl_priv *priv,
-                                           struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_compressed_ba_resp *ba_resp = &pkt->u.compressed_ba;
-        struct iwl_tx_queue *txq = NULL;
-        struct iwl_ht_agg *agg;
-        int index;
-        int sta_id;
-        int tid;
-        unsigned long flags;
-
-        /* "flow" corresponds to Tx queue */
-        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 (scd_flow >= priv->hw_params.max_txq_num) {
-                IWL_ERR(priv,
-                        "BUG_ON scd_flow is bigger than number of queues\n");
-                return;
-        }
-
-        txq = &priv->txq[scd_flow];
-        sta_id = ba_resp->sta_id;
-        tid = ba_resp->tid;
-        agg = &priv->stations[sta_id].tid[tid].agg;
-        if (unlikely(agg->txq_id != scd_flow)) {
-                /*
-                 * FIXME: this is a uCode bug which need to be addressed,
-                 * log the information and return for now!
-                 * since it is possible happen very often and in order
-                 * not to fill the syslog, don't enable the logging by default
-                 */
-                IWL_DEBUG_TX_REPLY(priv,
-                        "BA scd_flow %d does not match txq_id %d\n",
-                        scd_flow, agg->txq_id);
-                return;
-        }
-
-        /* Find index just before block-ack window */
-        index = iwl_legacy_queue_dec_wrap(ba_resp_scd_ssn & 0xff, txq->q.n_bd);
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-
-        IWL_DEBUG_TX_REPLY(priv, "REPLY_COMPRESSED_BA [%d] Received from %pM, "
-                           "sta_id = %d\n",
-                           agg->wait_for_ba,
-                           (u8 *) &ba_resp->sta_addr_lo32,
-                           ba_resp->sta_id);
-        IWL_DEBUG_TX_REPLY(priv, "TID = %d, SeqCtl = %d, bitmap = 0x%llx,"
-                        "scd_flow = "
-                           "%d, scd_ssn = %d\n",
-                           ba_resp->tid,
-                           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(priv, "DAT start_idx = %d, bitmap = 0x%llx\n",
-                           agg->start_idx,
-                           (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);
-
-        /* 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)) {
-                /* calculate mac80211 ampdu sw queue to wake */
-                int freed = iwl4965_tx_queue_reclaim(priv, scd_flow, index);
-                iwl4965_free_tfds_in_queue(priv, sta_id, tid, freed);
-
-                if ((iwl_legacy_queue_space(&txq->q) > txq->q.low_mark) &&
-                    priv->mac80211_registered &&
-                    (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA))
-                        iwl_legacy_wake_queue(priv, txq);
-
-                iwl4965_txq_check_empty(priv, sta_id, tid, scd_flow);
-        }
-
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-}
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-const char *iwl4965_get_tx_fail_reason(u32 status)
-{
-#define TX_STATUS_FAIL(x) case TX_STATUS_FAIL_ ## x: return #x
-#define TX_STATUS_POSTPONE(x) case TX_STATUS_POSTPONE_ ## x: return #x
-
-        switch (status & TX_STATUS_MSK) {
-        case TX_STATUS_SUCCESS:
-                return "SUCCESS";
-        TX_STATUS_POSTPONE(DELAY);
-        TX_STATUS_POSTPONE(FEW_BYTES);
-        TX_STATUS_POSTPONE(QUIET_PERIOD);
-        TX_STATUS_POSTPONE(CALC_TTAK);
-        TX_STATUS_FAIL(INTERNAL_CROSSED_RETRY);
-        TX_STATUS_FAIL(SHORT_LIMIT);
-        TX_STATUS_FAIL(LONG_LIMIT);
-        TX_STATUS_FAIL(FIFO_UNDERRUN);
-        TX_STATUS_FAIL(DRAIN_FLOW);
-        TX_STATUS_FAIL(RFKILL_FLUSH);
-        TX_STATUS_FAIL(LIFE_EXPIRE);
-        TX_STATUS_FAIL(DEST_PS);
-        TX_STATUS_FAIL(HOST_ABORTED);
-        TX_STATUS_FAIL(BT_RETRY);
-        TX_STATUS_FAIL(STA_INVALID);
-        TX_STATUS_FAIL(FRAG_DROPPED);
-        TX_STATUS_FAIL(TID_DISABLE);
-        TX_STATUS_FAIL(FIFO_FLUSHED);
-        TX_STATUS_FAIL(INSUFFICIENT_CF_POLL);
-        TX_STATUS_FAIL(PASSIVE_NO_RX);
-        TX_STATUS_FAIL(NO_BEACON_ON_RADAR);
-        }
-
-        return "UNKNOWN";
-
-#undef TX_STATUS_FAIL
-#undef TX_STATUS_POSTPONE
-}
-#endif /* CONFIG_IWLWIFI_LEGACY_DEBUG */
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-ucode.c b/drivers/net/wireless/iwlegacy/iwl-4965-ucode.c
deleted file mode 100644
index 001d148feb94..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-4965-ucode.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/******************************************************************************
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2011 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:
- *  Intel Linux Wireless <ilw@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/init.h>
-#include <linux/sched.h>
-
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-io.h"
-#include "iwl-helpers.h"
-#include "iwl-4965-hw.h"
-#include "iwl-4965.h"
-#include "iwl-4965-calib.h"
-
-#define IWL_AC_UNSET -1
-
-/**
- * iwl_verify_inst_sparse - verify runtime uCode image in card vs. host,
- *   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 iwl_priv *priv, __le32 *image, u32 len)
-{
-        u32 val;
-        int ret = 0;
-        u32 errcnt = 0;
-        u32 i;
-
-        IWL_DEBUG_INFO(priv, "ucode inst image size is %u\n", len);
-
-        for (i = 0; i < len; i += 100, image += 100/sizeof(u32)) {
-                /* 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 */
-                iwl_legacy_write_direct32(priv, HBUS_TARG_MEM_RADDR,
-                        i + IWL4965_RTC_INST_LOWER_BOUND);
-                val = _iwl_legacy_read_direct32(priv, HBUS_TARG_MEM_RDAT);
-                if (val != le32_to_cpu(*image)) {
-                        ret = -EIO;
-                        errcnt++;
-                        if (errcnt >= 3)
-                                break;
-                }
-        }
-
-        return ret;
-}
-
-/**
- * iwl4965_verify_inst_full - verify runtime uCode image in card vs. host,
- *     looking at all data.
- */
-static int iwl4965_verify_inst_full(struct iwl_priv *priv, __le32 *image,
-                                 u32 len)
-{
-        u32 val;
-        u32 save_len = len;
-        int ret = 0;
-        u32 errcnt;
-
-        IWL_DEBUG_INFO(priv, "ucode inst image size is %u\n", len);
-
-        iwl_legacy_write_direct32(priv, HBUS_TARG_MEM_RADDR,
-                           IWL4965_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 = _iwl_legacy_read_direct32(priv, HBUS_TARG_MEM_RDAT);
-                if (val != le32_to_cpu(*image)) {
-                        IWL_ERR(priv, "uCode INST section is invalid at "
-                                  "offset 0x%x, is 0x%x, s/b 0x%x\n",
-                                  save_len - len, val, le32_to_cpu(*image));
-                        ret = -EIO;
-                        errcnt++;
-                        if (errcnt >= 20)
-                                break;
-                }
-        }
-
-        if (!errcnt)
-                IWL_DEBUG_INFO(priv,
-                    "ucode image in INSTRUCTION memory is good\n");
-
-        return ret;
-}
-
-/**
- * iwl4965_verify_ucode - determine which instruction image is in SRAM,
- *    and verify its contents
- */
-int iwl4965_verify_ucode(struct iwl_priv *priv)
-{
-        __le32 *image;
-        u32 len;
-        int ret;
-
-        /* Try bootstrap */
-        image = (__le32 *)priv->ucode_boot.v_addr;
-        len = priv->ucode_boot.len;
-        ret = iwl4965_verify_inst_sparse(priv, image, len);
-        if (!ret) {
-                IWL_DEBUG_INFO(priv, "Bootstrap uCode is good in inst SRAM\n");
-                return 0;
-        }
-
-        /* Try initialize */
-        image = (__le32 *)priv->ucode_init.v_addr;
-        len = priv->ucode_init.len;
-        ret = iwl4965_verify_inst_sparse(priv, image, len);
-        if (!ret) {
-                IWL_DEBUG_INFO(priv, "Initialize uCode is good in inst SRAM\n");
-                return 0;
-        }
-
-        /* Try runtime/protocol */
-        image = (__le32 *)priv->ucode_code.v_addr;
-        len = priv->ucode_code.len;
-        ret = iwl4965_verify_inst_sparse(priv, image, len);
-        if (!ret) {
-                IWL_DEBUG_INFO(priv, "Runtime uCode is good in inst SRAM\n");
-                return 0;
-        }
-
-        IWL_ERR(priv, "NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n");
-
-        /* Since nothing seems to match, show first several data entries in
-         * instruction SRAM, so maybe visual inspection will give a clue.
-         * Selection of bootstrap image (vs. other images) is arbitrary. */
-        image = (__le32 *)priv->ucode_boot.v_addr;
-        len = priv->ucode_boot.len;
-        ret = iwl4965_verify_inst_full(priv, image, len);
-
-        return ret;
-}
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965.c b/drivers/net/wireless/iwlegacy/iwl-4965.c
deleted file mode 100644
index 86f4fce193e4..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-4965.c
+++ /dev/null
@@ -1,2183 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@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/init.h>
-#include <linux/pci.h>
-#include <linux/dma-mapping.h>
-#include <linux/delay.h>
-#include <linux/sched.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <net/mac80211.h>
-#include <linux/etherdevice.h>
-#include <asm/unaligned.h>
-
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-io.h"
-#include "iwl-helpers.h"
-#include "iwl-4965-calib.h"
-#include "iwl-sta.h"
-#include "iwl-4965-led.h"
-#include "iwl-4965.h"
-#include "iwl-4965-debugfs.h"
-
-static int iwl4965_send_tx_power(struct iwl_priv *priv);
-static int iwl4965_hw_get_temperature(struct iwl_priv *priv);
-
-/* Highest firmware API version supported */
-#define IWL4965_UCODE_API_MAX 2
-
-/* Lowest firmware API version supported */
-#define IWL4965_UCODE_API_MIN 2
-
-#define IWL4965_FW_PRE "iwlwifi-4965-"
-#define _IWL4965_MODULE_FIRMWARE(api) IWL4965_FW_PRE #api ".ucode"
-#define IWL4965_MODULE_FIRMWARE(api) _IWL4965_MODULE_FIRMWARE(api)
-
-/* 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(priv, "Begin verify bsm\n");
-
-        /* verify BSM SRAM contents */
-        val = iwl_legacy_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_legacy_read_prph(priv, reg);
-                if (val != le32_to_cpu(*image)) {
-                        IWL_ERR(priv, "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(priv, "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(priv, "Begin load bsm\n");
-
-        priv->ucode_type = UCODE_RT;
-
-        /* make sure bootstrap program is no larger than BSM's SRAM size */
-        if (len > IWL49_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:  iwl_init_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;
-
-        iwl_legacy_write_prph(priv, BSM_DRAM_INST_PTR_REG, pinst);
-        iwl_legacy_write_prph(priv, BSM_DRAM_DATA_PTR_REG, pdata);
-        iwl_legacy_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG, inst_len);
-        iwl_legacy_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_legacy_write_prph(priv, reg_offset, le32_to_cpu(*image));
-
-        ret = iwl4965_verify_bsm(priv);
-        if (ret)
-                return ret;
-
-        /* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */
-        iwl_legacy_write_prph(priv, BSM_WR_MEM_SRC_REG, 0x0);
-        iwl_legacy_write_prph(priv,
-                        BSM_WR_MEM_DST_REG, IWL49_RTC_INST_LOWER_BOUND);
-        iwl_legacy_write_prph(priv, BSM_WR_DWCOUNT_REG, len / sizeof(u32));
-
-        /* Load bootstrap code into instruction SRAM now,
-         *   to prepare to load "initialize" uCode */
-        iwl_legacy_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_legacy_read_prph(priv, BSM_WR_CTRL_REG);
-                if (!(done & BSM_WR_CTRL_REG_BIT_START))
-                        break;
-                udelay(10);
-        }
-        if (i < 100)
-                IWL_DEBUG_INFO(priv, "BSM write complete, poll %d iterations\n", i);
-        else {
-                IWL_ERR(priv, "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_legacy_write_prph(priv,
-                        BSM_WR_CTRL_REG, BSM_WR_CTRL_REG_BIT_START_EN);
-
-
-        return 0;
-}
-
-/**
- * iwl4965_set_ucode_ptrs - Set uCode address location
- *
- * Tell initialization uCode where to find runtime uCode.
- *
- * BSM registers initially contain pointers to initialization uCode.
- * 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 iwl_priv *priv)
-{
-        dma_addr_t pinst;
-        dma_addr_t pdata;
-        int ret = 0;
-
-        /* bits 35:4 for 4965 */
-        pinst = priv->ucode_code.p_addr >> 4;
-        pdata = priv->ucode_data_backup.p_addr >> 4;
-
-        /* Tell bootstrap uCode where to find image to load */
-        iwl_legacy_write_prph(priv, BSM_DRAM_INST_PTR_REG, pinst);
-        iwl_legacy_write_prph(priv, BSM_DRAM_DATA_PTR_REG, pdata);
-        iwl_legacy_write_prph(priv, BSM_DRAM_DATA_BYTECOUNT_REG,
-                                 priv->ucode_data.len);
-
-        /* Inst byte count must be last to set up, bit 31 signals uCode
-         *   that all new ptr/size info is in place */
-        iwl_legacy_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG,
-                                 priv->ucode_code.len | BSM_DRAM_INST_LOAD);
-        IWL_DEBUG_INFO(priv, "Runtime uCode pointers are set.\n");
-
-        return ret;
-}
-
-/**
- * iwl4965_init_alive_start - Called after REPLY_ALIVE notification received
- *
- * Called after REPLY_ALIVE notification received from "initialize" uCode.
- *
- * The 4965 "initialize" ALIVE reply contains calibration data for:
- *   Voltage, temperature, and MIMO tx gain correction, now stored in priv
- *   (3945 does not contain this data).
- *
- * Tell "initialize" uCode to go ahead and load the runtime uCode.
-*/
-static void iwl4965_init_alive_start(struct iwl_priv *priv)
-{
-        /* Bootstrap uCode has loaded initialize uCode ... verify inst image.
-         * This is a paranoid check, because we would not have gotten the
-         * "initialize" alive if code weren't properly loaded.  */
-        if (iwl4965_verify_ucode(priv)) {
-                /* Runtime instruction load was bad;
-                 * take it all the way back down so we can try again */
-                IWL_DEBUG_INFO(priv, "Bad \"initialize\" uCode load.\n");
-                goto restart;
-        }
-
-        /* Calculate temperature */
-        priv->temperature = iwl4965_hw_get_temperature(priv);
-
-        /* Send pointers to protocol/runtime uCode image ... init code will
-         * load and launch runtime uCode, which will send us another "Alive"
-         * notification. */
-        IWL_DEBUG_INFO(priv, "Initialization Alive received.\n");
-        if (iwl4965_set_ucode_ptrs(priv)) {
-                /* Runtime instruction load won't happen;
-                 * take it all the way back down so we can try again */
-                IWL_DEBUG_INFO(priv, "Couldn't set up uCode pointers.\n");
-                goto restart;
-        }
-        return;
-
-restart:
-        queue_work(priv->workqueue, &priv->restart);
-}
-
-static bool iw4965_is_ht40_channel(__le32 rxon_flags)
-{
-        int chan_mod = le32_to_cpu(rxon_flags & RXON_FLG_CHANNEL_MODE_MSK)
-                                    >> RXON_FLG_CHANNEL_MODE_POS;
-        return ((chan_mod == CHANNEL_MODE_PURE_40) ||
-                  (chan_mod == CHANNEL_MODE_MIXED));
-}
-
-static void iwl4965_nic_config(struct iwl_priv *priv)
-{
-        unsigned long flags;
-        u16 radio_cfg;
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        radio_cfg = iwl_legacy_eeprom_query16(priv, EEPROM_RADIO_CONFIG);
-
-        /* write radio config values to register */
-        if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) == EEPROM_4965_RF_CFG_TYPE_MAX)
-                iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                            EEPROM_RF_CFG_TYPE_MSK(radio_cfg) |
-                            EEPROM_RF_CFG_STEP_MSK(radio_cfg) |
-                            EEPROM_RF_CFG_DASH_MSK(radio_cfg));
-
-        /* set CSR_HW_CONFIG_REG for uCode use */
-        iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
-                    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
-
-        priv->calib_info = (struct iwl_eeprom_calib_info *)
-                iwl_legacy_eeprom_query_addr(priv,
-                                EEPROM_4965_CALIB_TXPOWER_OFFSET);
-
-        spin_unlock_irqrestore(&priv->lock, flags);
-}
-
-/* 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.  */
-static void iwl4965_chain_noise_reset(struct iwl_priv *priv)
-{
-        struct iwl_chain_noise_data *data = &(priv->chain_noise_data);
-
-        if ((data->state == IWL_CHAIN_NOISE_ALIVE) &&
-            iwl_legacy_is_any_associated(priv)) {
-                struct iwl_calib_diff_gain_cmd cmd;
-
-                /* clear data for chain noise calibration algorithm */
-                data->chain_noise_a = 0;
-                data->chain_noise_b = 0;
-                data->chain_noise_c = 0;
-                data->chain_signal_a = 0;
-                data->chain_signal_b = 0;
-                data->chain_signal_c = 0;
-                data->beacon_count = 0;
-
-                memset(&cmd, 0, sizeof(cmd));
-                cmd.hdr.op_code = IWL_PHY_CALIBRATE_DIFF_GAIN_CMD;
-                cmd.diff_gain_a = 0;
-                cmd.diff_gain_b = 0;
-                cmd.diff_gain_c = 0;
-                if (iwl_legacy_send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD,
-                                 sizeof(cmd), &cmd))
-                        IWL_ERR(priv,
-                                "Could not send REPLY_PHY_CALIBRATION_CMD\n");
-                data->state = IWL_CHAIN_NOISE_ACCUMULATE;
-                IWL_DEBUG_CALIB(priv, "Run chain_noise_calibrate\n");
-        }
-}
-
-static struct iwl_sensitivity_ranges iwl4965_sensitivity = {
-        .min_nrg_cck = 97,
-        .max_nrg_cck = 0, /* not used, set to 0 */
-
-        .auto_corr_min_ofdm = 85,
-        .auto_corr_min_ofdm_mrc = 170,
-        .auto_corr_min_ofdm_x1 = 105,
-        .auto_corr_min_ofdm_mrc_x1 = 220,
-
-        .auto_corr_max_ofdm = 120,
-        .auto_corr_max_ofdm_mrc = 210,
-        .auto_corr_max_ofdm_x1 = 140,
-        .auto_corr_max_ofdm_mrc_x1 = 270,
-
-        .auto_corr_min_cck = 125,
-        .auto_corr_max_cck = 200,
-        .auto_corr_min_cck_mrc = 200,
-        .auto_corr_max_cck_mrc = 400,
-
-        .nrg_th_cck = 100,
-        .nrg_th_ofdm = 100,
-
-        .barker_corr_th_min = 190,
-        .barker_corr_th_min_mrc = 390,
-        .nrg_th_cca = 62,
-};
-
-static void iwl4965_set_ct_threshold(struct iwl_priv *priv)
-{
-        /* want Kelvin */
-        priv->hw_params.ct_kill_threshold =
-                CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD_LEGACY);
-}
-
-/**
- * iwl4965_hw_set_hw_params
- *
- * Called when initializing driver
- */
-static int iwl4965_hw_set_hw_params(struct iwl_priv *priv)
-{
-        if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES &&
-            priv->cfg->mod_params->num_of_queues <= IWL49_NUM_QUEUES)
-                priv->cfg->base_params->num_of_queues =
-                        priv->cfg->mod_params->num_of_queues;
-
-        priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;
-        priv->hw_params.dma_chnl_num = FH49_TCSR_CHNL_NUM;
-        priv->hw_params.scd_bc_tbls_size =
-                        priv->cfg->base_params->num_of_queues *
-                        sizeof(struct iwl4965_scd_bc_tbl);
-        priv->hw_params.tfd_size = sizeof(struct iwl_tfd);
-        priv->hw_params.max_stations = IWL4965_STATION_COUNT;
-        priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWL4965_BROADCAST_ID;
-        priv->hw_params.max_data_size = IWL49_RTC_DATA_SIZE;
-        priv->hw_params.max_inst_size = IWL49_RTC_INST_SIZE;
-        priv->hw_params.max_bsm_size = BSM_SRAM_SIZE;
-        priv->hw_params.ht40_channel = BIT(IEEE80211_BAND_5GHZ);
-
-        priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR;
-
-        priv->hw_params.tx_chains_num = iwl4965_num_of_ant(priv->cfg->valid_tx_ant);
-        priv->hw_params.rx_chains_num = iwl4965_num_of_ant(priv->cfg->valid_rx_ant);
-        priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;
-        priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;
-
-        iwl4965_set_ct_threshold(priv);
-
-        priv->hw_params.sens = &iwl4965_sensitivity;
-        priv->hw_params.beacon_time_tsf_bits = IWL4965_EXT_BEACON_TIME_POS;
-
-        return 0;
-}
-
-static s32 iwl4965_math_div_round(s32 num, s32 denom, s32 *res)
-{
-        s32 sign = 1;
-
-        if (num < 0) {
-                sign = -sign;
-                num = -num;
-        }
-        if (denom < 0) {
-                sign = -sign;
-                denom = -denom;
-        }
-        *res = 1;
-        *res = ((num * 2 + denom) / (denom * 2)) * sign;
-
-        return 1;
-}
-
-/**
- * iwl4965_get_voltage_compensation - Power supply voltage comp for txpower
- *
- * Determines power supply voltage compensation for txpower calculations.
- * Returns number of 1/2-dB steps to subtract from gain table index,
- * to compensate for difference between power supply voltage during
- * factory measurements, vs. current power supply voltage.
- *
- * Voltage indication is higher for lower voltage.
- * Lower voltage requires more gain (lower gain table index).
- */
-static s32 iwl4965_get_voltage_compensation(s32 eeprom_voltage,
-                                            s32 current_voltage)
-{
-        s32 comp = 0;
-
-        if ((TX_POWER_IWL_ILLEGAL_VOLTAGE == eeprom_voltage) ||
-            (TX_POWER_IWL_ILLEGAL_VOLTAGE == current_voltage))
-                return 0;
-
-        iwl4965_math_div_round(current_voltage - eeprom_voltage,
-                               TX_POWER_IWL_VOLTAGE_CODES_PER_03V, &comp);
-
-        if (current_voltage > eeprom_voltage)
-                comp *= 2;
-        if ((comp < -2) || (comp > 2))
-                comp = 0;
-
-        return comp;
-}
-
-static s32 iwl4965_get_tx_atten_grp(u16 channel)
-{
-        if (channel >= CALIB_IWL_TX_ATTEN_GR5_FCH &&
-            channel <= CALIB_IWL_TX_ATTEN_GR5_LCH)
-                return CALIB_CH_GROUP_5;
-
-        if (channel >= CALIB_IWL_TX_ATTEN_GR1_FCH &&
-            channel <= CALIB_IWL_TX_ATTEN_GR1_LCH)
-                return CALIB_CH_GROUP_1;
-
-        if (channel >= CALIB_IWL_TX_ATTEN_GR2_FCH &&
-            channel <= CALIB_IWL_TX_ATTEN_GR2_LCH)
-                return CALIB_CH_GROUP_2;
-
-        if (channel >= CALIB_IWL_TX_ATTEN_GR3_FCH &&
-            channel <= CALIB_IWL_TX_ATTEN_GR3_LCH)
-                return CALIB_CH_GROUP_3;
-
-        if (channel >= CALIB_IWL_TX_ATTEN_GR4_FCH &&
-            channel <= CALIB_IWL_TX_ATTEN_GR4_LCH)
-                return CALIB_CH_GROUP_4;
-
-        return -EINVAL;
-}
-
-static u32 iwl4965_get_sub_band(const struct iwl_priv *priv, u32 channel)
-{
-        s32 b = -1;
-
-        for (b = 0; b < EEPROM_TX_POWER_BANDS; b++) {
-                if (priv->calib_info->band_info[b].ch_from == 0)
-                        continue;
-
-                if ((channel >= priv->calib_info->band_info[b].ch_from)
-                    && (channel <= priv->calib_info->band_info[b].ch_to))
-                        break;
-        }
-
-        return b;
-}
-
-static s32 iwl4965_interpolate_value(s32 x, s32 x1, s32 y1, s32 x2, s32 y2)
-{
-        s32 val;
-
-        if (x2 == x1)
-                return y1;
-        else {
-                iwl4965_math_div_round((x2 - x) * (y1 - y2), (x2 - x1), &val);
-                return val + y2;
-        }
-}
-
-/**
- * iwl4965_interpolate_chan - Interpolate factory measurements for one channel
- *
- * Interpolates factory measurements from the two sample channels within a
- * sub-band, to apply to channel of interest.  Interpolation is proportional to
- * differences in channel frequencies, which is proportional to differences
- * in channel number.
- */
-static int iwl4965_interpolate_chan(struct iwl_priv *priv, u32 channel,
-                                    struct iwl_eeprom_calib_ch_info *chan_info)
-{
-        s32 s = -1;
-        u32 c;
-        u32 m;
-        const struct iwl_eeprom_calib_measure *m1;
-        const struct iwl_eeprom_calib_measure *m2;
-        struct iwl_eeprom_calib_measure *omeas;
-        u32 ch_i1;
-        u32 ch_i2;
-
-        s = iwl4965_get_sub_band(priv, channel);
-        if (s >= EEPROM_TX_POWER_BANDS) {
-                IWL_ERR(priv, "Tx Power can not find channel %d\n", channel);
-                return -1;
-        }
-
-        ch_i1 = priv->calib_info->band_info[s].ch1.ch_num;
-        ch_i2 = priv->calib_info->band_info[s].ch2.ch_num;
-        chan_info->ch_num = (u8) channel;
-
-        IWL_DEBUG_TXPOWER(priv, "channel %d subband %d factory cal ch %d & %d\n",
-                          channel, s, ch_i1, ch_i2);
-
-        for (c = 0; c < EEPROM_TX_POWER_TX_CHAINS; c++) {
-                for (m = 0; m < EEPROM_TX_POWER_MEASUREMENTS; m++) {
-                        m1 = &(priv->calib_info->band_info[s].ch1.
-                               measurements[c][m]);
-                        m2 = &(priv->calib_info->band_info[s].ch2.
-                               measurements[c][m]);
-                        omeas = &(chan_info->measurements[c][m]);
-
-                        omeas->actual_pow =
-                            (u8) iwl4965_interpolate_value(channel, ch_i1,
-                                                           m1->actual_pow,
-                                                           ch_i2,
-                                                           m2->actual_pow);
-                        omeas->gain_idx =
-                            (u8) iwl4965_interpolate_value(channel, ch_i1,
-                                                           m1->gain_idx, ch_i2,
-                                                           m2->gain_idx);
-                        omeas->temperature =
-                            (u8) iwl4965_interpolate_value(channel, ch_i1,
-                                                           m1->temperature,
-                                                           ch_i2,
-                                                           m2->temperature);
-                        omeas->pa_det =
-                            (s8) iwl4965_interpolate_value(channel, ch_i1,
-                                                           m1->pa_det, ch_i2,
-                                                           m2->pa_det);
-
-                        IWL_DEBUG_TXPOWER(priv,
-                                "chain %d meas %d AP1=%d AP2=%d AP=%d\n", c, m,
-                                m1->actual_pow, m2->actual_pow, omeas->actual_pow);
-                        IWL_DEBUG_TXPOWER(priv,
-                                "chain %d meas %d NI1=%d NI2=%d NI=%d\n", c, m,
-                                m1->gain_idx, m2->gain_idx, omeas->gain_idx);
-                        IWL_DEBUG_TXPOWER(priv,
-                                "chain %d meas %d PA1=%d PA2=%d PA=%d\n", c, m,
-                                m1->pa_det, m2->pa_det, omeas->pa_det);
-                        IWL_DEBUG_TXPOWER(priv,
-                                "chain %d meas %d  T1=%d  T2=%d  T=%d\n", c, m,
-                                m1->temperature, m2->temperature,
-                                omeas->temperature);
-                }
-        }
-
-        return 0;
-}
-
-/* bit-rate-dependent table to prevent Tx distortion, in half-dB units,
- * for OFDM 6, 12, 18, 24, 36, 48, 54, 60 MBit, and CCK all rates. */
-static s32 back_off_table[] = {
-        10, 10, 10, 10, 10, 15, 17, 20, /* OFDM SISO 20 MHz */
-        10, 10, 10, 10, 10, 15, 17, 20, /* OFDM MIMO 20 MHz */
-        10, 10, 10, 10, 10, 15, 17, 20, /* OFDM SISO 40 MHz */
-        10, 10, 10, 10, 10, 15, 17, 20, /* OFDM MIMO 40 MHz */
-        10                      /* CCK */
-};
-
-/* Thermal compensation values for txpower for various frequency ranges ...
- *   ratios from 3:1 to 4.5:1 of degrees (Celsius) per half-dB gain adjust */
-static struct iwl4965_txpower_comp_entry {
-        s32 degrees_per_05db_a;
-        s32 degrees_per_05db_a_denom;
-} tx_power_cmp_tble[CALIB_CH_GROUP_MAX] = {
-        {9, 2},                 /* group 0 5.2, ch  34-43 */
-        {4, 1},                 /* group 1 5.2, ch  44-70 */
-        {4, 1},                 /* group 2 5.2, ch  71-124 */
-        {4, 1},                 /* group 3 5.2, ch 125-200 */
-        {3, 1}                  /* group 4 2.4, ch   all */
-};
-
-static s32 get_min_power_index(s32 rate_power_index, u32 band)
-{
-        if (!band) {
-                if ((rate_power_index & 7) <= 4)
-                        return MIN_TX_GAIN_INDEX_52GHZ_EXT;
-        }
-        return MIN_TX_GAIN_INDEX;
-}
-
-struct gain_entry {
-        u8 dsp;
-        u8 radio;
-};
-
-static const struct gain_entry gain_table[2][108] = {
-        /* 5.2GHz power gain index table */
-        {
-         {123, 0x3F},           /* highest txpower */
-         {117, 0x3F},
-         {110, 0x3F},
-         {104, 0x3F},
-         {98, 0x3F},
-         {110, 0x3E},
-         {104, 0x3E},
-         {98, 0x3E},
-         {110, 0x3D},
-         {104, 0x3D},
-         {98, 0x3D},
-         {110, 0x3C},
-         {104, 0x3C},
-         {98, 0x3C},
-         {110, 0x3B},
-         {104, 0x3B},
-         {98, 0x3B},
-         {110, 0x3A},
-         {104, 0x3A},
-         {98, 0x3A},
-         {110, 0x39},
-         {104, 0x39},
-         {98, 0x39},
-         {110, 0x38},
-         {104, 0x38},
-         {98, 0x38},
-         {110, 0x37},
-         {104, 0x37},
-         {98, 0x37},
-         {110, 0x36},
-         {104, 0x36},
-         {98, 0x36},
-         {110, 0x35},
-         {104, 0x35},
-         {98, 0x35},
-         {110, 0x34},
-         {104, 0x34},
-         {98, 0x34},
-         {110, 0x33},
-         {104, 0x33},
-         {98, 0x33},
-         {110, 0x32},
-         {104, 0x32},
-         {98, 0x32},
-         {110, 0x31},
-         {104, 0x31},
-         {98, 0x31},
-         {110, 0x30},
-         {104, 0x30},
-         {98, 0x30},
-         {110, 0x25},
-         {104, 0x25},
-         {98, 0x25},
-         {110, 0x24},
-         {104, 0x24},
-         {98, 0x24},
-         {110, 0x23},
-         {104, 0x23},
-         {98, 0x23},
-         {110, 0x22},
-         {104, 0x18},
-         {98, 0x18},
-         {110, 0x17},
-         {104, 0x17},
-         {98, 0x17},
-         {110, 0x16},
-         {104, 0x16},
-         {98, 0x16},
-         {110, 0x15},
-         {104, 0x15},
-         {98, 0x15},
-         {110, 0x14},
-         {104, 0x14},
-         {98, 0x14},
-         {110, 0x13},
-         {104, 0x13},
-         {98, 0x13},
-         {110, 0x12},
-         {104, 0x08},
-         {98, 0x08},
-         {110, 0x07},
-         {104, 0x07},
-         {98, 0x07},
-         {110, 0x06},
-         {104, 0x06},
-         {98, 0x06},
-         {110, 0x05},
-         {104, 0x05},
-         {98, 0x05},
-         {110, 0x04},
-         {104, 0x04},
-         {98, 0x04},
-         {110, 0x03},
-         {104, 0x03},
-         {98, 0x03},
-         {110, 0x02},
-         {104, 0x02},
-         {98, 0x02},
-         {110, 0x01},
-         {104, 0x01},
-         {98, 0x01},
-         {110, 0x00},
-         {104, 0x00},
-         {98, 0x00},
-         {93, 0x00},
-         {88, 0x00},
-         {83, 0x00},
-         {78, 0x00},
-         },
-        /* 2.4GHz power gain index table */
-        {
-         {110, 0x3f},           /* highest txpower */
-         {104, 0x3f},
-         {98, 0x3f},
-         {110, 0x3e},
-         {104, 0x3e},
-         {98, 0x3e},
-         {110, 0x3d},
-         {104, 0x3d},
-         {98, 0x3d},
-         {110, 0x3c},
-         {104, 0x3c},
-         {98, 0x3c},
-         {110, 0x3b},
-         {104, 0x3b},
-         {98, 0x3b},
-         {110, 0x3a},
-         {104, 0x3a},
-         {98, 0x3a},
-         {110, 0x39},
-         {104, 0x39},
-         {98, 0x39},
-         {110, 0x38},
-         {104, 0x38},
-         {98, 0x38},
-         {110, 0x37},
-         {104, 0x37},
-         {98, 0x37},
-         {110, 0x36},
-         {104, 0x36},
-         {98, 0x36},
-         {110, 0x35},
-         {104, 0x35},
-         {98, 0x35},
-         {110, 0x34},
-         {104, 0x34},
-         {98, 0x34},
-         {110, 0x33},
-         {104, 0x33},
-         {98, 0x33},
-         {110, 0x32},
-         {104, 0x32},
-         {98, 0x32},
-         {110, 0x31},
-         {104, 0x31},
-         {98, 0x31},
-         {110, 0x30},
-         {104, 0x30},
-         {98, 0x30},
-         {110, 0x6},
-         {104, 0x6},
-         {98, 0x6},
-         {110, 0x5},
-         {104, 0x5},
-         {98, 0x5},
-         {110, 0x4},
-         {104, 0x4},
-         {98, 0x4},
-         {110, 0x3},
-         {104, 0x3},
-         {98, 0x3},
-         {110, 0x2},
-         {104, 0x2},
-         {98, 0x2},
-         {110, 0x1},
-         {104, 0x1},
-         {98, 0x1},
-         {110, 0x0},
-         {104, 0x0},
-         {98, 0x0},
-         {97, 0},
-         {96, 0},
-         {95, 0},
-         {94, 0},
-         {93, 0},
-         {92, 0},
-         {91, 0},
-         {90, 0},
-         {89, 0},
-         {88, 0},
-         {87, 0},
-         {86, 0},
-         {85, 0},
-         {84, 0},
-         {83, 0},
-         {82, 0},
-         {81, 0},
-         {80, 0},
-         {79, 0},
-         {78, 0},
-         {77, 0},
-         {76, 0},
-         {75, 0},
-         {74, 0},
-         {73, 0},
-         {72, 0},
-         {71, 0},
-         {70, 0},
-         {69, 0},
-         {68, 0},
-         {67, 0},
-         {66, 0},
-         {65, 0},
-         {64, 0},
-         {63, 0},
-         {62, 0},
-         {61, 0},
-         {60, 0},
-         {59, 0},
-         }
-};
-
-static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel,
-                                    u8 is_ht40, u8 ctrl_chan_high,
-                                    struct iwl4965_tx_power_db *tx_power_tbl)
-{
-        u8 saturation_power;
-        s32 target_power;
-        s32 user_target_power;
-        s32 power_limit;
-        s32 current_temp;
-        s32 reg_limit;
-        s32 current_regulatory;
-        s32 txatten_grp = CALIB_CH_GROUP_MAX;
-        int i;
-        int c;
-        const struct iwl_channel_info *ch_info = NULL;
-        struct iwl_eeprom_calib_ch_info ch_eeprom_info;
-        const struct iwl_eeprom_calib_measure *measurement;
-        s16 voltage;
-        s32 init_voltage;
-        s32 voltage_compensation;
-        s32 degrees_per_05db_num;
-        s32 degrees_per_05db_denom;
-        s32 factory_temp;
-        s32 temperature_comp[2];
-        s32 factory_gain_index[2];
-        s32 factory_actual_pwr[2];
-        s32 power_index;
-
-        /* tx_power_user_lmt is in dBm, convert to half-dBm (half-dB units
-         *   are used for indexing into txpower table) */
-        user_target_power = 2 * priv->tx_power_user_lmt;
-
-        /* Get current (RXON) channel, band, width */
-        IWL_DEBUG_TXPOWER(priv, "chan %d band %d is_ht40 %d\n", channel, band,
-                          is_ht40);
-
-        ch_info = iwl_legacy_get_channel_info(priv, priv->band, channel);
-
-        if (!iwl_legacy_is_channel_valid(ch_info))
-                return -EINVAL;
-
-        /* get txatten group, used to select 1) thermal txpower adjustment
-         *   and 2) mimo txpower balance between Tx chains. */
-        txatten_grp = iwl4965_get_tx_atten_grp(channel);
-        if (txatten_grp < 0) {
-                IWL_ERR(priv, "Can't find txatten group for channel %d.\n",
-                          channel);
-                return txatten_grp;
-        }
-
-        IWL_DEBUG_TXPOWER(priv, "channel %d belongs to txatten group %d\n",
-                          channel, txatten_grp);
-
-        if (is_ht40) {
-                if (ctrl_chan_high)
-                        channel -= 2;
-                else
-                        channel += 2;
-        }
-
-        /* hardware txpower limits ...
-         * saturation (clipping distortion) txpowers are in half-dBm */
-        if (band)
-                saturation_power = priv->calib_info->saturation_power24;
-        else
-                saturation_power = priv->calib_info->saturation_power52;
-
-        if (saturation_power < IWL_TX_POWER_SATURATION_MIN ||
-            saturation_power > IWL_TX_POWER_SATURATION_MAX) {
-                if (band)
-                        saturation_power = IWL_TX_POWER_DEFAULT_SATURATION_24;
-                else
-                        saturation_power = IWL_TX_POWER_DEFAULT_SATURATION_52;
-        }
-
-        /* regulatory txpower limits ... reg_limit values are in half-dBm,
-         *   max_power_avg values are in dBm, convert * 2 */
-        if (is_ht40)
-                reg_limit = ch_info->ht40_max_power_avg * 2;
-        else
-                reg_limit = ch_info->max_power_avg * 2;
-
-        if ((reg_limit < IWL_TX_POWER_REGULATORY_MIN) ||
-            (reg_limit > IWL_TX_POWER_REGULATORY_MAX)) {
-                if (band)
-                        reg_limit = IWL_TX_POWER_DEFAULT_REGULATORY_24;
-                else
-                        reg_limit = IWL_TX_POWER_DEFAULT_REGULATORY_52;
-        }
-
-        /* Interpolate txpower calibration values for this channel,
-         *   based on factory calibration tests on spaced channels. */
-        iwl4965_interpolate_chan(priv, channel, &ch_eeprom_info);
-
-        /* calculate tx gain adjustment based on power supply voltage */
-        voltage = le16_to_cpu(priv->calib_info->voltage);
-        init_voltage = (s32)le32_to_cpu(priv->card_alive_init.voltage);
-        voltage_compensation =
-            iwl4965_get_voltage_compensation(voltage, init_voltage);
-
-        IWL_DEBUG_TXPOWER(priv, "curr volt %d eeprom volt %d volt comp %d\n",
-                          init_voltage,
-                          voltage, voltage_compensation);
-
-        /* get current temperature (Celsius) */
-        current_temp = max(priv->temperature, IWL_TX_POWER_TEMPERATURE_MIN);
-        current_temp = min(priv->temperature, IWL_TX_POWER_TEMPERATURE_MAX);
-        current_temp = KELVIN_TO_CELSIUS(current_temp);
-
-        /* select thermal txpower adjustment params, based on channel group
-         *   (same frequency group used for mimo txatten adjustment) */
-        degrees_per_05db_num =
-            tx_power_cmp_tble[txatten_grp].degrees_per_05db_a;
-        degrees_per_05db_denom =
-            tx_power_cmp_tble[txatten_grp].degrees_per_05db_a_denom;
-
-        /* get per-chain txpower values from factory measurements */
-        for (c = 0; c < 2; c++) {
-                measurement = &ch_eeprom_info.measurements[c][1];
-
-                /* txgain adjustment (in half-dB steps) based on difference
-                 *   between factory and current temperature */
-                factory_temp = measurement->temperature;
-                iwl4965_math_div_round((current_temp - factory_temp) *
-                                       degrees_per_05db_denom,
-                                       degrees_per_05db_num,
-                                       &temperature_comp[c]);
-
-                factory_gain_index[c] = measurement->gain_idx;
-                factory_actual_pwr[c] = measurement->actual_pow;
-
-                IWL_DEBUG_TXPOWER(priv, "chain = %d\n", c);
-                IWL_DEBUG_TXPOWER(priv, "fctry tmp %d, "
-                                  "curr tmp %d, comp %d steps\n",
-                                  factory_temp, current_temp,
-                                  temperature_comp[c]);
-
-                IWL_DEBUG_TXPOWER(priv, "fctry idx %d, fctry pwr %d\n",
-                                  factory_gain_index[c],
-                                  factory_actual_pwr[c]);
-        }
-
-        /* for each of 33 bit-rates (including 1 for CCK) */
-        for (i = 0; i < POWER_TABLE_NUM_ENTRIES; i++) {
-                u8 is_mimo_rate;
-                union iwl4965_tx_power_dual_stream tx_power;
-
-                /* for mimo, reduce each chain's txpower by half
-                 * (3dB, 6 steps), so total output power is regulatory
-                 * compliant. */
-                if (i & 0x8) {
-                        current_regulatory = reg_limit -
-                            IWL_TX_POWER_MIMO_REGULATORY_COMPENSATION;
-                        is_mimo_rate = 1;
-                } else {
-                        current_regulatory = reg_limit;
-                        is_mimo_rate = 0;
-                }
-
-                /* find txpower limit, either hardware or regulatory */
-                power_limit = saturation_power - back_off_table[i];
-                if (power_limit > current_regulatory)
-                        power_limit = current_regulatory;
-
-                /* reduce user's txpower request if necessary
-                 * for this rate on this channel */
-                target_power = user_target_power;
-                if (target_power > power_limit)
-                        target_power = power_limit;
-
-                IWL_DEBUG_TXPOWER(priv, "rate %d sat %d reg %d usr %d tgt %d\n",
-                                  i, saturation_power - back_off_table[i],
-                                  current_regulatory, user_target_power,
-                                  target_power);
-
-                /* for each of 2 Tx chains (radio transmitters) */
-                for (c = 0; c < 2; c++) {
-                        s32 atten_value;
-
-                        if (is_mimo_rate)
-                                atten_value =
-                                    (s32)le32_to_cpu(priv->card_alive_init.
-                                    tx_atten[txatten_grp][c]);
-                        else
-                                atten_value = 0;
-
-                        /* calculate index; higher index means lower txpower */
-                        power_index = (u8) (factory_gain_index[c] -
-                                            (target_power -
-                                             factory_actual_pwr[c]) -
-                                            temperature_comp[c] -
-                                            voltage_compensation +
-                                            atten_value);
-
-/*                      IWL_DEBUG_TXPOWER(priv, "calculated txpower index %d\n",
-                                                power_index); */
-
-                        if (power_index < get_min_power_index(i, band))
-                                power_index = get_min_power_index(i, band);
-
-                        /* adjust 5 GHz index to support negative indexes */
-                        if (!band)
-                                power_index += 9;
-
-                        /* CCK, rate 32, reduce txpower for CCK */
-                        if (i == POWER_TABLE_CCK_ENTRY)
-                                power_index +=
-                                    IWL_TX_POWER_CCK_COMPENSATION_C_STEP;
-
-                        /* stay within the table! */
-                        if (power_index > 107) {
-                                IWL_WARN(priv, "txpower index %d > 107\n",
-                                            power_index);
-                                power_index = 107;
-                        }
-                        if (power_index < 0) {
-                                IWL_WARN(priv, "txpower index %d < 0\n",
-                                            power_index);
-                                power_index = 0;
-                        }
-
-                        /* fill txpower command for this rate/chain */
-                        tx_power.s.radio_tx_gain[c] =
-                                gain_table[band][power_index].radio;
-                        tx_power.s.dsp_predis_atten[c] =
-                                gain_table[band][power_index].dsp;
-
-                        IWL_DEBUG_TXPOWER(priv, "chain %d mimo %d index %d "
-                                          "gain 0x%02x dsp %d\n",
-                                          c, atten_value, power_index,
-                                        tx_power.s.radio_tx_gain[c],
-                                        tx_power.s.dsp_predis_atten[c]);
-                } /* for each chain */
-
-                tx_power_tbl->power_tbl[i].dw = cpu_to_le32(tx_power.dw);
-
-        } /* for each rate */
-
-        return 0;
-}
-
-/**
- * iwl4965_send_tx_power - Configure the TXPOWER level user limit
- *
- * Uses the active RXON for channel, band, and characteristics (ht40, high)
- * The power limit is taken from priv->tx_power_user_lmt.
- */
-static int iwl4965_send_tx_power(struct iwl_priv *priv)
-{
-        struct iwl4965_txpowertable_cmd cmd = { 0 };
-        int ret;
-        u8 band = 0;
-        bool is_ht40 = false;
-        u8 ctrl_chan_high = 0;
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-        if (WARN_ONCE(test_bit(STATUS_SCAN_HW, &priv->status),
-                      "TX Power requested while scanning!\n"))
-                return -EAGAIN;
-
-        band = priv->band == IEEE80211_BAND_2GHZ;
-
-        is_ht40 = iw4965_is_ht40_channel(ctx->active.flags);
-
-        if (is_ht40 && (ctx->active.flags & RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK))
-                ctrl_chan_high = 1;
-
-        cmd.band = band;
-        cmd.channel = ctx->active.channel;
-
-        ret = iwl4965_fill_txpower_tbl(priv, band,
-                                le16_to_cpu(ctx->active.channel),
-                                is_ht40, ctrl_chan_high, &cmd.tx_power);
-        if (ret)
-                goto out;
-
-        ret = iwl_legacy_send_cmd_pdu(priv,
-                         REPLY_TX_PWR_TABLE_CMD, sizeof(cmd), &cmd);
-
-out:
-        return ret;
-}
-
-static int iwl4965_send_rxon_assoc(struct iwl_priv *priv,
-                                   struct iwl_rxon_context *ctx)
-{
-        int ret = 0;
-        struct iwl4965_rxon_assoc_cmd rxon_assoc;
-        const struct iwl_legacy_rxon_cmd *rxon1 = &ctx->staging;
-        const struct iwl_legacy_rxon_cmd *rxon2 = &ctx->active;
-
-        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(priv, "Using current RXON_ASSOC.  Not resending.\n");
-                return 0;
-        }
-
-        rxon_assoc.flags = ctx->staging.flags;
-        rxon_assoc.filter_flags = ctx->staging.filter_flags;
-        rxon_assoc.ofdm_basic_rates = ctx->staging.ofdm_basic_rates;
-        rxon_assoc.cck_basic_rates = ctx->staging.cck_basic_rates;
-        rxon_assoc.reserved = 0;
-        rxon_assoc.ofdm_ht_single_stream_basic_rates =
-            ctx->staging.ofdm_ht_single_stream_basic_rates;
-        rxon_assoc.ofdm_ht_dual_stream_basic_rates =
-            ctx->staging.ofdm_ht_dual_stream_basic_rates;
-        rxon_assoc.rx_chain_select_flags = ctx->staging.rx_chain;
-
-        ret = iwl_legacy_send_cmd_pdu_async(priv, REPLY_RXON_ASSOC,
-                                     sizeof(rxon_assoc), &rxon_assoc, NULL);
-
-        return ret;
-}
-
-static int iwl4965_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
-{
-        /* cast away the const for active_rxon in this function */
-        struct iwl_legacy_rxon_cmd *active_rxon = (void *)&ctx->active;
-        int ret;
-        bool new_assoc =
-                !!(ctx->staging.filter_flags & RXON_FILTER_ASSOC_MSK);
-
-        if (!iwl_legacy_is_alive(priv))
-                return -EBUSY;
-
-        if (!ctx->is_active)
-                return 0;
-
-        /* always get timestamp with Rx frame */
-        ctx->staging.flags |= RXON_FLG_TSF2HOST_MSK;
-
-        ret = iwl_legacy_check_rxon_cmd(priv, ctx);
-        if (ret) {
-                IWL_ERR(priv, "Invalid RXON configuration.  Not committing.\n");
-                return -EINVAL;
-        }
-
-        /*
-         * receive commit_rxon request
-         * abort any previous channel switch if still in process
-         */
-        if (test_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status) &&
-            (priv->switch_channel != ctx->staging.channel)) {
-                IWL_DEBUG_11H(priv, "abort channel switch on %d\n",
-                      le16_to_cpu(priv->switch_channel));
-                iwl_legacy_chswitch_done(priv, false);
-        }
-
-        /* If we don't need to send a full RXON, we can use
-         * iwl_rxon_assoc_cmd which is used to reconfigure filter
-         * and other flags for the current radio configuration. */
-        if (!iwl_legacy_full_rxon_required(priv, ctx)) {
-                ret = iwl_legacy_send_rxon_assoc(priv, ctx);
-                if (ret) {
-                        IWL_ERR(priv, "Error setting RXON_ASSOC (%d)\n", ret);
-                        return ret;
-                }
-
-                memcpy(active_rxon, &ctx->staging, sizeof(*active_rxon));
-                iwl_legacy_print_rx_config_cmd(priv, ctx);
-                /*
-                 * We do not commit tx power settings while channel changing,
-                 * do it now if tx power changed.
-                 */
-                iwl_legacy_set_tx_power(priv, priv->tx_power_next, false);
-                return 0;
-        }
-
-        /* If we are currently associated and the new config requires
-         * 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 (iwl_legacy_is_associated_ctx(ctx) && new_assoc) {
-                IWL_DEBUG_INFO(priv, "Toggling associated bit on current RXON\n");
-                active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
-
-                ret = iwl_legacy_send_cmd_pdu(priv, ctx->rxon_cmd,
-                                       sizeof(struct iwl_legacy_rxon_cmd),
-                                       active_rxon);
-
-                /* If the mask clearing failed then we set
-                 * active_rxon back to what it was previously */
-                if (ret) {
-                        active_rxon->filter_flags |= RXON_FILTER_ASSOC_MSK;
-                        IWL_ERR(priv, "Error clearing ASSOC_MSK (%d)\n", ret);
-                        return ret;
-                }
-                iwl_legacy_clear_ucode_stations(priv, ctx);
-                iwl_legacy_restore_stations(priv, ctx);
-                ret = iwl4965_restore_default_wep_keys(priv, ctx);
-                if (ret) {
-                        IWL_ERR(priv, "Failed to restore WEP keys (%d)\n", ret);
-                        return ret;
-                }
-        }
-
-        IWL_DEBUG_INFO(priv, "Sending RXON\n"
-                       "* with%s RXON_FILTER_ASSOC_MSK\n"
-                       "* channel = %d\n"
-                       "* bssid = %pM\n",
-                       (new_assoc ? "" : "out"),
-                       le16_to_cpu(ctx->staging.channel),
-                       ctx->staging.bssid_addr);
-
-        iwl_legacy_set_rxon_hwcrypto(priv, ctx,
-                                !priv->cfg->mod_params->sw_crypto);
-
-        /* Apply the new configuration
-         * RXON unassoc clears the station table in uCode so restoration of
-         * stations is needed after it (the RXON command) completes
-         */
-        if (!new_assoc) {
-                ret = iwl_legacy_send_cmd_pdu(priv, ctx->rxon_cmd,
-                              sizeof(struct iwl_legacy_rxon_cmd), &ctx->staging);
-                if (ret) {
-                        IWL_ERR(priv, "Error setting new RXON (%d)\n", ret);
-                        return ret;
-                }
-                IWL_DEBUG_INFO(priv, "Return from !new_assoc RXON.\n");
-                memcpy(active_rxon, &ctx->staging, sizeof(*active_rxon));
-                iwl_legacy_clear_ucode_stations(priv, ctx);
-                iwl_legacy_restore_stations(priv, ctx);
-                ret = iwl4965_restore_default_wep_keys(priv, ctx);
-                if (ret) {
-                        IWL_ERR(priv, "Failed to restore WEP keys (%d)\n", ret);
-                        return ret;
-                }
-        }
-        if (new_assoc) {
-                priv->start_calib = 0;
-                /* Apply the new configuration
-                 * RXON assoc doesn't clear the station table in uCode,
-                 */
-                ret = iwl_legacy_send_cmd_pdu(priv, ctx->rxon_cmd,
-                              sizeof(struct iwl_legacy_rxon_cmd), &ctx->staging);
-                if (ret) {
-                        IWL_ERR(priv, "Error setting new RXON (%d)\n", ret);
-                        return ret;
-                }
-                memcpy(active_rxon, &ctx->staging, sizeof(*active_rxon));
-        }
-        iwl_legacy_print_rx_config_cmd(priv, ctx);
-
-        iwl4965_init_sensitivity(priv);
-
-        /* If we issue a new RXON command which required a tune then we must
-         * send a new TXPOWER command or we won't be able to Tx any frames */
-        ret = iwl_legacy_set_tx_power(priv, priv->tx_power_next, true);
-        if (ret) {
-                IWL_ERR(priv, "Error sending TX power (%d)\n", ret);
-                return ret;
-        }
-
-        return 0;
-}
-
-static int iwl4965_hw_channel_switch(struct iwl_priv *priv,
-                                     struct ieee80211_channel_switch *ch_switch)
-{
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        int rc;
-        u8 band = 0;
-        bool is_ht40 = false;
-        u8 ctrl_chan_high = 0;
-        struct iwl4965_channel_switch_cmd cmd;
-        const struct iwl_channel_info *ch_info;
-        u32 switch_time_in_usec, ucode_switch_time;
-        u16 ch;
-        u32 tsf_low;
-        u8 switch_count;
-        u16 beacon_interval = le16_to_cpu(ctx->timing.beacon_interval);
-        struct ieee80211_vif *vif = ctx->vif;
-        band = priv->band == IEEE80211_BAND_2GHZ;
-
-        is_ht40 = iw4965_is_ht40_channel(ctx->staging.flags);
-
-        if (is_ht40 &&
-            (ctx->staging.flags & RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK))
-                ctrl_chan_high = 1;
-
-        cmd.band = band;
-        cmd.expect_beacon = 0;
-        ch = ch_switch->channel->hw_value;
-        cmd.channel = cpu_to_le16(ch);
-        cmd.rxon_flags = ctx->staging.flags;
-        cmd.rxon_filter_flags = ctx->staging.filter_flags;
-        switch_count = ch_switch->count;
-        tsf_low = ch_switch->timestamp & 0x0ffffffff;
-        /*
-         * calculate the ucode channel switch time
-         * adding TSF as one of the factor for when to switch
-         */
-        if ((priv->ucode_beacon_time > tsf_low) && beacon_interval) {
-                if (switch_count > ((priv->ucode_beacon_time - tsf_low) /
-                    beacon_interval)) {
-                        switch_count -= (priv->ucode_beacon_time -
-                                tsf_low) / beacon_interval;
-                } else
-                        switch_count = 0;
-        }
-        if (switch_count <= 1)
-                cmd.switch_time = cpu_to_le32(priv->ucode_beacon_time);
-        else {
-                switch_time_in_usec =
-                        vif->bss_conf.beacon_int * switch_count * TIME_UNIT;
-                ucode_switch_time = iwl_legacy_usecs_to_beacons(priv,
-                                                         switch_time_in_usec,
-                                                         beacon_interval);
-                cmd.switch_time = iwl_legacy_add_beacon_time(priv,
-                                                      priv->ucode_beacon_time,
-                                                      ucode_switch_time,
-                                                      beacon_interval);
-        }
-        IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",
-                      cmd.switch_time);
-        ch_info = iwl_legacy_get_channel_info(priv, priv->band, ch);
-        if (ch_info)
-                cmd.expect_beacon = iwl_legacy_is_channel_radar(ch_info);
-        else {
-                IWL_ERR(priv, "invalid channel switch from %u to %u\n",
-                        ctx->active.channel, ch);
-                return -EFAULT;
-        }
-
-        rc = iwl4965_fill_txpower_tbl(priv, band, ch, is_ht40,
-                                      ctrl_chan_high, &cmd.tx_power);
-        if (rc) {
-                IWL_DEBUG_11H(priv, "error:%d  fill txpower_tbl\n", rc);
-                return rc;
-        }
-
-        return iwl_legacy_send_cmd_pdu(priv,
-                         REPLY_CHANNEL_SWITCH, sizeof(cmd), &cmd);
-}
-
-/**
- * iwl4965_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array
- */
-static void iwl4965_txq_update_byte_cnt_tbl(struct iwl_priv *priv,
-                                            struct iwl_tx_queue *txq,
-                                            u16 byte_cnt)
-{
-        struct iwl4965_scd_bc_tbl *scd_bc_tbl = priv->scd_bc_tbls.addr;
-        int txq_id = txq->q.id;
-        int write_ptr = txq->q.write_ptr;
-        int len = byte_cnt + IWL_TX_CRC_SIZE + IWL_TX_DELIMITER_SIZE;
-        __le16 bc_ent;
-
-        WARN_ON(len > 0xFFF || write_ptr >= TFD_QUEUE_SIZE_MAX);
-
-        bc_ent = cpu_to_le16(len & 0xFFF);
-        /* Set up byte count within first 256 entries */
-        scd_bc_tbl[txq_id].tfd_offset[write_ptr] = bc_ent;
-
-        /* If within first 64 entries, duplicate at end */
-        if (write_ptr < TFD_QUEUE_SIZE_BC_DUP)
-                scd_bc_tbl[txq_id].
-                        tfd_offset[TFD_QUEUE_SIZE_MAX + write_ptr] = bc_ent;
-}
-
-/**
- * iwl4965_hw_get_temperature - return the calibrated temperature (in Kelvin)
- * @statistics: Provides the temperature reading from the uCode
- *
- * A return of <0 indicates bogus data in the statistics
- */
-static int iwl4965_hw_get_temperature(struct iwl_priv *priv)
-{
-        s32 temperature;
-        s32 vt;
-        s32 R1, R2, R3;
-        u32 R4;
-
-        if (test_bit(STATUS_TEMPERATURE, &priv->status) &&
-            (priv->_4965.statistics.flag &
-                        STATISTICS_REPLY_FLG_HT40_MODE_MSK)) {
-                IWL_DEBUG_TEMP(priv, "Running HT40 temperature calibration\n");
-                R1 = (s32)le32_to_cpu(priv->card_alive_init.therm_r1[1]);
-                R2 = (s32)le32_to_cpu(priv->card_alive_init.therm_r2[1]);
-                R3 = (s32)le32_to_cpu(priv->card_alive_init.therm_r3[1]);
-                R4 = le32_to_cpu(priv->card_alive_init.therm_r4[1]);
-        } else {
-                IWL_DEBUG_TEMP(priv, "Running temperature calibration\n");
-                R1 = (s32)le32_to_cpu(priv->card_alive_init.therm_r1[0]);
-                R2 = (s32)le32_to_cpu(priv->card_alive_init.therm_r2[0]);
-                R3 = (s32)le32_to_cpu(priv->card_alive_init.therm_r3[0]);
-                R4 = le32_to_cpu(priv->card_alive_init.therm_r4[0]);
-        }
-
-        /*
-         * Temperature is only 23 bits, so sign extend out to 32.
-         *
-         * NOTE If we haven't received a statistics notification yet
-         * with an updated temperature, use R4 provided to us in the
-         * "initialize" ALIVE response.
-         */
-        if (!test_bit(STATUS_TEMPERATURE, &priv->status))
-                vt = sign_extend32(R4, 23);
-        else
-                vt = sign_extend32(le32_to_cpu(priv->_4965.statistics.
-                                 general.common.temperature), 23);
-
-        IWL_DEBUG_TEMP(priv, "Calib values R[1-3]: %d %d %d R4: %d\n", R1, R2, R3, vt);
-
-        if (R3 == R1) {
-                IWL_ERR(priv, "Calibration conflict R1 == R3\n");
-                return -1;
-        }
-
-        /* Calculate temperature in degrees Kelvin, adjust by 97%.
-         * Add offset to center the adjustment around 0 degrees Centigrade. */
-        temperature = TEMPERATURE_CALIB_A_VAL * (vt - R2);
-        temperature /= (R3 - R1);
-        temperature = (temperature * 97) / 100 + TEMPERATURE_CALIB_KELVIN_OFFSET;
-
-        IWL_DEBUG_TEMP(priv, "Calibrated temperature: %dK, %dC\n",
-                        temperature, KELVIN_TO_CELSIUS(temperature));
-
-        return temperature;
-}
-
-/* Adjust Txpower only if temperature variance is greater than threshold. */
-#define IWL_TEMPERATURE_THRESHOLD   3
-
-/**
- * iwl4965_is_temp_calib_needed - determines if new calibration is needed
- *
- * If the temperature changed has changed sufficiently, then a recalibration
- * is needed.
- *
- * Assumes caller will replace priv->last_temperature once calibration
- * executed.
- */
-static int iwl4965_is_temp_calib_needed(struct iwl_priv *priv)
-{
-        int temp_diff;
-
-        if (!test_bit(STATUS_STATISTICS, &priv->status)) {
-                IWL_DEBUG_TEMP(priv, "Temperature not updated -- no statistics.\n");
-                return 0;
-        }
-
-        temp_diff = priv->temperature - priv->last_temperature;
-
-        /* get absolute value */
-        if (temp_diff < 0) {
-                IWL_DEBUG_POWER(priv, "Getting cooler, delta %d\n", temp_diff);
-                temp_diff = -temp_diff;
-        } else if (temp_diff == 0)
-                IWL_DEBUG_POWER(priv, "Temperature unchanged\n");
-        else
-                IWL_DEBUG_POWER(priv, "Getting warmer, delta %d\n", temp_diff);
-
-        if (temp_diff < IWL_TEMPERATURE_THRESHOLD) {
-                IWL_DEBUG_POWER(priv, " => thermal txpower calib not needed\n");
-                return 0;
-        }
-
-        IWL_DEBUG_POWER(priv, " => thermal txpower calib needed\n");
-
-        return 1;
-}
-
-static void iwl4965_temperature_calib(struct iwl_priv *priv)
-{
-        s32 temp;
-
-        temp = iwl4965_hw_get_temperature(priv);
-        if (IWL_TX_POWER_TEMPERATURE_OUT_OF_RANGE(temp))
-                return;
-
-        if (priv->temperature != temp) {
-                if (priv->temperature)
-                        IWL_DEBUG_TEMP(priv, "Temperature changed "
-                                       "from %dC to %dC\n",
-                                       KELVIN_TO_CELSIUS(priv->temperature),
-                                       KELVIN_TO_CELSIUS(temp));
-                else
-                        IWL_DEBUG_TEMP(priv, "Temperature "
-                                       "initialized to %dC\n",
-                                       KELVIN_TO_CELSIUS(temp));
-        }
-
-        priv->temperature = temp;
-        set_bit(STATUS_TEMPERATURE, &priv->status);
-
-        if (!priv->disable_tx_power_cal &&
-             unlikely(!test_bit(STATUS_SCANNING, &priv->status)) &&
-             iwl4965_is_temp_calib_needed(priv))
-                queue_work(priv->workqueue, &priv->txpower_work);
-}
-
-static u16 iwl4965_get_hcmd_size(u8 cmd_id, u16 len)
-{
-        switch (cmd_id) {
-        case REPLY_RXON:
-                return (u16) sizeof(struct iwl4965_rxon_cmd);
-        default:
-                return len;
-        }
-}
-
-static u16 iwl4965_build_addsta_hcmd(const struct iwl_legacy_addsta_cmd *cmd,
-                                                                u8 *data)
-{
-        struct iwl4965_addsta_cmd *addsta = (struct iwl4965_addsta_cmd *)data;
-        addsta->mode = cmd->mode;
-        memcpy(&addsta->sta, &cmd->sta, sizeof(struct sta_id_modify));
-        memcpy(&addsta->key, &cmd->key, sizeof(struct iwl4965_keyinfo));
-        addsta->station_flags = cmd->station_flags;
-        addsta->station_flags_msk = cmd->station_flags_msk;
-        addsta->tid_disable_tx = cmd->tid_disable_tx;
-        addsta->add_immediate_ba_tid = cmd->add_immediate_ba_tid;
-        addsta->remove_immediate_ba_tid = cmd->remove_immediate_ba_tid;
-        addsta->add_immediate_ba_ssn = cmd->add_immediate_ba_ssn;
-        addsta->sleep_tx_count = cmd->sleep_tx_count;
-        addsta->reserved1 = cpu_to_le16(0);
-        addsta->reserved2 = cpu_to_le16(0);
-
-        return (u16)sizeof(struct iwl4965_addsta_cmd);
-}
-
-static inline u32 iwl4965_get_scd_ssn(struct iwl4965_tx_resp *tx_resp)
-{
-        return le32_to_cpup(&tx_resp->u.status + tx_resp->frame_count) & MAX_SN;
-}
-
-/**
- * iwl4965_tx_status_reply_tx - Handle Tx response for frames in aggregation queue
- */
-static int iwl4965_tx_status_reply_tx(struct iwl_priv *priv,
-                                      struct iwl_ht_agg *agg,
-                                      struct iwl4965_tx_resp *tx_resp,
-                                      int txq_id, u16 start_idx)
-{
-        u16 status;
-        struct agg_tx_status *frame_status = tx_resp->u.agg_status;
-        struct ieee80211_tx_info *info = NULL;
-        struct ieee80211_hdr *hdr = NULL;
-        u32 rate_n_flags = le32_to_cpu(tx_resp->rate_n_flags);
-        int i, sh, idx;
-        u16 seq;
-        if (agg->wait_for_ba)
-                IWL_DEBUG_TX_REPLY(priv, "got tx response w/o block-ack\n");
-
-        agg->frame_count = tx_resp->frame_count;
-        agg->start_idx = start_idx;
-        agg->rate_n_flags = rate_n_flags;
-        agg->bitmap = 0;
-
-        /* num frames attempted by Tx command */
-        if (agg->frame_count == 1) {
-                /* Only one frame was attempted; no block-ack will arrive */
-                status = le16_to_cpu(frame_status[0].status);
-                idx = start_idx;
-
-                IWL_DEBUG_TX_REPLY(priv, "FrameCnt = %d, StartIdx=%d idx=%d\n",
-                                   agg->frame_count, agg->start_idx, idx);
-
-                info = IEEE80211_SKB_CB(priv->txq[txq_id].txb[idx].skb);
-                info->status.rates[0].count = tx_resp->failure_frame + 1;
-                info->flags &= ~IEEE80211_TX_CTL_AMPDU;
-                info->flags |= iwl4965_tx_status_to_mac80211(status);
-                iwl4965_hwrate_to_tx_control(priv, rate_n_flags, info);
-
-                IWL_DEBUG_TX_REPLY(priv, "1 Frame 0x%x failure :%d\n",
-                                    status & 0xff, tx_resp->failure_frame);
-                IWL_DEBUG_TX_REPLY(priv, "Rate Info rate_n_flags=%x\n", rate_n_flags);
-
-                agg->wait_for_ba = 0;
-        } else {
-                /* Two or more frames were attempted; expect block-ack */
-                u64 bitmap = 0;
-                int start = agg->start_idx;
-
-                /* Construct bit-map of pending frames within Tx window */
-                for (i = 0; i < agg->frame_count; i++) {
-                        u16 sc;
-                        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);
-
-                        if (status & (AGG_TX_STATE_FEW_BYTES_MSK |
-                                      AGG_TX_STATE_ABORT_MSK))
-                                continue;
-
-                        IWL_DEBUG_TX_REPLY(priv, "FrameCnt = %d, txq_id=%d idx=%d\n",
-                                           agg->frame_count, txq_id, idx);
-
-                        hdr = iwl_legacy_tx_queue_get_hdr(priv, txq_id, idx);
-                        if (!hdr) {
-                                IWL_ERR(priv,
-                                        "BUG_ON idx doesn't point to valid skb"
-                                        " idx=%d, txq_id=%d\n", idx, txq_id);
-                                return -1;
-                        }
-
-                        sc = le16_to_cpu(hdr->seq_ctrl);
-                        if (idx != (SEQ_TO_SN(sc) & 0xff)) {
-                                IWL_ERR(priv,
-                                        "BUG_ON idx doesn't match seq control"
-                                        " idx=%d, seq_idx=%d, seq=%d\n",
-                                        idx, SEQ_TO_SN(sc), hdr->seq_ctrl);
-                                return -1;
-                        }
-
-                        IWL_DEBUG_TX_REPLY(priv, "AGG Frame i=%d idx %d seq=%d\n",
-                                           i, idx, SEQ_TO_SN(sc));
-
-                        sh = idx - start;
-                        if (sh > 64) {
-                                sh = (start - idx) + 0xff;
-                                bitmap = bitmap << sh;
-                                sh = 0;
-                                start = idx;
-                        } else if (sh < -64)
-                                sh  = 0xff - (start - idx);
-                        else if (sh < 0) {
-                                sh = start - idx;
-                                start = idx;
-                                bitmap = bitmap << sh;
-                                sh = 0;
-                        }
-                        bitmap |= 1ULL << sh;
-                        IWL_DEBUG_TX_REPLY(priv, "start=%d bitmap=0x%llx\n",
-                                           start, (unsigned long long)bitmap);
-                }
-
-                agg->bitmap = bitmap;
-                agg->start_idx = start;
-                IWL_DEBUG_TX_REPLY(priv, "Frames %d start_idx=%d bitmap=0x%llx\n",
-                                   agg->frame_count, agg->start_idx,
-                                   (unsigned long long)agg->bitmap);
-
-                if (bitmap)
-                        agg->wait_for_ba = 1;
-        }
-        return 0;
-}
-
-static u8 iwl4965_find_station(struct iwl_priv *priv, const u8 *addr)
-{
-        int i;
-        int start = 0;
-        int ret = IWL_INVALID_STATION;
-        unsigned long flags;
-
-        if ((priv->iw_mode == NL80211_IFTYPE_ADHOC))
-                start = IWL_STA_ID;
-
-        if (is_broadcast_ether_addr(addr))
-                return priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        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))) {
-                        ret = i;
-                        goto out;
-                }
-
-        IWL_DEBUG_ASSOC_LIMIT(priv, "can not find STA %pM total %d\n",
-                              addr, priv->num_stations);
-
- out:
-        /*
-         * It may be possible that more commands interacting with stations
-         * arrive before we completed processing the adding of
-         * station
-         */
-        if (ret != IWL_INVALID_STATION &&
-            (!(priv->stations[ret].used & IWL_STA_UCODE_ACTIVE) ||
-             ((priv->stations[ret].used & IWL_STA_UCODE_ACTIVE) &&
-              (priv->stations[ret].used & IWL_STA_UCODE_INPROGRESS)))) {
-                IWL_ERR(priv, "Requested station info for sta %d before ready.\n",
-                        ret);
-                ret = IWL_INVALID_STATION;
-        }
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-        return ret;
-}
-
-static int iwl4965_get_ra_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
-{
-        if (priv->iw_mode == NL80211_IFTYPE_STATION) {
-                return IWL_AP_ID;
-        } else {
-                u8 *da = ieee80211_get_DA(hdr);
-                return iwl4965_find_station(priv, da);
-        }
-}
-
-/**
- * iwl4965_rx_reply_tx - Handle standard (non-aggregation) Tx response
- */
-static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
-                                struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        u16 sequence = le16_to_cpu(pkt->hdr.sequence);
-        int txq_id = SEQ_TO_QUEUE(sequence);
-        int index = SEQ_TO_INDEX(sequence);
-        struct iwl_tx_queue *txq = &priv->txq[txq_id];
-        struct ieee80211_hdr *hdr;
-        struct ieee80211_tx_info *info;
-        struct iwl4965_tx_resp *tx_resp = (void *)&pkt->u.raw[0];
-        u32  status = le32_to_cpu(tx_resp->u.status);
-        int uninitialized_var(tid);
-        int sta_id;
-        int freed;
-        u8 *qc = NULL;
-        unsigned long flags;
-
-        if ((index >= txq->q.n_bd) || (iwl_legacy_queue_used(&txq->q, index) == 0)) {
-                IWL_ERR(priv, "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;
-        }
-
-        txq->time_stamp = jiffies;
-        info = IEEE80211_SKB_CB(txq->txb[txq->q.read_ptr].skb);
-        memset(&info->status, 0, sizeof(info->status));
-
-        hdr = iwl_legacy_tx_queue_get_hdr(priv, txq_id, index);
-        if (ieee80211_is_data_qos(hdr->frame_control)) {
-                qc = ieee80211_get_qos_ctl(hdr);
-                tid = qc[0] & 0xf;
-        }
-
-        sta_id = iwl4965_get_ra_sta_id(priv, hdr);
-        if (txq->sched_retry && unlikely(sta_id == IWL_INVALID_STATION)) {
-                IWL_ERR(priv, "Station not known\n");
-                return;
-        }
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        if (txq->sched_retry) {
-                const u32 scd_ssn = iwl4965_get_scd_ssn(tx_resp);
-                struct iwl_ht_agg *agg = NULL;
-                WARN_ON(!qc);
-
-                agg = &priv->stations[sta_id].tid[tid].agg;
-
-                iwl4965_tx_status_reply_tx(priv, agg, tx_resp, txq_id, index);
-
-                /* check if BAR is needed */
-                if ((tx_resp->frame_count == 1) && !iwl4965_is_tx_success(status))
-                        info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;
-
-                if (txq->q.read_ptr != (scd_ssn & 0xff)) {
-                        index = iwl_legacy_queue_dec_wrap(scd_ssn & 0xff,
-                                                                txq->q.n_bd);
-                        IWL_DEBUG_TX_REPLY(priv, "Retry scheduler reclaim scd_ssn "
-                                           "%d index %d\n", scd_ssn , index);
-                        freed = iwl4965_tx_queue_reclaim(priv, txq_id, index);
-                        if (qc)
-                                iwl4965_free_tfds_in_queue(priv, sta_id,
-                                                       tid, freed);
-
-                        if (priv->mac80211_registered &&
-                            (iwl_legacy_queue_space(&txq->q) > txq->q.low_mark)
-                                 && (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA))
-                                iwl_legacy_wake_queue(priv, txq);
-                }
-        } else {
-                info->status.rates[0].count = tx_resp->failure_frame + 1;
-                info->flags |= iwl4965_tx_status_to_mac80211(status);
-                iwl4965_hwrate_to_tx_control(priv,
-                                        le32_to_cpu(tx_resp->rate_n_flags),
-                                        info);
-
-                IWL_DEBUG_TX_REPLY(priv, "TXQ %d status %s (0x%08x) "
-                                   "rate_n_flags 0x%x retries %d\n",
-                                   txq_id,
-                                   iwl4965_get_tx_fail_reason(status), status,
-                                   le32_to_cpu(tx_resp->rate_n_flags),
-                                   tx_resp->failure_frame);
-
-                freed = iwl4965_tx_queue_reclaim(priv, txq_id, index);
-                if (qc && likely(sta_id != IWL_INVALID_STATION))
-                        iwl4965_free_tfds_in_queue(priv, sta_id, tid, freed);
-                else if (sta_id == IWL_INVALID_STATION)
-                        IWL_DEBUG_TX_REPLY(priv, "Station not known\n");
-
-                if (priv->mac80211_registered &&
-                    (iwl_legacy_queue_space(&txq->q) > txq->q.low_mark))
-                        iwl_legacy_wake_queue(priv, txq);
-        }
-        if (qc && likely(sta_id != IWL_INVALID_STATION))
-                iwl4965_txq_check_empty(priv, sta_id, tid, txq_id);
-
-        iwl4965_check_abort_status(priv, tx_resp->frame_count, status);
-
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-}
-
-static void iwl4965_rx_beacon_notif(struct iwl_priv *priv,
-                                    struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl4965_beacon_notif *beacon = (void *)pkt->u.raw;
-        u8 rate __maybe_unused =
-                iwl4965_hw_get_rate(beacon->beacon_notify_hdr.rate_n_flags);
-
-        IWL_DEBUG_RX(priv, "beacon status %#x, retries:%d ibssmgr:%d "
-                "tsf:0x%.8x%.8x rate:%d\n",
-                le32_to_cpu(beacon->beacon_notify_hdr.u.status) & TX_STATUS_MSK,
-                beacon->beacon_notify_hdr.failure_frame,
-                le32_to_cpu(beacon->ibss_mgr_status),
-                le32_to_cpu(beacon->high_tsf),
-                le32_to_cpu(beacon->low_tsf), rate);
-
-        priv->ibss_manager = le32_to_cpu(beacon->ibss_mgr_status);
-}
-
-/* Set up 4965-specific Rx frame reply handlers */
-static void iwl4965_rx_handler_setup(struct iwl_priv *priv)
-{
-        /* Legacy Rx frames */
-        priv->rx_handlers[REPLY_RX] = iwl4965_rx_reply_rx;
-        /* Tx response */
-        priv->rx_handlers[REPLY_TX] = iwl4965_rx_reply_tx;
-        priv->rx_handlers[BEACON_NOTIFICATION] = iwl4965_rx_beacon_notif;
-}
-
-static struct iwl_hcmd_ops iwl4965_hcmd = {
-        .rxon_assoc = iwl4965_send_rxon_assoc,
-        .commit_rxon = iwl4965_commit_rxon,
-        .set_rxon_chain = iwl4965_set_rxon_chain,
-};
-
-static void iwl4965_post_scan(struct iwl_priv *priv)
-{
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-        /*
-         * Since setting the RXON may have been deferred while
-         * performing the scan, fire one off if needed
-         */
-        if (memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging)))
-                iwl_legacy_commit_rxon(priv, ctx);
-}
-
-static void iwl4965_post_associate(struct iwl_priv *priv)
-{
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        struct ieee80211_vif *vif = ctx->vif;
-        struct ieee80211_conf *conf = NULL;
-        int ret = 0;
-
-        if (!vif || !priv->is_open)
-                return;
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
-
-        iwl_legacy_scan_cancel_timeout(priv, 200);
-
-        conf = iwl_legacy_ieee80211_get_hw_conf(priv->hw);
-
-        ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
-        iwl_legacy_commit_rxon(priv, ctx);
-
-        ret = iwl_legacy_send_rxon_timing(priv, ctx);
-        if (ret)
-                IWL_WARN(priv, "RXON timing - "
-                            "Attempting to continue.\n");
-
-        ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
-
-        iwl_legacy_set_rxon_ht(priv, &priv->current_ht_config);
-
-        if (priv->cfg->ops->hcmd->set_rxon_chain)
-                priv->cfg->ops->hcmd->set_rxon_chain(priv, ctx);
-
-        ctx->staging.assoc_id = cpu_to_le16(vif->bss_conf.aid);
-
-        IWL_DEBUG_ASSOC(priv, "assoc id %d beacon interval %d\n",
-                        vif->bss_conf.aid, vif->bss_conf.beacon_int);
-
-        if (vif->bss_conf.use_short_preamble)
-                ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
-        else
-                ctx->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
-
-        if (ctx->staging.flags & RXON_FLG_BAND_24G_MSK) {
-                if (vif->bss_conf.use_short_slot)
-                        ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
-                else
-                        ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
-        }
-
-        iwl_legacy_commit_rxon(priv, ctx);
-
-        IWL_DEBUG_ASSOC(priv, "Associated as %d to: %pM\n",
-                        vif->bss_conf.aid, ctx->active.bssid_addr);
-
-        switch (vif->type) {
-        case NL80211_IFTYPE_STATION:
-                break;
-        case NL80211_IFTYPE_ADHOC:
-                iwl4965_send_beacon_cmd(priv);
-                break;
-        default:
-                IWL_ERR(priv, "%s Should not be called in %d mode\n",
-                          __func__, vif->type);
-                break;
-        }
-
-        /* the chain noise calibration will enabled PM upon completion
-         * If chain noise has already been run, then we need to enable
-         * power management here */
-        if (priv->chain_noise_data.state == IWL_CHAIN_NOISE_DONE)
-                iwl_legacy_power_update_mode(priv, false);
-
-        /* Enable Rx differential gain and sensitivity calibrations */
-        iwl4965_chain_noise_reset(priv);
-        priv->start_calib = 1;
-}
-
-static void iwl4965_config_ap(struct iwl_priv *priv)
-{
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        struct ieee80211_vif *vif = ctx->vif;
-        int ret = 0;
-
-        lockdep_assert_held(&priv->mutex);
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
-
-        /* The following should be done only at AP bring up */
-        if (!iwl_legacy_is_associated_ctx(ctx)) {
-
-                /* RXON - unassoc (to set timing command) */
-                ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
-                iwl_legacy_commit_rxon(priv, ctx);
-
-                /* RXON Timing */
-                ret = iwl_legacy_send_rxon_timing(priv, ctx);
-                if (ret)
-                        IWL_WARN(priv, "RXON timing failed - "
-                                        "Attempting to continue.\n");
-
-                /* AP has all antennas */
-                priv->chain_noise_data.active_chains =
-                        priv->hw_params.valid_rx_ant;
-                iwl_legacy_set_rxon_ht(priv, &priv->current_ht_config);
-                if (priv->cfg->ops->hcmd->set_rxon_chain)
-                        priv->cfg->ops->hcmd->set_rxon_chain(priv, ctx);
-
-                ctx->staging.assoc_id = 0;
-
-                if (vif->bss_conf.use_short_preamble)
-                        ctx->staging.flags |=
-                                RXON_FLG_SHORT_PREAMBLE_MSK;
-                else
-                        ctx->staging.flags &=
-                                ~RXON_FLG_SHORT_PREAMBLE_MSK;
-
-                if (ctx->staging.flags & RXON_FLG_BAND_24G_MSK) {
-                        if (vif->bss_conf.use_short_slot)
-                                ctx->staging.flags |=
-                                        RXON_FLG_SHORT_SLOT_MSK;
-                        else
-                                ctx->staging.flags &=
-                                        ~RXON_FLG_SHORT_SLOT_MSK;
-                }
-                /* need to send beacon cmd before committing assoc RXON! */
-                iwl4965_send_beacon_cmd(priv);
-                /* restore RXON assoc */
-                ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
-                iwl_legacy_commit_rxon(priv, ctx);
-        }
-        iwl4965_send_beacon_cmd(priv);
-}
-
-static struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = {
-        .get_hcmd_size = iwl4965_get_hcmd_size,
-        .build_addsta_hcmd = iwl4965_build_addsta_hcmd,
-        .request_scan = iwl4965_request_scan,
-        .post_scan = iwl4965_post_scan,
-};
-
-static struct iwl_lib_ops iwl4965_lib = {
-        .set_hw_params = iwl4965_hw_set_hw_params,
-        .txq_update_byte_cnt_tbl = iwl4965_txq_update_byte_cnt_tbl,
-        .txq_attach_buf_to_tfd = iwl4965_hw_txq_attach_buf_to_tfd,
-        .txq_free_tfd = iwl4965_hw_txq_free_tfd,
-        .txq_init = iwl4965_hw_tx_queue_init,
-        .rx_handler_setup = iwl4965_rx_handler_setup,
-        .is_valid_rtc_data_addr = iwl4965_hw_valid_rtc_data_addr,
-        .init_alive_start = iwl4965_init_alive_start,
-        .load_ucode = iwl4965_load_bsm,
-        .dump_nic_error_log = iwl4965_dump_nic_error_log,
-        .dump_fh = iwl4965_dump_fh,
-        .set_channel_switch = iwl4965_hw_channel_switch,
-        .apm_ops = {
-                .init = iwl_legacy_apm_init,
-                .config = iwl4965_nic_config,
-        },
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REGULATORY_BAND_1_CHANNELS,
-                        EEPROM_REGULATORY_BAND_2_CHANNELS,
-                        EEPROM_REGULATORY_BAND_3_CHANNELS,
-                        EEPROM_REGULATORY_BAND_4_CHANNELS,
-                        EEPROM_REGULATORY_BAND_5_CHANNELS,
-                        EEPROM_4965_REGULATORY_BAND_24_HT40_CHANNELS,
-                        EEPROM_4965_REGULATORY_BAND_52_HT40_CHANNELS
-                },
-                .acquire_semaphore = iwl4965_eeprom_acquire_semaphore,
-                .release_semaphore = iwl4965_eeprom_release_semaphore,
-        },
-        .send_tx_power  = iwl4965_send_tx_power,
-        .update_chain_flags = iwl4965_update_chain_flags,
-        .temp_ops = {
-                .temperature = iwl4965_temperature_calib,
-        },
-        .debugfs_ops = {
-                .rx_stats_read = iwl4965_ucode_rx_stats_read,
-                .tx_stats_read = iwl4965_ucode_tx_stats_read,
-                .general_stats_read = iwl4965_ucode_general_stats_read,
-        },
-};
-
-static const struct iwl_legacy_ops iwl4965_legacy_ops = {
-        .post_associate = iwl4965_post_associate,
-        .config_ap = iwl4965_config_ap,
-        .manage_ibss_station = iwl4965_manage_ibss_station,
-        .update_bcast_stations = iwl4965_update_bcast_stations,
-};
-
-struct ieee80211_ops iwl4965_hw_ops = {
-        .tx = iwl4965_mac_tx,
-        .start = iwl4965_mac_start,
-        .stop = iwl4965_mac_stop,
-        .add_interface = iwl_legacy_mac_add_interface,
-        .remove_interface = iwl_legacy_mac_remove_interface,
-        .change_interface = iwl_legacy_mac_change_interface,
-        .config = iwl_legacy_mac_config,
-        .configure_filter = iwl4965_configure_filter,
-        .set_key = iwl4965_mac_set_key,
-        .update_tkip_key = iwl4965_mac_update_tkip_key,
-        .conf_tx = iwl_legacy_mac_conf_tx,
-        .reset_tsf = iwl_legacy_mac_reset_tsf,
-        .bss_info_changed = iwl_legacy_mac_bss_info_changed,
-        .ampdu_action = iwl4965_mac_ampdu_action,
-        .hw_scan = iwl_legacy_mac_hw_scan,
-        .sta_add = iwl4965_mac_sta_add,
-        .sta_remove = iwl_legacy_mac_sta_remove,
-        .channel_switch = iwl4965_mac_channel_switch,
-        .tx_last_beacon = iwl_legacy_mac_tx_last_beacon,
-};
-
-static const struct iwl_ops iwl4965_ops = {
-        .lib = &iwl4965_lib,
-        .hcmd = &iwl4965_hcmd,
-        .utils = &iwl4965_hcmd_utils,
-        .led = &iwl4965_led_ops,
-        .legacy = &iwl4965_legacy_ops,
-        .ieee80211_ops = &iwl4965_hw_ops,
-};
-
-static struct iwl_base_params iwl4965_base_params = {
-        .eeprom_size = IWL4965_EEPROM_IMG_SIZE,
-        .num_of_queues = IWL49_NUM_QUEUES,
-        .num_of_ampdu_queues = IWL49_NUM_AMPDU_QUEUES,
-        .pll_cfg_val = 0,
-        .set_l0s = true,
-        .use_bsm = true,
-        .led_compensation = 61,
-        .chain_noise_num_beacons = IWL4965_CAL_NUM_BEACONS,
-        .wd_timeout = IWL_DEF_WD_TIMEOUT,
-        .temperature_kelvin = true,
-        .ucode_tracing = true,
-        .sensitivity_calib_by_driver = true,
-        .chain_noise_calib_by_driver = true,
-};
-
-struct iwl_cfg iwl4965_cfg = {
-        .name = "Intel(R) Wireless WiFi Link 4965AGN",
-        .fw_name_pre = IWL4965_FW_PRE,
-        .ucode_api_max = IWL4965_UCODE_API_MAX,
-        .ucode_api_min = IWL4965_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
-        .valid_tx_ant = ANT_AB,
-        .valid_rx_ant = ANT_ABC,
-        .eeprom_ver = EEPROM_4965_EEPROM_VERSION,
-        .eeprom_calib_ver = EEPROM_4965_TX_POWER_VERSION,
-        .ops = &iwl4965_ops,
-        .mod_params = &iwl4965_mod_params,
-        .base_params = &iwl4965_base_params,
-        .led_mode = IWL_LED_BLINK,
-        /*
-         * Force use of chains B and C for scan RX on 5 GHz band
-         * because the device has off-channel reception on chain A.
-         */
-        .scan_rx_antennas[IEEE80211_BAND_5GHZ] = ANT_BC,
-};
-
-/* Module firmware */
-MODULE_FIRMWARE(IWL4965_MODULE_FIRMWARE(IWL4965_UCODE_API_MAX));
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965.h b/drivers/net/wireless/iwlegacy/iwl-4965.h
deleted file mode 100644
index 01f8163daf16..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-4965.h
+++ /dev/null
@@ -1,282 +0,0 @@
-/******************************************************************************
- *
- * 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 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2011 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_4965_h__
-#define __iwl_4965_h__
-
-#include "iwl-dev.h"
-
-/* configuration for the _4965 devices */
-extern struct iwl_cfg iwl4965_cfg;
-
-extern struct iwl_mod_params iwl4965_mod_params;
-
-extern struct ieee80211_ops iwl4965_hw_ops;
-
-/* tx queue */
-void iwl4965_free_tfds_in_queue(struct iwl_priv *priv,
-                            int sta_id, int tid, int freed);
-
-/* RXON */
-void iwl4965_set_rxon_chain(struct iwl_priv *priv,
-                                struct iwl_rxon_context *ctx);
-
-/* uCode */
-int iwl4965_verify_ucode(struct iwl_priv *priv);
-
-/* lib */
-void iwl4965_check_abort_status(struct iwl_priv *priv,
-                            u8 frame_count, u32 status);
-
-void iwl4965_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq);
-int iwl4965_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq);
-int iwl4965_hw_nic_init(struct iwl_priv *priv);
-int iwl4965_dump_fh(struct iwl_priv *priv, char **buf, bool display);
-
-/* rx */
-void iwl4965_rx_queue_restock(struct iwl_priv *priv);
-void iwl4965_rx_replenish(struct iwl_priv *priv);
-void iwl4965_rx_replenish_now(struct iwl_priv *priv);
-void iwl4965_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq);
-int iwl4965_rxq_stop(struct iwl_priv *priv);
-int iwl4965_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band);
-void iwl4965_rx_reply_rx(struct iwl_priv *priv,
-                     struct iwl_rx_mem_buffer *rxb);
-void iwl4965_rx_reply_rx_phy(struct iwl_priv *priv,
-                         struct iwl_rx_mem_buffer *rxb);
-void iwl4965_rx_handle(struct iwl_priv *priv);
-
-/* tx */
-void iwl4965_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq);
-int iwl4965_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv,
-                                 struct iwl_tx_queue *txq,
-                                 dma_addr_t addr, u16 len, u8 reset, u8 pad);
-int iwl4965_hw_tx_queue_init(struct iwl_priv *priv,
-                         struct iwl_tx_queue *txq);
-void iwl4965_hwrate_to_tx_control(struct iwl_priv *priv, u32 rate_n_flags,
-                              struct ieee80211_tx_info *info);
-int iwl4965_tx_skb(struct iwl_priv *priv, struct sk_buff *skb);
-int iwl4965_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,
-                        struct ieee80211_sta *sta, u16 tid, u16 *ssn);
-int iwl4965_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
-                       struct ieee80211_sta *sta, u16 tid);
-int iwl4965_txq_check_empty(struct iwl_priv *priv,
-                           int sta_id, u8 tid, int txq_id);
-void iwl4965_rx_reply_compressed_ba(struct iwl_priv *priv,
-                                struct iwl_rx_mem_buffer *rxb);
-int iwl4965_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index);
-void iwl4965_hw_txq_ctx_free(struct iwl_priv *priv);
-int iwl4965_txq_ctx_alloc(struct iwl_priv *priv);
-void iwl4965_txq_ctx_reset(struct iwl_priv *priv);
-void iwl4965_txq_ctx_stop(struct iwl_priv *priv);
-void iwl4965_txq_set_sched(struct iwl_priv *priv, u32 mask);
-
-/*
- * Acquire priv->lock before calling this function !
- */
-void iwl4965_set_wr_ptrs(struct iwl_priv *priv, int txq_id, u32 index);
-/**
- * iwl4965_tx_queue_set_status - (optionally) start Tx/Cmd queue
- * @tx_fifo_id: Tx DMA/FIFO channel (range 0-7) that the queue will feed
- * @scd_retry: (1) Indicates queue will be used in aggregation mode
- *
- * NOTE:  Acquire priv->lock before calling this function !
- */
-void iwl4965_tx_queue_set_status(struct iwl_priv *priv,
-                                        struct iwl_tx_queue *txq,
-                                        int tx_fifo_id, int scd_retry);
-
-static inline u32 iwl4965_tx_status_to_mac80211(u32 status)
-{
-        status &= TX_STATUS_MSK;
-
-        switch (status) {
-        case TX_STATUS_SUCCESS:
-        case TX_STATUS_DIRECT_DONE:
-                return IEEE80211_TX_STAT_ACK;
-        case TX_STATUS_FAIL_DEST_PS:
-                return IEEE80211_TX_STAT_TX_FILTERED;
-        default:
-                return 0;
-        }
-}
-
-static inline bool iwl4965_is_tx_success(u32 status)
-{
-        status &= TX_STATUS_MSK;
-        return (status == TX_STATUS_SUCCESS) ||
-               (status == TX_STATUS_DIRECT_DONE);
-}
-
-u8 iwl4965_toggle_tx_ant(struct iwl_priv *priv, u8 ant_idx, u8 valid);
-
-/* rx */
-void iwl4965_rx_missed_beacon_notif(struct iwl_priv *priv,
-                                struct iwl_rx_mem_buffer *rxb);
-bool iwl4965_good_plcp_health(struct iwl_priv *priv,
-                          struct iwl_rx_packet *pkt);
-void iwl4965_rx_statistics(struct iwl_priv *priv,
-                       struct iwl_rx_mem_buffer *rxb);
-void iwl4965_reply_statistics(struct iwl_priv *priv,
-                          struct iwl_rx_mem_buffer *rxb);
-
-/* scan */
-int iwl4965_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif);
-
-/* station mgmt */
-int iwl4965_manage_ibss_station(struct iwl_priv *priv,
-                               struct ieee80211_vif *vif, bool add);
-
-/* hcmd */
-int iwl4965_send_beacon_cmd(struct iwl_priv *priv);
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-const char *iwl4965_get_tx_fail_reason(u32 status);
-#else
-static inline const char *
-iwl4965_get_tx_fail_reason(u32 status) { return ""; }
-#endif
-
-/* station management */
-int iwl4965_alloc_bcast_station(struct iwl_priv *priv,
-                               struct iwl_rxon_context *ctx);
-int iwl4965_add_bssid_station(struct iwl_priv *priv,
-                                struct iwl_rxon_context *ctx,
-                             const u8 *addr, u8 *sta_id_r);
-int iwl4965_remove_default_wep_key(struct iwl_priv *priv,
-                               struct iwl_rxon_context *ctx,
-                               struct ieee80211_key_conf *key);
-int iwl4965_set_default_wep_key(struct iwl_priv *priv,
-                            struct iwl_rxon_context *ctx,
-                            struct ieee80211_key_conf *key);
-int iwl4965_restore_default_wep_keys(struct iwl_priv *priv,
-                                 struct iwl_rxon_context *ctx);
-int iwl4965_set_dynamic_key(struct iwl_priv *priv,
-                        struct iwl_rxon_context *ctx,
-                        struct ieee80211_key_conf *key, u8 sta_id);
-int iwl4965_remove_dynamic_key(struct iwl_priv *priv,
-                        struct iwl_rxon_context *ctx,
-                        struct ieee80211_key_conf *key, u8 sta_id);
-void iwl4965_update_tkip_key(struct iwl_priv *priv,
-                         struct iwl_rxon_context *ctx,
-                         struct ieee80211_key_conf *keyconf,
-                         struct ieee80211_sta *sta, u32 iv32, u16 *phase1key);
-int iwl4965_sta_tx_modify_enable_tid(struct iwl_priv *priv,
-                        int sta_id, int tid);
-int iwl4965_sta_rx_agg_start(struct iwl_priv *priv, struct ieee80211_sta *sta,
-                         int tid, u16 ssn);
-int iwl4965_sta_rx_agg_stop(struct iwl_priv *priv, struct ieee80211_sta *sta,
-                        int tid);
-void iwl4965_sta_modify_sleep_tx_count(struct iwl_priv *priv,
-                        int sta_id, int cnt);
-int iwl4965_update_bcast_stations(struct iwl_priv *priv);
-
-/* rate */
-static inline u32 iwl4965_ant_idx_to_flags(u8 ant_idx)
-{
-        return BIT(ant_idx) << RATE_MCS_ANT_POS;
-}
-
-static inline u8 iwl4965_hw_get_rate(__le32 rate_n_flags)
-{
-        return le32_to_cpu(rate_n_flags) & 0xFF;
-}
-
-static inline __le32 iwl4965_hw_set_rate_n_flags(u8 rate, u32 flags)
-{
-        return cpu_to_le32(flags|(u32)rate);
-}
-
-/* eeprom */
-void iwl4965_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac);
-int iwl4965_eeprom_acquire_semaphore(struct iwl_priv *priv);
-void iwl4965_eeprom_release_semaphore(struct iwl_priv *priv);
-int  iwl4965_eeprom_check_version(struct iwl_priv *priv);
-
-/* mac80211 handlers (for 4965) */
-void iwl4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb);
-int iwl4965_mac_start(struct ieee80211_hw *hw);
-void iwl4965_mac_stop(struct ieee80211_hw *hw);
-void iwl4965_configure_filter(struct ieee80211_hw *hw,
-                             unsigned int changed_flags,
-                             unsigned int *total_flags,
-                             u64 multicast);
-int iwl4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
-                       struct ieee80211_vif *vif, struct ieee80211_sta *sta,
-                       struct ieee80211_key_conf *key);
-void iwl4965_mac_update_tkip_key(struct ieee80211_hw *hw,
-                                struct ieee80211_vif *vif,
-                                struct ieee80211_key_conf *keyconf,
-                                struct ieee80211_sta *sta,
-                                u32 iv32, u16 *phase1key);
-int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,
-                            struct ieee80211_vif *vif,
-                            enum ieee80211_ampdu_mlme_action action,
-                            struct ieee80211_sta *sta, u16 tid, u16 *ssn,
-                            u8 buf_size);
-int iwl4965_mac_sta_add(struct ieee80211_hw *hw,
-                       struct ieee80211_vif *vif,
-                       struct ieee80211_sta *sta);
-void iwl4965_mac_channel_switch(struct ieee80211_hw *hw,
-                               struct ieee80211_channel_switch *ch_switch);
-
-#endif /* __iwl_4965_h__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-core.c b/drivers/net/wireless/iwlegacy/iwl-core.c
deleted file mode 100644
index 2bd5659310d7..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-core.c
+++ /dev/null
@@ -1,2661 +0,0 @@
-/******************************************************************************
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2011 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:
- *  Intel Linux Wireless <ilw@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/etherdevice.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <net/mac80211.h>
-
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
-#include "iwl-debug.h"
-#include "iwl-core.h"
-#include "iwl-io.h"
-#include "iwl-power.h"
-#include "iwl-sta.h"
-#include "iwl-helpers.h"
-
-
-MODULE_DESCRIPTION("iwl-legacy: common functions for 3945 and 4965");
-MODULE_VERSION(IWLWIFI_VERSION);
-MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
-MODULE_LICENSE("GPL");
-
-/*
- * set bt_coex_active to true, uCode will do kill/defer
- * every time the priority line is asserted (BT is sending signals on the
- * priority line in the PCIx).
- * set bt_coex_active to false, uCode will ignore the BT activity and
- * perform the normal operation
- *
- * User might experience transmit issue on some platform due to WiFi/BT
- * co-exist problem. The possible behaviors are:
- *   Able to scan and finding all the available AP
- *   Not able to associate with any AP
- * On those platforms, WiFi communication can be restored by set
- * "bt_coex_active" module parameter to "false"
- *
- * default: bt_coex_active = true (BT_COEX_ENABLE)
- */
-static bool bt_coex_active = true;
-module_param(bt_coex_active, bool, S_IRUGO);
-MODULE_PARM_DESC(bt_coex_active, "enable wifi/bluetooth co-exist");
-
-u32 iwlegacy_debug_level;
-EXPORT_SYMBOL(iwlegacy_debug_level);
-
-const u8 iwlegacy_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-EXPORT_SYMBOL(iwlegacy_bcast_addr);
-
-
-/* This function both allocates and initializes hw and priv. */
-struct ieee80211_hw *iwl_legacy_alloc_all(struct iwl_cfg *cfg)
-{
-        struct iwl_priv *priv;
-        /* mac80211 allocates memory for this device instance, including
-         *   space for this driver's private structure */
-        struct ieee80211_hw *hw;
-
-        hw = ieee80211_alloc_hw(sizeof(struct iwl_priv),
-                                cfg->ops->ieee80211_ops);
-        if (hw == NULL) {
-                pr_err("%s: Can not allocate network device\n",
-                       cfg->name);
-                goto out;
-        }
-
-        priv = hw->priv;
-        priv->hw = hw;
-
-out:
-        return hw;
-}
-EXPORT_SYMBOL(iwl_legacy_alloc_all);
-
-#define MAX_BIT_RATE_40_MHZ 150 /* Mbps */
-#define MAX_BIT_RATE_20_MHZ 72 /* Mbps */
-static void iwl_legacy_init_ht_hw_capab(const struct iwl_priv *priv,
-                              struct ieee80211_sta_ht_cap *ht_info,
-                              enum ieee80211_band band)
-{
-        u16 max_bit_rate = 0;
-        u8 rx_chains_num = priv->hw_params.rx_chains_num;
-        u8 tx_chains_num = priv->hw_params.tx_chains_num;
-
-        ht_info->cap = 0;
-        memset(&ht_info->mcs, 0, sizeof(ht_info->mcs));
-
-        ht_info->ht_supported = true;
-
-        ht_info->cap |= IEEE80211_HT_CAP_SGI_20;
-        max_bit_rate = MAX_BIT_RATE_20_MHZ;
-        if (priv->hw_params.ht40_channel & BIT(band)) {
-                ht_info->cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;
-                ht_info->cap |= IEEE80211_HT_CAP_SGI_40;
-                ht_info->mcs.rx_mask[4] = 0x01;
-                max_bit_rate = MAX_BIT_RATE_40_MHZ;
-        }
-
-        if (priv->cfg->mod_params->amsdu_size_8K)
-                ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU;
-
-        ht_info->ampdu_factor = CFG_HT_RX_AMPDU_FACTOR_DEF;
-        ht_info->ampdu_density = CFG_HT_MPDU_DENSITY_DEF;
-
-        ht_info->mcs.rx_mask[0] = 0xFF;
-        if (rx_chains_num >= 2)
-                ht_info->mcs.rx_mask[1] = 0xFF;
-        if (rx_chains_num >= 3)
-                ht_info->mcs.rx_mask[2] = 0xFF;
-
-        /* Highest supported Rx data rate */
-        max_bit_rate *= rx_chains_num;
-        WARN_ON(max_bit_rate & ~IEEE80211_HT_MCS_RX_HIGHEST_MASK);
-        ht_info->mcs.rx_highest = cpu_to_le16(max_bit_rate);
-
-        /* Tx MCS capabilities */
-        ht_info->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
-        if (tx_chains_num != rx_chains_num) {
-                ht_info->mcs.tx_params |= IEEE80211_HT_MCS_TX_RX_DIFF;
-                ht_info->mcs.tx_params |= ((tx_chains_num - 1) <<
-                                IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT);
-        }
-}
-
-/**
- * iwl_legacy_init_geos - Initialize mac80211's geo/channel info based from eeprom
- */
-int iwl_legacy_init_geos(struct iwl_priv *priv)
-{
-        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;
-        s8 max_tx_power = 0;
-
-        if (priv->bands[IEEE80211_BAND_2GHZ].n_bitrates ||
-            priv->bands[IEEE80211_BAND_5GHZ].n_bitrates) {
-                IWL_DEBUG_INFO(priv, "Geography modes already initialized.\n");
-                set_bit(STATUS_GEO_CONFIGURED, &priv->status);
-                return 0;
-        }
-
-        channels = kzalloc(sizeof(struct ieee80211_channel) *
-                           priv->channel_count, GFP_KERNEL);
-        if (!channels)
-                return -ENOMEM;
-
-        rates = kzalloc((sizeof(struct ieee80211_rate) * IWL_RATE_COUNT_LEGACY),
-                        GFP_KERNEL);
-        if (!rates) {
-                kfree(channels);
-                return -ENOMEM;
-        }
-
-        /* 5.2GHz channels start after the 2.4GHz channels */
-        sband = &priv->bands[IEEE80211_BAND_5GHZ];
-        sband->channels = &channels[ARRAY_SIZE(iwlegacy_eeprom_band_1)];
-        /* just OFDM */
-        sband->bitrates = &rates[IWL_FIRST_OFDM_RATE];
-        sband->n_bitrates = IWL_RATE_COUNT_LEGACY - IWL_FIRST_OFDM_RATE;
-
-        if (priv->cfg->sku & IWL_SKU_N)
-                iwl_legacy_init_ht_hw_capab(priv, &sband->ht_cap,
-                                         IEEE80211_BAND_5GHZ);
-
-        sband = &priv->bands[IEEE80211_BAND_2GHZ];
-        sband->channels = channels;
-        /* OFDM & CCK */
-        sband->bitrates = rates;
-        sband->n_bitrates = IWL_RATE_COUNT_LEGACY;
-
-        if (priv->cfg->sku & IWL_SKU_N)
-                iwl_legacy_init_ht_hw_capab(priv, &sband->ht_cap,
-                                         IEEE80211_BAND_2GHZ);
-
-        priv->ieee_channels = channels;
-        priv->ieee_rates = rates;
-
-        for (i = 0;  i < priv->channel_count; i++) {
-                ch = &priv->channel_info[i];
-
-                if (!iwl_legacy_is_channel_valid(ch))
-                        continue;
-
-                sband = &priv->bands[ch->band];
-
-                geo_ch = &sband->channels[sband->n_channels++];
-
-                geo_ch->center_freq =
-                        ieee80211_channel_to_frequency(ch->channel, ch->band);
-                geo_ch->max_power = ch->max_power_avg;
-                geo_ch->max_antenna_gain = 0xff;
-                geo_ch->hw_value = ch->channel;
-
-                if (iwl_legacy_is_channel_valid(ch)) {
-                        if (!(ch->flags & EEPROM_CHANNEL_IBSS))
-                                geo_ch->flags |= IEEE80211_CHAN_NO_IBSS;
-
-                        if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))
-                                geo_ch->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
-
-                        if (ch->flags & EEPROM_CHANNEL_RADAR)
-                                geo_ch->flags |= IEEE80211_CHAN_RADAR;
-
-                        geo_ch->flags |= ch->ht40_extension_channel;
-
-                        if (ch->max_power_avg > max_tx_power)
-                                max_tx_power = ch->max_power_avg;
-                } else {
-                        geo_ch->flags |= IEEE80211_CHAN_DISABLED;
-                }
-
-                IWL_DEBUG_INFO(priv, "Channel %d Freq=%d[%sGHz] %s flag=0x%X\n",
-                                ch->channel, geo_ch->center_freq,
-                                iwl_legacy_is_channel_a_band(ch) ?  "5.2" : "2.4",
-                                geo_ch->flags & IEEE80211_CHAN_DISABLED ?
-                                "restricted" : "valid",
-                                 geo_ch->flags);
-        }
-
-        priv->tx_power_device_lmt = max_tx_power;
-        priv->tx_power_user_lmt = max_tx_power;
-        priv->tx_power_next = max_tx_power;
-
-        if ((priv->bands[IEEE80211_BAND_5GHZ].n_channels == 0) &&
-             priv->cfg->sku & IWL_SKU_A) {
-                IWL_INFO(priv, "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->cfg->sku &= ~IWL_SKU_A;
-        }
-
-        IWL_INFO(priv, "Tunable channels: %d 802.11bg, %d 802.11a channels\n",
-                   priv->bands[IEEE80211_BAND_2GHZ].n_channels,
-                   priv->bands[IEEE80211_BAND_5GHZ].n_channels);
-
-        set_bit(STATUS_GEO_CONFIGURED, &priv->status);
-
-        return 0;
-}
-EXPORT_SYMBOL(iwl_legacy_init_geos);
-
-/*
- * iwl_legacy_free_geos - undo allocations in iwl_legacy_init_geos
- */
-void iwl_legacy_free_geos(struct iwl_priv *priv)
-{
-        kfree(priv->ieee_channels);
-        kfree(priv->ieee_rates);
-        clear_bit(STATUS_GEO_CONFIGURED, &priv->status);
-}
-EXPORT_SYMBOL(iwl_legacy_free_geos);
-
-static bool iwl_legacy_is_channel_extension(struct iwl_priv *priv,
-                                     enum ieee80211_band band,
-                                     u16 channel, u8 extension_chan_offset)
-{
-        const struct iwl_channel_info *ch_info;
-
-        ch_info = iwl_legacy_get_channel_info(priv, band, channel);
-        if (!iwl_legacy_is_channel_valid(ch_info))
-                return false;
-
-        if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_ABOVE)
-                return !(ch_info->ht40_extension_channel &
-                                        IEEE80211_CHAN_NO_HT40PLUS);
-        else if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_BELOW)
-                return !(ch_info->ht40_extension_channel &
-                                        IEEE80211_CHAN_NO_HT40MINUS);
-
-        return false;
-}
-
-bool iwl_legacy_is_ht40_tx_allowed(struct iwl_priv *priv,
-                            struct iwl_rxon_context *ctx,
-                            struct ieee80211_sta_ht_cap *ht_cap)
-{
-        if (!ctx->ht.enabled || !ctx->ht.is_40mhz)
-                return false;
-
-        /*
-         * We do not check for IEEE80211_HT_CAP_SUP_WIDTH_20_40
-         * the bit will not set if it is pure 40MHz case
-         */
-        if (ht_cap && !ht_cap->ht_supported)
-                return false;
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
-        if (priv->disable_ht40)
-                return false;
-#endif
-
-        return iwl_legacy_is_channel_extension(priv, priv->band,
-                        le16_to_cpu(ctx->staging.channel),
-                        ctx->ht.extension_chan_offset);
-}
-EXPORT_SYMBOL(iwl_legacy_is_ht40_tx_allowed);
-
-static u16 iwl_legacy_adjust_beacon_interval(u16 beacon_val, u16 max_beacon_val)
-{
-        u16 new_val;
-        u16 beacon_factor;
-
-        /*
-         * If mac80211 hasn't given us a beacon interval, program
-         * the default into the device.
-         */
-        if (!beacon_val)
-                return DEFAULT_BEACON_INTERVAL;
-
-        /*
-         * If the beacon interval we obtained from the peer
-         * is too large, we'll have to wake up more often
-         * (and in IBSS case, we'll beacon too much)
-         *
-         * For example, if max_beacon_val is 4096, and the
-         * requested beacon interval is 7000, we'll have to
-         * use 3500 to be able to wake up on the beacons.
-         *
-         * This could badly influence beacon detection stats.
-         */
-
-        beacon_factor = (beacon_val + max_beacon_val) / max_beacon_val;
-        new_val = beacon_val / beacon_factor;
-
-        if (!new_val)
-                new_val = max_beacon_val;
-
-        return new_val;
-}
-
-int
-iwl_legacy_send_rxon_timing(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
-{
-        u64 tsf;
-        s32 interval_tm, rem;
-        struct ieee80211_conf *conf = NULL;
-        u16 beacon_int;
-        struct ieee80211_vif *vif = ctx->vif;
-
-        conf = iwl_legacy_ieee80211_get_hw_conf(priv->hw);
-
-        lockdep_assert_held(&priv->mutex);
-
-        memset(&ctx->timing, 0, sizeof(struct iwl_rxon_time_cmd));
-
-        ctx->timing.timestamp = cpu_to_le64(priv->timestamp);
-        ctx->timing.listen_interval = cpu_to_le16(conf->listen_interval);
-
-        beacon_int = vif ? vif->bss_conf.beacon_int : 0;
-
-        /*
-         * TODO: For IBSS we need to get atim_window from mac80211,
-         *       for now just always use 0
-         */
-        ctx->timing.atim_window = 0;
-
-        beacon_int = iwl_legacy_adjust_beacon_interval(beacon_int,
-                        priv->hw_params.max_beacon_itrvl * TIME_UNIT);
-        ctx->timing.beacon_interval = cpu_to_le16(beacon_int);
-
-        tsf = priv->timestamp; /* tsf is modifed by do_div: copy it */
-        interval_tm = beacon_int * TIME_UNIT;
-        rem = do_div(tsf, interval_tm);
-        ctx->timing.beacon_init_val = cpu_to_le32(interval_tm - rem);
-
-        ctx->timing.dtim_period = vif ? (vif->bss_conf.dtim_period ?: 1) : 1;
-
-        IWL_DEBUG_ASSOC(priv,
-                        "beacon interval %d beacon timer %d beacon tim %d\n",
-                        le16_to_cpu(ctx->timing.beacon_interval),
-                        le32_to_cpu(ctx->timing.beacon_init_val),
-                        le16_to_cpu(ctx->timing.atim_window));
-
-        return iwl_legacy_send_cmd_pdu(priv, ctx->rxon_timing_cmd,
-                                sizeof(ctx->timing), &ctx->timing);
-}
-EXPORT_SYMBOL(iwl_legacy_send_rxon_timing);
-
-void
-iwl_legacy_set_rxon_hwcrypto(struct iwl_priv *priv,
-                                struct iwl_rxon_context *ctx,
-                                int hw_decrypt)
-{
-        struct iwl_legacy_rxon_cmd *rxon = &ctx->staging;
-
-        if (hw_decrypt)
-                rxon->filter_flags &= ~RXON_FILTER_DIS_DECRYPT_MSK;
-        else
-                rxon->filter_flags |= RXON_FILTER_DIS_DECRYPT_MSK;
-
-}
-EXPORT_SYMBOL(iwl_legacy_set_rxon_hwcrypto);
-
-/* validate RXON structure is valid */
-int
-iwl_legacy_check_rxon_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
-{
-        struct iwl_legacy_rxon_cmd *rxon = &ctx->staging;
-        bool error = false;
-
-        if (rxon->flags & RXON_FLG_BAND_24G_MSK) {
-                if (rxon->flags & RXON_FLG_TGJ_NARROW_BAND_MSK) {
-                        IWL_WARN(priv, "check 2.4G: wrong narrow\n");
-                        error = true;
-                }
-                if (rxon->flags & RXON_FLG_RADAR_DETECT_MSK) {
-                        IWL_WARN(priv, "check 2.4G: wrong radar\n");
-                        error = true;
-                }
-        } else {
-                if (!(rxon->flags & RXON_FLG_SHORT_SLOT_MSK)) {
-                        IWL_WARN(priv, "check 5.2G: not short slot!\n");
-                        error = true;
-                }
-                if (rxon->flags & RXON_FLG_CCK_MSK) {
-                        IWL_WARN(priv, "check 5.2G: CCK!\n");
-                        error = true;
-                }
-        }
-        if ((rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1) {
-                IWL_WARN(priv, "mac/bssid mcast!\n");
-                error = true;
-        }
-
-        /* make sure basic rates 6Mbps and 1Mbps are supported */
-        if ((rxon->ofdm_basic_rates & IWL_RATE_6M_MASK) == 0 &&
-            (rxon->cck_basic_rates & IWL_RATE_1M_MASK) == 0) {
-                IWL_WARN(priv, "neither 1 nor 6 are basic\n");
-                error = true;
-        }
-
-        if (le16_to_cpu(rxon->assoc_id) > 2007) {
-                IWL_WARN(priv, "aid > 2007\n");
-                error = true;
-        }
-
-        if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK))
-                        == (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) {
-                IWL_WARN(priv, "CCK and short slot\n");
-                error = true;
-        }
-
-        if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK))
-                        == (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) {
-                IWL_WARN(priv, "CCK and auto detect");
-                error = true;
-        }
-
-        if ((rxon->flags & (RXON_FLG_AUTO_DETECT_MSK |
-                            RXON_FLG_TGG_PROTECT_MSK)) ==
-                            RXON_FLG_TGG_PROTECT_MSK) {
-                IWL_WARN(priv, "TGg but no auto-detect\n");
-                error = true;
-        }
-
-        if (error)
-                IWL_WARN(priv, "Tuning to channel %d\n",
-                            le16_to_cpu(rxon->channel));
-
-        if (error) {
-                IWL_ERR(priv, "Invalid RXON\n");
-                return -EINVAL;
-        }
-        return 0;
-}
-EXPORT_SYMBOL(iwl_legacy_check_rxon_cmd);
-
-/**
- * iwl_legacy_full_rxon_required - check if full RXON (vs RXON_ASSOC) cmd is needed
- * @priv: staging_rxon is compared to active_rxon
- *
- * If the RXON structure is changing enough to require a new tune,
- * 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.
- */
-int iwl_legacy_full_rxon_required(struct iwl_priv *priv,
-                           struct iwl_rxon_context *ctx)
-{
-        const struct iwl_legacy_rxon_cmd *staging = &ctx->staging;
-        const struct iwl_legacy_rxon_cmd *active = &ctx->active;
-
-#define CHK(cond)                                                       \
-        if ((cond)) {                                                   \
-                IWL_DEBUG_INFO(priv, "need full RXON - " #cond "\n");   \
-                return 1;                                               \
-        }
-
-#define CHK_NEQ(c1, c2)                                         \
-        if ((c1) != (c2)) {                                     \
-                IWL_DEBUG_INFO(priv, "need full RXON - "        \
-                               #c1 " != " #c2 " - %d != %d\n",  \
-                               (c1), (c2));                     \
-                return 1;                                       \
-        }
-
-        /* These items are only settable from the full RXON command */
-        CHK(!iwl_legacy_is_associated_ctx(ctx));
-        CHK(compare_ether_addr(staging->bssid_addr, active->bssid_addr));
-        CHK(compare_ether_addr(staging->node_addr, active->node_addr));
-        CHK(compare_ether_addr(staging->wlap_bssid_addr,
-                                active->wlap_bssid_addr));
-        CHK_NEQ(staging->dev_type, active->dev_type);
-        CHK_NEQ(staging->channel, active->channel);
-        CHK_NEQ(staging->air_propagation, active->air_propagation);
-        CHK_NEQ(staging->ofdm_ht_single_stream_basic_rates,
-                active->ofdm_ht_single_stream_basic_rates);
-        CHK_NEQ(staging->ofdm_ht_dual_stream_basic_rates,
-                active->ofdm_ht_dual_stream_basic_rates);
-        CHK_NEQ(staging->assoc_id, active->assoc_id);
-
-        /* flags, filter_flags, ofdm_basic_rates, and cck_basic_rates can
-         * be updated with the RXON_ASSOC command -- however only some
-         * flag transitions are allowed using RXON_ASSOC */
-
-        /* Check if we are not switching bands */
-        CHK_NEQ(staging->flags & RXON_FLG_BAND_24G_MSK,
-                active->flags & RXON_FLG_BAND_24G_MSK);
-
-        /* Check if we are switching association toggle */
-        CHK_NEQ(staging->filter_flags & RXON_FILTER_ASSOC_MSK,
-                active->filter_flags & RXON_FILTER_ASSOC_MSK);
-
-#undef CHK
-#undef CHK_NEQ
-
-        return 0;
-}
-EXPORT_SYMBOL(iwl_legacy_full_rxon_required);
-
-u8 iwl_legacy_get_lowest_plcp(struct iwl_priv *priv,
-                            struct iwl_rxon_context *ctx)
-{
-        /*
-         * Assign the lowest rate -- should really get this from
-         * the beacon skb from mac80211.
-         */
-        if (ctx->staging.flags & RXON_FLG_BAND_24G_MSK)
-                return IWL_RATE_1M_PLCP;
-        else
-                return IWL_RATE_6M_PLCP;
-}
-EXPORT_SYMBOL(iwl_legacy_get_lowest_plcp);
-
-static void _iwl_legacy_set_rxon_ht(struct iwl_priv *priv,
-                             struct iwl_ht_config *ht_conf,
-                             struct iwl_rxon_context *ctx)
-{
-        struct iwl_legacy_rxon_cmd *rxon = &ctx->staging;
-
-        if (!ctx->ht.enabled) {
-                rxon->flags &= ~(RXON_FLG_CHANNEL_MODE_MSK |
-                        RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK |
-                        RXON_FLG_HT40_PROT_MSK |
-                        RXON_FLG_HT_PROT_MSK);
-                return;
-        }
-
-        rxon->flags |= cpu_to_le32(ctx->ht.protection <<
-                                        RXON_FLG_HT_OPERATING_MODE_POS);
-
-        /* Set up channel bandwidth:
-         * 20 MHz only, 20/40 mixed or pure 40 if ht40 ok */
-        /* clear the HT channel mode before set the mode */
-        rxon->flags &= ~(RXON_FLG_CHANNEL_MODE_MSK |
-                         RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK);
-        if (iwl_legacy_is_ht40_tx_allowed(priv, ctx, NULL)) {
-                /* pure ht40 */
-                if (ctx->ht.protection ==
-                                IEEE80211_HT_OP_MODE_PROTECTION_20MHZ) {
-                        rxon->flags |= RXON_FLG_CHANNEL_MODE_PURE_40;
-                        /* Note: control channel is opposite of extension channel */
-                        switch (ctx->ht.extension_chan_offset) {
-                        case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
-                                rxon->flags &=
-                                        ~RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;
-                                break;
-                        case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
-                                rxon->flags |=
-                                        RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;
-                                break;
-                        }
-                } else {
-                        /* Note: control channel is opposite of extension channel */
-                        switch (ctx->ht.extension_chan_offset) {
-                        case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
-                                rxon->flags &=
-                                        ~(RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK);
-                                rxon->flags |= RXON_FLG_CHANNEL_MODE_MIXED;
-                                break;
-                        case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
-                                rxon->flags |=
-                                        RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;
-                                rxon->flags |= RXON_FLG_CHANNEL_MODE_MIXED;
-                                break;
-                        case IEEE80211_HT_PARAM_CHA_SEC_NONE:
-                        default:
-                                /* channel location only valid if in Mixed mode */
-                                IWL_ERR(priv,
-                                        "invalid extension channel offset\n");
-                                break;
-                        }
-                }
-        } else {
-                rxon->flags |= RXON_FLG_CHANNEL_MODE_LEGACY;
-        }
-
-        if (priv->cfg->ops->hcmd->set_rxon_chain)
-                priv->cfg->ops->hcmd->set_rxon_chain(priv, ctx);
-
-        IWL_DEBUG_ASSOC(priv, "rxon flags 0x%X operation mode :0x%X "
-                        "extension channel offset 0x%x\n",
-                        le32_to_cpu(rxon->flags), ctx->ht.protection,
-                        ctx->ht.extension_chan_offset);
-}
-
-void iwl_legacy_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_config *ht_conf)
-{
-        struct iwl_rxon_context *ctx;
-
-        for_each_context(priv, ctx)
-                _iwl_legacy_set_rxon_ht(priv, ht_conf, ctx);
-}
-EXPORT_SYMBOL(iwl_legacy_set_rxon_ht);
-
-/* Return valid, unused, channel for a passive scan to reset the RF */
-u8 iwl_legacy_get_single_channel_number(struct iwl_priv *priv,
-                                 enum ieee80211_band band)
-{
-        const struct iwl_channel_info *ch_info;
-        int i;
-        u8 channel = 0;
-        u8 min, max;
-        struct iwl_rxon_context *ctx;
-
-        if (band == IEEE80211_BAND_5GHZ) {
-                min = 14;
-                max = priv->channel_count;
-        } else {
-                min = 0;
-                max = 14;
-        }
-
-        for (i = min; i < max; i++) {
-                bool busy = false;
-
-                for_each_context(priv, ctx) {
-                        busy = priv->channel_info[i].channel ==
-                                le16_to_cpu(ctx->staging.channel);
-                        if (busy)
-                                break;
-                }
-
-                if (busy)
-                        continue;
-
-                channel = priv->channel_info[i].channel;
-                ch_info = iwl_legacy_get_channel_info(priv, band, channel);
-                if (iwl_legacy_is_channel_valid(ch_info))
-                        break;
-        }
-
-        return channel;
-}
-EXPORT_SYMBOL(iwl_legacy_get_single_channel_number);
-
-/**
- * iwl_legacy_set_rxon_channel - Set the band and channel values in staging RXON
- * @ch: requested channel as a pointer to struct ieee80211_channel
-
- * NOTE:  Does not commit to the hardware; it sets appropriate bit fields
- * in the staging RXON flag structure based on the ch->band
- */
-int
-iwl_legacy_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch,
-                         struct iwl_rxon_context *ctx)
-{
-        enum ieee80211_band band = ch->band;
-        u16 channel = ch->hw_value;
-
-        if ((le16_to_cpu(ctx->staging.channel) == channel) &&
-            (priv->band == band))
-                return 0;
-
-        ctx->staging.channel = cpu_to_le16(channel);
-        if (band == IEEE80211_BAND_5GHZ)
-                ctx->staging.flags &= ~RXON_FLG_BAND_24G_MSK;
-        else
-                ctx->staging.flags |= RXON_FLG_BAND_24G_MSK;
-
-        priv->band = band;
-
-        IWL_DEBUG_INFO(priv, "Staging channel set to %d [%d]\n", channel, band);
-
-        return 0;
-}
-EXPORT_SYMBOL(iwl_legacy_set_rxon_channel);
-
-void iwl_legacy_set_flags_for_band(struct iwl_priv *priv,
-                            struct iwl_rxon_context *ctx,
-                            enum ieee80211_band band,
-                            struct ieee80211_vif *vif)
-{
-        if (band == IEEE80211_BAND_5GHZ) {
-                ctx->staging.flags &=
-                    ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK
-                      | RXON_FLG_CCK_MSK);
-                ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
-        } else {
-                /* Copied from iwl_post_associate() */
-                if (vif && vif->bss_conf.use_short_slot)
-                        ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
-                else
-                        ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
-
-                ctx->staging.flags |= RXON_FLG_BAND_24G_MSK;
-                ctx->staging.flags |= RXON_FLG_AUTO_DETECT_MSK;
-                ctx->staging.flags &= ~RXON_FLG_CCK_MSK;
-        }
-}
-EXPORT_SYMBOL(iwl_legacy_set_flags_for_band);
-
-/*
- * initialize rxon structure with default values from eeprom
- */
-void iwl_legacy_connection_init_rx_config(struct iwl_priv *priv,
-                                   struct iwl_rxon_context *ctx)
-{
-        const struct iwl_channel_info *ch_info;
-
-        memset(&ctx->staging, 0, sizeof(ctx->staging));
-
-        if (!ctx->vif) {
-                ctx->staging.dev_type = ctx->unused_devtype;
-        } else
-        switch (ctx->vif->type) {
-
-        case NL80211_IFTYPE_STATION:
-                ctx->staging.dev_type = ctx->station_devtype;
-                ctx->staging.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK;
-                break;
-
-        case NL80211_IFTYPE_ADHOC:
-                ctx->staging.dev_type = ctx->ibss_devtype;
-                ctx->staging.flags = RXON_FLG_SHORT_PREAMBLE_MSK;
-                ctx->staging.filter_flags = RXON_FILTER_BCON_AWARE_MSK |
-                                                  RXON_FILTER_ACCEPT_GRP_MSK;
-                break;
-
-        default:
-                IWL_ERR(priv, "Unsupported interface type %d\n",
-                        ctx->vif->type);
-                break;
-        }
-
-#if 0
-        /* TODO:  Figure out when short_preamble would be set and cache from
-         * that */
-        if (!hw_to_local(priv->hw)->short_preamble)
-                ctx->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
-        else
-                ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
-#endif
-
-        ch_info = iwl_legacy_get_channel_info(priv, priv->band,
-                                       le16_to_cpu(ctx->active.channel));
-
-        if (!ch_info)
-                ch_info = &priv->channel_info[0];
-
-        ctx->staging.channel = cpu_to_le16(ch_info->channel);
-        priv->band = ch_info->band;
-
-        iwl_legacy_set_flags_for_band(priv, ctx, priv->band, ctx->vif);
-
-        ctx->staging.ofdm_basic_rates =
-            (IWL_OFDM_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
-        ctx->staging.cck_basic_rates =
-            (IWL_CCK_RATES_MASK >> IWL_FIRST_CCK_RATE) & 0xF;
-
-        /* clear both MIX and PURE40 mode flag */
-        ctx->staging.flags &= ~(RXON_FLG_CHANNEL_MODE_MIXED |
-                                        RXON_FLG_CHANNEL_MODE_PURE_40);
-        if (ctx->vif)
-                memcpy(ctx->staging.node_addr, ctx->vif->addr, ETH_ALEN);
-
-        ctx->staging.ofdm_ht_single_stream_basic_rates = 0xff;
-        ctx->staging.ofdm_ht_dual_stream_basic_rates = 0xff;
-}
-EXPORT_SYMBOL(iwl_legacy_connection_init_rx_config);
-
-void iwl_legacy_set_rate(struct iwl_priv *priv)
-{
-        const struct ieee80211_supported_band *hw = NULL;
-        struct ieee80211_rate *rate;
-        struct iwl_rxon_context *ctx;
-        int i;
-
-        hw = iwl_get_hw_mode(priv, priv->band);
-        if (!hw) {
-                IWL_ERR(priv, "Failed to set rate: unable to get hw mode\n");
-                return;
-        }
-
-        priv->active_rate = 0;
-
-        for (i = 0; i < hw->n_bitrates; i++) {
-                rate = &(hw->bitrates[i]);
-                if (rate->hw_value < IWL_RATE_COUNT_LEGACY)
-                        priv->active_rate |= (1 << rate->hw_value);
-        }
-
-        IWL_DEBUG_RATE(priv, "Set active_rate = %0x\n", priv->active_rate);
-
-        for_each_context(priv, ctx) {
-                ctx->staging.cck_basic_rates =
-                    (IWL_CCK_BASIC_RATES_MASK >> IWL_FIRST_CCK_RATE) & 0xF;
-
-                ctx->staging.ofdm_basic_rates =
-                   (IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
-        }
-}
-EXPORT_SYMBOL(iwl_legacy_set_rate);
-
-void iwl_legacy_chswitch_done(struct iwl_priv *priv, bool is_success)
-{
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
-
-        if (test_and_clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status))
-                ieee80211_chswitch_done(ctx->vif, is_success);
-}
-EXPORT_SYMBOL(iwl_legacy_chswitch_done);
-
-void iwl_legacy_rx_csa(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_csa_notification *csa = &(pkt->u.csa_notif);
-
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        struct iwl_legacy_rxon_cmd *rxon = (void *)&ctx->active;
-
-        if (!test_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status))
-                return;
-
-        if (!le32_to_cpu(csa->status) && csa->channel == priv->switch_channel) {
-                rxon->channel = csa->channel;
-                ctx->staging.channel = csa->channel;
-                IWL_DEBUG_11H(priv, "CSA notif: channel %d\n",
-                              le16_to_cpu(csa->channel));
-                iwl_legacy_chswitch_done(priv, true);
-        } else {
-                IWL_ERR(priv, "CSA notif (fail) : channel %d\n",
-                        le16_to_cpu(csa->channel));
-                iwl_legacy_chswitch_done(priv, false);
-        }
-}
-EXPORT_SYMBOL(iwl_legacy_rx_csa);
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-void iwl_legacy_print_rx_config_cmd(struct iwl_priv *priv,
-                             struct iwl_rxon_context *ctx)
-{
-        struct iwl_legacy_rxon_cmd *rxon = &ctx->staging;
-
-        IWL_DEBUG_RADIO(priv, "RX CONFIG:\n");
-        iwl_print_hex_dump(priv, IWL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));
-        IWL_DEBUG_RADIO(priv, "u16 channel: 0x%x\n",
-                                le16_to_cpu(rxon->channel));
-        IWL_DEBUG_RADIO(priv, "u32 flags: 0x%08X\n", le32_to_cpu(rxon->flags));
-        IWL_DEBUG_RADIO(priv, "u32 filter_flags: 0x%08x\n",
-                                le32_to_cpu(rxon->filter_flags));
-        IWL_DEBUG_RADIO(priv, "u8 dev_type: 0x%x\n", rxon->dev_type);
-        IWL_DEBUG_RADIO(priv, "u8 ofdm_basic_rates: 0x%02x\n",
-                        rxon->ofdm_basic_rates);
-        IWL_DEBUG_RADIO(priv, "u8 cck_basic_rates: 0x%02x\n",
-                                rxon->cck_basic_rates);
-        IWL_DEBUG_RADIO(priv, "u8[6] node_addr: %pM\n", rxon->node_addr);
-        IWL_DEBUG_RADIO(priv, "u8[6] bssid_addr: %pM\n", rxon->bssid_addr);
-        IWL_DEBUG_RADIO(priv, "u16 assoc_id: 0x%x\n",
-                                le16_to_cpu(rxon->assoc_id));
-}
-EXPORT_SYMBOL(iwl_legacy_print_rx_config_cmd);
-#endif
-/**
- * iwl_legacy_irq_handle_error - called for HW or SW error interrupt from card
- */
-void iwl_legacy_irq_handle_error(struct iwl_priv *priv)
-{
-        /* Set the FW error flag -- cleared on iwl_down */
-        set_bit(STATUS_FW_ERROR, &priv->status);
-
-        /* Cancel currently queued command. */
-        clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
-
-        IWL_ERR(priv, "Loaded firmware version: %s\n",
-                priv->hw->wiphy->fw_version);
-
-        priv->cfg->ops->lib->dump_nic_error_log(priv);
-        if (priv->cfg->ops->lib->dump_fh)
-                priv->cfg->ops->lib->dump_fh(priv, NULL, false);
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        if (iwl_legacy_get_debug_level(priv) & IWL_DL_FW_ERRORS)
-                iwl_legacy_print_rx_config_cmd(priv,
-                                        &priv->contexts[IWL_RXON_CTX_BSS]);
-#endif
-
-        wake_up(&priv->wait_command_queue);
-
-        /* Keep the restart process from trying to send host
-         * commands by clearing the INIT status bit */
-        clear_bit(STATUS_READY, &priv->status);
-
-        if (!test_bit(STATUS_EXIT_PENDING, &priv->status)) {
-                IWL_DEBUG(priv, IWL_DL_FW_ERRORS,
-                          "Restarting adapter due to uCode error.\n");
-
-                if (priv->cfg->mod_params->restart_fw)
-                        queue_work(priv->workqueue, &priv->restart);
-        }
-}
-EXPORT_SYMBOL(iwl_legacy_irq_handle_error);
-
-static int iwl_legacy_apm_stop_master(struct iwl_priv *priv)
-{
-        int ret = 0;
-
-        /* stop device's busmaster DMA activity */
-        iwl_legacy_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);
-
-        ret = iwl_poll_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_MASTER_DISABLED,
-                        CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);
-        if (ret)
-                IWL_WARN(priv, "Master Disable Timed Out, 100 usec\n");
-
-        IWL_DEBUG_INFO(priv, "stop master\n");
-
-        return ret;
-}
-
-void iwl_legacy_apm_stop(struct iwl_priv *priv)
-{
-        IWL_DEBUG_INFO(priv, "Stop card, put in low power state\n");
-
-        /* Stop device's DMA activity */
-        iwl_legacy_apm_stop_master(priv);
-
-        /* Reset the entire device */
-        iwl_legacy_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);
-
-        udelay(10);
-
-        /*
-         * Clear "initialization complete" bit to move adapter from
-         * D0A* (powered-up Active) --> D0U* (Uninitialized) state.
-         */
-        iwl_legacy_clear_bit(priv, CSR_GP_CNTRL,
-                                CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
-}
-EXPORT_SYMBOL(iwl_legacy_apm_stop);
-
-
-/*
- * Start up NIC's basic functionality after it has been reset
- * (e.g. after platform boot, or shutdown via iwl_legacy_apm_stop())
- * NOTE:  This does not load uCode nor start the embedded processor
- */
-int iwl_legacy_apm_init(struct iwl_priv *priv)
-{
-        int ret = 0;
-        u16 lctl;
-
-        IWL_DEBUG_INFO(priv, "Init card's basic functions\n");
-
-        /*
-         * Use "set_bit" below rather than "write", to preserve any hardware
-         * bits already set by default after reset.
-         */
-
-        /* Disable L0S exit timer (platform NMI Work/Around) */
-        iwl_legacy_set_bit(priv, CSR_GIO_CHICKEN_BITS,
-                          CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);
-
-        /*
-         * Disable L0s without affecting L1;
-         *  don't wait for ICH L0s (ICH bug W/A)
-         */
-        iwl_legacy_set_bit(priv, CSR_GIO_CHICKEN_BITS,
-                          CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX);
-
-        /* Set FH wait threshold to maximum (HW error during stress W/A) */
-        iwl_legacy_set_bit(priv, CSR_DBG_HPET_MEM_REG,
-                                        CSR_DBG_HPET_MEM_REG_VAL);
-
-        /*
-         * Enable HAP INTA (interrupt from management bus) to
-         * wake device's PCI Express link L1a -> L0s
-         * NOTE:  This is no-op for 3945 (non-existent bit)
-         */
-        iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                                    CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A);
-
-        /*
-         * HW bug W/A for instability in PCIe bus L0->L0S->L1 transition.
-         * Check if BIOS (or OS) enabled L1-ASPM on this device.
-         * If so (likely), disable L0S, so device moves directly L0->L1;
-         *    costs negligible amount of power savings.
-         * If not (unlikely), enable L0S, so there is at least some
-         *    power savings, even without L1.
-         */
-        if (priv->cfg->base_params->set_l0s) {
-                lctl = iwl_legacy_pcie_link_ctl(priv);
-                if ((lctl & PCI_CFG_LINK_CTRL_VAL_L1_EN) ==
-                                        PCI_CFG_LINK_CTRL_VAL_L1_EN) {
-                        /* L1-ASPM enabled; disable(!) L0S  */
-                        iwl_legacy_set_bit(priv, CSR_GIO_REG,
-                                        CSR_GIO_REG_VAL_L0S_ENABLED);
-                        IWL_DEBUG_POWER(priv, "L1 Enabled; Disabling L0S\n");
-                } else {
-                        /* L1-ASPM disabled; enable(!) L0S */
-                        iwl_legacy_clear_bit(priv, CSR_GIO_REG,
-                                        CSR_GIO_REG_VAL_L0S_ENABLED);
-                        IWL_DEBUG_POWER(priv, "L1 Disabled; Enabling L0S\n");
-                }
-        }
-
-        /* Configure analog phase-lock-loop before activating to D0A */
-        if (priv->cfg->base_params->pll_cfg_val)
-                iwl_legacy_set_bit(priv, CSR_ANA_PLL_CFG,
-                            priv->cfg->base_params->pll_cfg_val);
-
-        /*
-         * Set "initialization complete" bit to move adapter from
-         * D0U* --> D0A* (powered-up active) state.
-         */
-        iwl_legacy_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
-
-        /*
-         * Wait for clock stabilization; once stabilized, access to
-         * device-internal resources is supported, e.g. iwl_legacy_write_prph()
-         * and accesses to uCode SRAM.
-         */
-        ret = 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 (ret < 0) {
-                IWL_DEBUG_INFO(priv, "Failed to init the card\n");
-                goto out;
-        }
-
-        /*
-         * Enable DMA and BSM (if used) clocks, wait for them to stabilize.
-         * BSM (Boostrap State Machine) is only in 3945 and 4965.
-         *
-         * Write to "CLK_EN_REG"; "1" bits enable clocks, while "0" bits
-         * do not disable clocks.  This preserves any hardware bits already
-         * set by default in "CLK_CTRL_REG" after reset.
-         */
-        if (priv->cfg->base_params->use_bsm)
-                iwl_legacy_write_prph(priv, APMG_CLK_EN_REG,
-                        APMG_CLK_VAL_DMA_CLK_RQT | APMG_CLK_VAL_BSM_CLK_RQT);
-        else
-                iwl_legacy_write_prph(priv, APMG_CLK_EN_REG,
-                        APMG_CLK_VAL_DMA_CLK_RQT);
-        udelay(20);
-
-        /* Disable L1-Active */
-        iwl_legacy_set_bits_prph(priv, APMG_PCIDEV_STT_REG,
-                          APMG_PCIDEV_STT_VAL_L1_ACT_DIS);
-
-out:
-        return ret;
-}
-EXPORT_SYMBOL(iwl_legacy_apm_init);
-
-
-int iwl_legacy_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)
-{
-        int ret;
-        s8 prev_tx_power;
-        bool defer;
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-        lockdep_assert_held(&priv->mutex);
-
-        if (priv->tx_power_user_lmt == tx_power && !force)
-                return 0;
-
-        if (!priv->cfg->ops->lib->send_tx_power)
-                return -EOPNOTSUPP;
-
-        /* 0 dBm mean 1 milliwatt */
-        if (tx_power < 0) {
-                IWL_WARN(priv,
-                         "Requested user TXPOWER %d below 1 mW.\n",
-                         tx_power);
-                return -EINVAL;
-        }
-
-        if (tx_power > priv->tx_power_device_lmt) {
-                IWL_WARN(priv,
-                        "Requested user TXPOWER %d above upper limit %d.\n",
-                         tx_power, priv->tx_power_device_lmt);
-                return -EINVAL;
-        }
-
-        if (!iwl_legacy_is_ready_rf(priv))
-                return -EIO;
-
-        /* scan complete and commit_rxon use tx_power_next value,
-         * it always need to be updated for newest request */
-        priv->tx_power_next = tx_power;
-
-        /* do not set tx power when scanning or channel changing */
-        defer = test_bit(STATUS_SCANNING, &priv->status) ||
-                memcmp(&ctx->active, &ctx->staging, sizeof(ctx->staging));
-        if (defer && !force) {
-                IWL_DEBUG_INFO(priv, "Deferring tx power set\n");
-                return 0;
-        }
-
-        prev_tx_power = priv->tx_power_user_lmt;
-        priv->tx_power_user_lmt = tx_power;
-
-        ret = priv->cfg->ops->lib->send_tx_power(priv);
-
-        /* if fail to set tx_power, restore the orig. tx power */
-        if (ret) {
-                priv->tx_power_user_lmt = prev_tx_power;
-                priv->tx_power_next = prev_tx_power;
-        }
-        return ret;
-}
-EXPORT_SYMBOL(iwl_legacy_set_tx_power);
-
-void iwl_legacy_send_bt_config(struct iwl_priv *priv)
-{
-        struct iwl_bt_cmd bt_cmd = {
-                .lead_time = BT_LEAD_TIME_DEF,
-                .max_kill = BT_MAX_KILL_DEF,
-                .kill_ack_mask = 0,
-                .kill_cts_mask = 0,
-        };
-
-        if (!bt_coex_active)
-                bt_cmd.flags = BT_COEX_DISABLE;
-        else
-                bt_cmd.flags = BT_COEX_ENABLE;
-
-        IWL_DEBUG_INFO(priv, "BT coex %s\n",
-                (bt_cmd.flags == BT_COEX_DISABLE) ? "disable" : "active");
-
-        if (iwl_legacy_send_cmd_pdu(priv, REPLY_BT_CONFIG,
-                             sizeof(struct iwl_bt_cmd), &bt_cmd))
-                IWL_ERR(priv, "failed to send BT Coex Config\n");
-}
-EXPORT_SYMBOL(iwl_legacy_send_bt_config);
-
-int iwl_legacy_send_statistics_request(struct iwl_priv *priv, u8 flags, bool clear)
-{
-        struct iwl_statistics_cmd statistics_cmd = {
-                .configuration_flags =
-                        clear ? IWL_STATS_CONF_CLEAR_STATS : 0,
-        };
-
-        if (flags & CMD_ASYNC)
-                return iwl_legacy_send_cmd_pdu_async(priv, REPLY_STATISTICS_CMD,
-                                        sizeof(struct iwl_statistics_cmd),
-                                        &statistics_cmd, NULL);
-        else
-                return iwl_legacy_send_cmd_pdu(priv, REPLY_STATISTICS_CMD,
-                                        sizeof(struct iwl_statistics_cmd),
-                                        &statistics_cmd);
-}
-EXPORT_SYMBOL(iwl_legacy_send_statistics_request);
-
-void iwl_legacy_rx_pm_sleep_notif(struct iwl_priv *priv,
-                           struct iwl_rx_mem_buffer *rxb)
-{
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_sleep_notification *sleep = &(pkt->u.sleep_notif);
-        IWL_DEBUG_RX(priv, "sleep mode: %d, src: %d\n",
-                     sleep->pm_sleep_mode, sleep->pm_wakeup_src);
-#endif
-}
-EXPORT_SYMBOL(iwl_legacy_rx_pm_sleep_notif);
-
-void iwl_legacy_rx_pm_debug_statistics_notif(struct iwl_priv *priv,
-                                      struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        u32 len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
-        IWL_DEBUG_RADIO(priv, "Dumping %d bytes of unhandled "
-                        "notification for %s:\n", len,
-                        iwl_legacy_get_cmd_string(pkt->hdr.cmd));
-        iwl_print_hex_dump(priv, IWL_DL_RADIO, pkt->u.raw, len);
-}
-EXPORT_SYMBOL(iwl_legacy_rx_pm_debug_statistics_notif);
-
-void iwl_legacy_rx_reply_error(struct iwl_priv *priv,
-                        struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-
-        IWL_ERR(priv, "Error Reply type 0x%08X cmd %s (0x%02X) "
-                "seq 0x%04X ser 0x%08X\n",
-                le32_to_cpu(pkt->u.err_resp.error_type),
-                iwl_legacy_get_cmd_string(pkt->u.err_resp.cmd_id),
-                pkt->u.err_resp.cmd_id,
-                le16_to_cpu(pkt->u.err_resp.bad_cmd_seq_num),
-                le32_to_cpu(pkt->u.err_resp.error_info));
-}
-EXPORT_SYMBOL(iwl_legacy_rx_reply_error);
-
-void iwl_legacy_clear_isr_stats(struct iwl_priv *priv)
-{
-        memset(&priv->isr_stats, 0, sizeof(priv->isr_stats));
-}
-
-int iwl_legacy_mac_conf_tx(struct ieee80211_hw *hw,
-                           struct ieee80211_vif *vif, u16 queue,
-                           const struct ieee80211_tx_queue_params *params)
-{
-        struct iwl_priv *priv = hw->priv;
-        struct iwl_rxon_context *ctx;
-        unsigned long flags;
-        int q;
-
-        IWL_DEBUG_MAC80211(priv, "enter\n");
-
-        if (!iwl_legacy_is_ready_rf(priv)) {
-                IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n");
-                return -EIO;
-        }
-
-        if (queue >= AC_NUM) {
-                IWL_DEBUG_MAC80211(priv, "leave - queue >= AC_NUM %d\n", queue);
-                return 0;
-        }
-
-        q = AC_NUM - 1 - queue;
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        for_each_context(priv, ctx) {
-                ctx->qos_data.def_qos_parm.ac[q].cw_min =
-                        cpu_to_le16(params->cw_min);
-                ctx->qos_data.def_qos_parm.ac[q].cw_max =
-                        cpu_to_le16(params->cw_max);
-                ctx->qos_data.def_qos_parm.ac[q].aifsn = params->aifs;
-                ctx->qos_data.def_qos_parm.ac[q].edca_txop =
-                                cpu_to_le16((params->txop * 32));
-
-                ctx->qos_data.def_qos_parm.ac[q].reserved1 = 0;
-        }
-
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-        return 0;
-}
-EXPORT_SYMBOL(iwl_legacy_mac_conf_tx);
-
-int iwl_legacy_mac_tx_last_beacon(struct ieee80211_hw *hw)
-{
-        struct iwl_priv *priv = hw->priv;
-
-        return priv->ibss_manager == IWL_IBSS_MANAGER;
-}
-EXPORT_SYMBOL_GPL(iwl_legacy_mac_tx_last_beacon);
-
-static int
-iwl_legacy_set_mode(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
-{
-        iwl_legacy_connection_init_rx_config(priv, ctx);
-
-        if (priv->cfg->ops->hcmd->set_rxon_chain)
-                priv->cfg->ops->hcmd->set_rxon_chain(priv, ctx);
-
-        return iwl_legacy_commit_rxon(priv, ctx);
-}
-
-static int iwl_legacy_setup_interface(struct iwl_priv *priv,
-                               struct iwl_rxon_context *ctx)
-{
-        struct ieee80211_vif *vif = ctx->vif;
-        int err;
-
-        lockdep_assert_held(&priv->mutex);
-
-        /*
-         * This variable will be correct only when there's just
-         * a single context, but all code using it is for hardware
-         * that supports only one context.
-         */
-        priv->iw_mode = vif->type;
-
-        ctx->is_active = true;
-
-        err = iwl_legacy_set_mode(priv, ctx);
-        if (err) {
-                if (!ctx->always_active)
-                        ctx->is_active = false;
-                return err;
-        }
-
-        return 0;
-}
-
-int
-iwl_legacy_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
-{
-        struct iwl_priv *priv = hw->priv;
-        struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
-        struct iwl_rxon_context *tmp, *ctx = NULL;
-        int err;
-
-        IWL_DEBUG_MAC80211(priv, "enter: type %d, addr %pM\n",
-                           vif->type, vif->addr);
-
-        mutex_lock(&priv->mutex);
-
-        if (!iwl_legacy_is_ready_rf(priv)) {
-                IWL_WARN(priv, "Try to add interface when device not ready\n");
-                err = -EINVAL;
-                goto out;
-        }
-
-        for_each_context(priv, tmp) {
-                u32 possible_modes =
-                        tmp->interface_modes | tmp->exclusive_interface_modes;
-
-                if (tmp->vif) {
-                        /* check if this busy context is exclusive */
-                        if (tmp->exclusive_interface_modes &
-                                                BIT(tmp->vif->type)) {
-                                err = -EINVAL;
-                                goto out;
-                        }
-                        continue;
-                }
-
-                if (!(possible_modes & BIT(vif->type)))
-                        continue;
-
-                /* have maybe usable context w/o interface */
-                ctx = tmp;
-                break;
-        }
-
-        if (!ctx) {
-                err = -EOPNOTSUPP;
-                goto out;
-        }
-
-        vif_priv->ctx = ctx;
-        ctx->vif = vif;
-
-        err = iwl_legacy_setup_interface(priv, ctx);
-        if (!err)
-                goto out;
-
-        ctx->vif = NULL;
-        priv->iw_mode = NL80211_IFTYPE_STATION;
- out:
-        mutex_unlock(&priv->mutex);
-
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-        return err;
-}
-EXPORT_SYMBOL(iwl_legacy_mac_add_interface);
-
-static void iwl_legacy_teardown_interface(struct iwl_priv *priv,
-                                   struct ieee80211_vif *vif,
-                                   bool mode_change)
-{
-        struct iwl_rxon_context *ctx = iwl_legacy_rxon_ctx_from_vif(vif);
-
-        lockdep_assert_held(&priv->mutex);
-
-        if (priv->scan_vif == vif) {
-                iwl_legacy_scan_cancel_timeout(priv, 200);
-                iwl_legacy_force_scan_end(priv);
-        }
-
-        if (!mode_change) {
-                iwl_legacy_set_mode(priv, ctx);
-                if (!ctx->always_active)
-                        ctx->is_active = false;
-        }
-}
-
-void iwl_legacy_mac_remove_interface(struct ieee80211_hw *hw,
-                              struct ieee80211_vif *vif)
-{
-        struct iwl_priv *priv = hw->priv;
-        struct iwl_rxon_context *ctx = iwl_legacy_rxon_ctx_from_vif(vif);
-
-        IWL_DEBUG_MAC80211(priv, "enter\n");
-
-        mutex_lock(&priv->mutex);
-
-        WARN_ON(ctx->vif != vif);
-        ctx->vif = NULL;
-
-        iwl_legacy_teardown_interface(priv, vif, false);
-
-        memset(priv->bssid, 0, ETH_ALEN);
-        mutex_unlock(&priv->mutex);
-
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-
-}
-EXPORT_SYMBOL(iwl_legacy_mac_remove_interface);
-
-int iwl_legacy_alloc_txq_mem(struct iwl_priv *priv)
-{
-        if (!priv->txq)
-                priv->txq = kzalloc(
-                        sizeof(struct iwl_tx_queue) *
-                                priv->cfg->base_params->num_of_queues,
-                        GFP_KERNEL);
-        if (!priv->txq) {
-                IWL_ERR(priv, "Not enough memory for txq\n");
-                return -ENOMEM;
-        }
-        return 0;
-}
-EXPORT_SYMBOL(iwl_legacy_alloc_txq_mem);
-
-void iwl_legacy_txq_mem(struct iwl_priv *priv)
-{
-        kfree(priv->txq);
-        priv->txq = NULL;
-}
-EXPORT_SYMBOL(iwl_legacy_txq_mem);
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
-
-#define IWL_TRAFFIC_DUMP_SIZE   (IWL_TRAFFIC_ENTRY_SIZE * IWL_TRAFFIC_ENTRIES)
-
-void iwl_legacy_reset_traffic_log(struct iwl_priv *priv)
-{
-        priv->tx_traffic_idx = 0;
-        priv->rx_traffic_idx = 0;
-        if (priv->tx_traffic)
-                memset(priv->tx_traffic, 0, IWL_TRAFFIC_DUMP_SIZE);
-        if (priv->rx_traffic)
-                memset(priv->rx_traffic, 0, IWL_TRAFFIC_DUMP_SIZE);
-}
-
-int iwl_legacy_alloc_traffic_mem(struct iwl_priv *priv)
-{
-        u32 traffic_size = IWL_TRAFFIC_DUMP_SIZE;
-
-        if (iwlegacy_debug_level & IWL_DL_TX) {
-                if (!priv->tx_traffic) {
-                        priv->tx_traffic =
-                                kzalloc(traffic_size, GFP_KERNEL);
-                        if (!priv->tx_traffic)
-                                return -ENOMEM;
-                }
-        }
-        if (iwlegacy_debug_level & IWL_DL_RX) {
-                if (!priv->rx_traffic) {
-                        priv->rx_traffic =
-                                kzalloc(traffic_size, GFP_KERNEL);
-                        if (!priv->rx_traffic)
-                                return -ENOMEM;
-                }
-        }
-        iwl_legacy_reset_traffic_log(priv);
-        return 0;
-}
-EXPORT_SYMBOL(iwl_legacy_alloc_traffic_mem);
-
-void iwl_legacy_free_traffic_mem(struct iwl_priv *priv)
-{
-        kfree(priv->tx_traffic);
-        priv->tx_traffic = NULL;
-
-        kfree(priv->rx_traffic);
-        priv->rx_traffic = NULL;
-}
-EXPORT_SYMBOL(iwl_legacy_free_traffic_mem);
-
-void iwl_legacy_dbg_log_tx_data_frame(struct iwl_priv *priv,
-                      u16 length, struct ieee80211_hdr *header)
-{
-        __le16 fc;
-        u16 len;
-
-        if (likely(!(iwlegacy_debug_level & IWL_DL_TX)))
-                return;
-
-        if (!priv->tx_traffic)
-                return;
-
-        fc = header->frame_control;
-        if (ieee80211_is_data(fc)) {
-                len = (length > IWL_TRAFFIC_ENTRY_SIZE)
-                       ? IWL_TRAFFIC_ENTRY_SIZE : length;
-                memcpy((priv->tx_traffic +
-                       (priv->tx_traffic_idx * IWL_TRAFFIC_ENTRY_SIZE)),
-                       header, len);
-                priv->tx_traffic_idx =
-                        (priv->tx_traffic_idx + 1) % IWL_TRAFFIC_ENTRIES;
-        }
-}
-EXPORT_SYMBOL(iwl_legacy_dbg_log_tx_data_frame);
-
-void iwl_legacy_dbg_log_rx_data_frame(struct iwl_priv *priv,
-                      u16 length, struct ieee80211_hdr *header)
-{
-        __le16 fc;
-        u16 len;
-
-        if (likely(!(iwlegacy_debug_level & IWL_DL_RX)))
-                return;
-
-        if (!priv->rx_traffic)
-                return;
-
-        fc = header->frame_control;
-        if (ieee80211_is_data(fc)) {
-                len = (length > IWL_TRAFFIC_ENTRY_SIZE)
-                       ? IWL_TRAFFIC_ENTRY_SIZE : length;
-                memcpy((priv->rx_traffic +
-                       (priv->rx_traffic_idx * IWL_TRAFFIC_ENTRY_SIZE)),
-                       header, len);
-                priv->rx_traffic_idx =
-                        (priv->rx_traffic_idx + 1) % IWL_TRAFFIC_ENTRIES;
-        }
-}
-EXPORT_SYMBOL(iwl_legacy_dbg_log_rx_data_frame);
-
-const char *iwl_legacy_get_mgmt_string(int cmd)
-{
-        switch (cmd) {
-                IWL_CMD(MANAGEMENT_ASSOC_REQ);
-                IWL_CMD(MANAGEMENT_ASSOC_RESP);
-                IWL_CMD(MANAGEMENT_REASSOC_REQ);
-                IWL_CMD(MANAGEMENT_REASSOC_RESP);
-                IWL_CMD(MANAGEMENT_PROBE_REQ);
-                IWL_CMD(MANAGEMENT_PROBE_RESP);
-                IWL_CMD(MANAGEMENT_BEACON);
-                IWL_CMD(MANAGEMENT_ATIM);
-                IWL_CMD(MANAGEMENT_DISASSOC);
-                IWL_CMD(MANAGEMENT_AUTH);
-                IWL_CMD(MANAGEMENT_DEAUTH);
-                IWL_CMD(MANAGEMENT_ACTION);
-        default:
-                return "UNKNOWN";
-
-        }
-}
-
-const char *iwl_legacy_get_ctrl_string(int cmd)
-{
-        switch (cmd) {
-                IWL_CMD(CONTROL_BACK_REQ);
-                IWL_CMD(CONTROL_BACK);
-                IWL_CMD(CONTROL_PSPOLL);
-                IWL_CMD(CONTROL_RTS);
-                IWL_CMD(CONTROL_CTS);
-                IWL_CMD(CONTROL_ACK);
-                IWL_CMD(CONTROL_CFEND);
-                IWL_CMD(CONTROL_CFENDACK);
-        default:
-                return "UNKNOWN";
-
-        }
-}
-
-void iwl_legacy_clear_traffic_stats(struct iwl_priv *priv)
-{
-        memset(&priv->tx_stats, 0, sizeof(struct traffic_stats));
-        memset(&priv->rx_stats, 0, sizeof(struct traffic_stats));
-}
-
-/*
- * if CONFIG_IWLWIFI_LEGACY_DEBUGFS defined,
- * iwl_legacy_update_stats function will
- * record all the MGMT, CTRL and DATA pkt for both TX and Rx pass
- * Use debugFs to display the rx/rx_statistics
- * if CONFIG_IWLWIFI_LEGACY_DEBUGFS not being defined, then no MGMT and CTRL
- * information will be recorded, but DATA pkt still will be recorded
- * for the reason of iwl_led.c need to control the led blinking based on
- * number of tx and rx data.
- *
- */
-void
-iwl_legacy_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc, u16 len)
-{
-        struct traffic_stats    *stats;
-
-        if (is_tx)
-                stats = &priv->tx_stats;
-        else
-                stats = &priv->rx_stats;
-
-        if (ieee80211_is_mgmt(fc)) {
-                switch (fc & cpu_to_le16(IEEE80211_FCTL_STYPE)) {
-                case cpu_to_le16(IEEE80211_STYPE_ASSOC_REQ):
-                        stats->mgmt[MANAGEMENT_ASSOC_REQ]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
-                        stats->mgmt[MANAGEMENT_ASSOC_RESP]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_REASSOC_REQ):
-                        stats->mgmt[MANAGEMENT_REASSOC_REQ]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
-                        stats->mgmt[MANAGEMENT_REASSOC_RESP]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_PROBE_REQ):
-                        stats->mgmt[MANAGEMENT_PROBE_REQ]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
-                        stats->mgmt[MANAGEMENT_PROBE_RESP]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_BEACON):
-                        stats->mgmt[MANAGEMENT_BEACON]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_ATIM):
-                        stats->mgmt[MANAGEMENT_ATIM]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
-                        stats->mgmt[MANAGEMENT_DISASSOC]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_AUTH):
-                        stats->mgmt[MANAGEMENT_AUTH]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
-                        stats->mgmt[MANAGEMENT_DEAUTH]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_ACTION):
-                        stats->mgmt[MANAGEMENT_ACTION]++;
-                        break;
-                }
-        } else if (ieee80211_is_ctl(fc)) {
-                switch (fc & cpu_to_le16(IEEE80211_FCTL_STYPE)) {
-                case cpu_to_le16(IEEE80211_STYPE_BACK_REQ):
-                        stats->ctrl[CONTROL_BACK_REQ]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_BACK):
-                        stats->ctrl[CONTROL_BACK]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_PSPOLL):
-                        stats->ctrl[CONTROL_PSPOLL]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_RTS):
-                        stats->ctrl[CONTROL_RTS]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_CTS):
-                        stats->ctrl[CONTROL_CTS]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_ACK):
-                        stats->ctrl[CONTROL_ACK]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_CFEND):
-                        stats->ctrl[CONTROL_CFEND]++;
-                        break;
-                case cpu_to_le16(IEEE80211_STYPE_CFENDACK):
-                        stats->ctrl[CONTROL_CFENDACK]++;
-                        break;
-                }
-        } else {
-                /* data */
-                stats->data_cnt++;
-                stats->data_bytes += len;
-        }
-}
-EXPORT_SYMBOL(iwl_legacy_update_stats);
-#endif
-
-int iwl_legacy_force_reset(struct iwl_priv *priv, bool external)
-{
-        struct iwl_force_reset *force_reset;
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return -EINVAL;
-
-        force_reset = &priv->force_reset;
-        force_reset->reset_request_count++;
-        if (!external) {
-                if (force_reset->last_force_reset_jiffies &&
-                    time_after(force_reset->last_force_reset_jiffies +
-                    force_reset->reset_duration, jiffies)) {
-                        IWL_DEBUG_INFO(priv, "force reset rejected\n");
-                        force_reset->reset_reject_count++;
-                        return -EAGAIN;
-                }
-        }
-        force_reset->reset_success_count++;
-        force_reset->last_force_reset_jiffies = jiffies;
-
-        /*
-         * if the request is from external(ex: debugfs),
-         * then always perform the request in regardless the module
-         * parameter setting
-         * if the request is from internal (uCode error or driver
-         * detect failure), then fw_restart module parameter
-         * need to be check before performing firmware reload
-         */
-
-        if (!external && !priv->cfg->mod_params->restart_fw) {
-                IWL_DEBUG_INFO(priv, "Cancel firmware reload based on "
-                               "module parameter setting\n");
-                return 0;
-        }
-
-        IWL_ERR(priv, "On demand firmware reload\n");
-
-        /* Set the FW error flag -- cleared on iwl_down */
-        set_bit(STATUS_FW_ERROR, &priv->status);
-        wake_up(&priv->wait_command_queue);
-        /*
-         * Keep the restart process from trying to send host
-         * commands by clearing the INIT status bit
-         */
-        clear_bit(STATUS_READY, &priv->status);
-        queue_work(priv->workqueue, &priv->restart);
-
-        return 0;
-}
-
-int
-iwl_legacy_mac_change_interface(struct ieee80211_hw *hw,
-                        struct ieee80211_vif *vif,
-                        enum nl80211_iftype newtype, bool newp2p)
-{
-        struct iwl_priv *priv = hw->priv;
-        struct iwl_rxon_context *ctx = iwl_legacy_rxon_ctx_from_vif(vif);
-        struct iwl_rxon_context *tmp;
-        u32 interface_modes;
-        int err;
-
-        newtype = ieee80211_iftype_p2p(newtype, newp2p);
-
-        mutex_lock(&priv->mutex);
-
-        if (!ctx->vif || !iwl_legacy_is_ready_rf(priv)) {
-                /*
-                 * Huh? But wait ... this can maybe happen when
-                 * we're in the middle of a firmware restart!
-                 */
-                err = -EBUSY;
-                goto out;
-        }
-
-        interface_modes = ctx->interface_modes | ctx->exclusive_interface_modes;
-
-        if (!(interface_modes & BIT(newtype))) {
-                err = -EBUSY;
-                goto out;
-        }
-
-        if (ctx->exclusive_interface_modes & BIT(newtype)) {
-                for_each_context(priv, tmp) {
-                        if (ctx == tmp)
-                                continue;
-
-                        if (!tmp->vif)
-                                continue;
-
-                        /*
-                         * The current mode switch would be exclusive, but
-                         * another context is active ... refuse the switch.
-                         */
-                        err = -EBUSY;
-                        goto out;
-                }
-        }
-
-        /* success */
-        iwl_legacy_teardown_interface(priv, vif, true);
-        vif->type = newtype;
-        vif->p2p = newp2p;
-        err = iwl_legacy_setup_interface(priv, ctx);
-        WARN_ON(err);
-        /*
-         * We've switched internally, but submitting to the
-         * device may have failed for some reason. Mask this
-         * error, because otherwise mac80211 will not switch
-         * (and set the interface type back) and we'll be
-         * out of sync with it.
-         */
-        err = 0;
-
- out:
-        mutex_unlock(&priv->mutex);
-        return err;
-}
-EXPORT_SYMBOL(iwl_legacy_mac_change_interface);
-
-/*
- * On every watchdog tick we check (latest) time stamp. If it does not
- * change during timeout period and queue is not empty we reset firmware.
- */
-static int iwl_legacy_check_stuck_queue(struct iwl_priv *priv, int cnt)
-{
-        struct iwl_tx_queue *txq = &priv->txq[cnt];
-        struct iwl_queue *q = &txq->q;
-        unsigned long timeout;
-        int ret;
-
-        if (q->read_ptr == q->write_ptr) {
-                txq->time_stamp = jiffies;
-                return 0;
-        }
-
-        timeout = txq->time_stamp +
-                  msecs_to_jiffies(priv->cfg->base_params->wd_timeout);
-
-        if (time_after(jiffies, timeout)) {
-                IWL_ERR(priv, "Queue %d stuck for %u ms.\n",
-                                q->id, priv->cfg->base_params->wd_timeout);
-                ret = iwl_legacy_force_reset(priv, false);
-                return (ret == -EAGAIN) ? 0 : 1;
-        }
-
-        return 0;
-}
-
-/*
- * Making watchdog tick be a quarter of timeout assure we will
- * discover the queue hung between timeout and 1.25*timeout
- */
-#define IWL_WD_TICK(timeout) ((timeout) / 4)
-
-/*
- * Watchdog timer callback, we check each tx queue for stuck, if if hung
- * we reset the firmware. If everything is fine just rearm the timer.
- */
-void iwl_legacy_bg_watchdog(unsigned long data)
-{
-        struct iwl_priv *priv = (struct iwl_priv *)data;
-        int cnt;
-        unsigned long timeout;
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
-
-        timeout = priv->cfg->base_params->wd_timeout;
-        if (timeout == 0)
-                return;
-
-        /* monitor and check for stuck cmd queue */
-        if (iwl_legacy_check_stuck_queue(priv, priv->cmd_queue))
-                return;
-
-        /* monitor and check for other stuck queues */
-        if (iwl_legacy_is_any_associated(priv)) {
-                for (cnt = 0; cnt < priv->hw_params.max_txq_num; cnt++) {
-                        /* skip as we already checked the command queue */
-                        if (cnt == priv->cmd_queue)
-                                continue;
-                        if (iwl_legacy_check_stuck_queue(priv, cnt))
-                                return;
-                }
-        }
-
-        mod_timer(&priv->watchdog, jiffies +
-                  msecs_to_jiffies(IWL_WD_TICK(timeout)));
-}
-EXPORT_SYMBOL(iwl_legacy_bg_watchdog);
-
-void iwl_legacy_setup_watchdog(struct iwl_priv *priv)
-{
-        unsigned int timeout = priv->cfg->base_params->wd_timeout;
-
-        if (timeout)
-                mod_timer(&priv->watchdog,
-                          jiffies + msecs_to_jiffies(IWL_WD_TICK(timeout)));
-        else
-                del_timer(&priv->watchdog);
-}
-EXPORT_SYMBOL(iwl_legacy_setup_watchdog);
-
-/*
- * extended beacon time format
- * time in usec will be changed into a 32-bit value in extended:internal format
- * the extended part is the beacon counts
- * the internal part is the time in usec within one beacon interval
- */
-u32
-iwl_legacy_usecs_to_beacons(struct iwl_priv *priv,
-                                        u32 usec, u32 beacon_interval)
-{
-        u32 quot;
-        u32 rem;
-        u32 interval = beacon_interval * TIME_UNIT;
-
-        if (!interval || !usec)
-                return 0;
-
-        quot = (usec / interval) &
-                (iwl_legacy_beacon_time_mask_high(priv,
-                priv->hw_params.beacon_time_tsf_bits) >>
-                priv->hw_params.beacon_time_tsf_bits);
-        rem = (usec % interval) & iwl_legacy_beacon_time_mask_low(priv,
-                                   priv->hw_params.beacon_time_tsf_bits);
-
-        return (quot << priv->hw_params.beacon_time_tsf_bits) + rem;
-}
-EXPORT_SYMBOL(iwl_legacy_usecs_to_beacons);
-
-/* base is usually what we get from ucode with each received frame,
- * the same as HW timer counter counting down
- */
-__le32 iwl_legacy_add_beacon_time(struct iwl_priv *priv, u32 base,
-                           u32 addon, u32 beacon_interval)
-{
-        u32 base_low = base & iwl_legacy_beacon_time_mask_low(priv,
-                                        priv->hw_params.beacon_time_tsf_bits);
-        u32 addon_low = addon & iwl_legacy_beacon_time_mask_low(priv,
-                                        priv->hw_params.beacon_time_tsf_bits);
-        u32 interval = beacon_interval * TIME_UNIT;
-        u32 res = (base & iwl_legacy_beacon_time_mask_high(priv,
-                                priv->hw_params.beacon_time_tsf_bits)) +
-                                (addon & iwl_legacy_beacon_time_mask_high(priv,
-                                priv->hw_params.beacon_time_tsf_bits));
-
-        if (base_low > addon_low)
-                res += base_low - addon_low;
-        else if (base_low < addon_low) {
-                res += interval + base_low - addon_low;
-                res += (1 << priv->hw_params.beacon_time_tsf_bits);
-        } else
-                res += (1 << priv->hw_params.beacon_time_tsf_bits);
-
-        return cpu_to_le32(res);
-}
-EXPORT_SYMBOL(iwl_legacy_add_beacon_time);
-
-#ifdef CONFIG_PM
-
-int iwl_legacy_pci_suspend(struct device *device)
-{
-        struct pci_dev *pdev = to_pci_dev(device);
-        struct iwl_priv *priv = pci_get_drvdata(pdev);
-
-        /*
-         * This function is called when system goes into suspend state
-         * mac80211 will call iwl_mac_stop() from the mac80211 suspend function
-         * first but since iwl_mac_stop() has no knowledge of who the caller is,
-         * it will not call apm_ops.stop() to stop the DMA operation.
-         * Calling apm_ops.stop here to make sure we stop the DMA.
-         */
-        iwl_legacy_apm_stop(priv);
-
-        return 0;
-}
-EXPORT_SYMBOL(iwl_legacy_pci_suspend);
-
-int iwl_legacy_pci_resume(struct device *device)
-{
-        struct pci_dev *pdev = to_pci_dev(device);
-        struct iwl_priv *priv = pci_get_drvdata(pdev);
-        bool hw_rfkill = false;
-
-        /*
-         * We disable the RETRY_TIMEOUT register (0x41) to keep
-         * PCI Tx retries from interfering with C3 CPU state.
-         */
-        pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);
-
-        iwl_legacy_enable_interrupts(priv);
-
-        if (!(iwl_read32(priv, CSR_GP_CNTRL) &
-                                CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW))
-                hw_rfkill = true;
-
-        if (hw_rfkill)
-                set_bit(STATUS_RF_KILL_HW, &priv->status);
-        else
-                clear_bit(STATUS_RF_KILL_HW, &priv->status);
-
-        wiphy_rfkill_set_hw_state(priv->hw->wiphy, hw_rfkill);
-
-        return 0;
-}
-EXPORT_SYMBOL(iwl_legacy_pci_resume);
-
-const struct dev_pm_ops iwl_legacy_pm_ops = {
-        .suspend = iwl_legacy_pci_suspend,
-        .resume = iwl_legacy_pci_resume,
-        .freeze = iwl_legacy_pci_suspend,
-        .thaw = iwl_legacy_pci_resume,
-        .poweroff = iwl_legacy_pci_suspend,
-        .restore = iwl_legacy_pci_resume,
-};
-EXPORT_SYMBOL(iwl_legacy_pm_ops);
-
-#endif /* CONFIG_PM */
-
-static void
-iwl_legacy_update_qos(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
-{
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
-
-        if (!ctx->is_active)
-                return;
-
-        ctx->qos_data.def_qos_parm.qos_flags = 0;
-
-        if (ctx->qos_data.qos_active)
-                ctx->qos_data.def_qos_parm.qos_flags |=
-                        QOS_PARAM_FLG_UPDATE_EDCA_MSK;
-
-        if (ctx->ht.enabled)
-                ctx->qos_data.def_qos_parm.qos_flags |= QOS_PARAM_FLG_TGN_MSK;
-
-        IWL_DEBUG_QOS(priv, "send QoS cmd with Qos active=%d FLAGS=0x%X\n",
-                      ctx->qos_data.qos_active,
-                      ctx->qos_data.def_qos_parm.qos_flags);
-
-        iwl_legacy_send_cmd_pdu_async(priv, ctx->qos_cmd,
-                               sizeof(struct iwl_qosparam_cmd),
-                               &ctx->qos_data.def_qos_parm, NULL);
-}
-
-/**
- * iwl_legacy_mac_config - mac80211 config callback
- */
-int iwl_legacy_mac_config(struct ieee80211_hw *hw, u32 changed)
-{
-        struct iwl_priv *priv = hw->priv;
-        const struct iwl_channel_info *ch_info;
-        struct ieee80211_conf *conf = &hw->conf;
-        struct ieee80211_channel *channel = conf->channel;
-        struct iwl_ht_config *ht_conf = &priv->current_ht_config;
-        struct iwl_rxon_context *ctx;
-        unsigned long flags = 0;
-        int ret = 0;
-        u16 ch;
-        int scan_active = 0;
-        bool ht_changed[NUM_IWL_RXON_CTX] = {};
-
-        if (WARN_ON(!priv->cfg->ops->legacy))
-                return -EOPNOTSUPP;
-
-        mutex_lock(&priv->mutex);
-
-        IWL_DEBUG_MAC80211(priv, "enter to channel %d changed 0x%X\n",
-                                        channel->hw_value, changed);
-
-        if (unlikely(test_bit(STATUS_SCANNING, &priv->status))) {
-                scan_active = 1;
-                IWL_DEBUG_MAC80211(priv, "scan active\n");
-        }
-
-        if (changed & (IEEE80211_CONF_CHANGE_SMPS |
-                       IEEE80211_CONF_CHANGE_CHANNEL)) {
-                /* mac80211 uses static for non-HT which is what we want */
-                priv->current_ht_config.smps = conf->smps_mode;
-
-                /*
-                 * Recalculate chain counts.
-                 *
-                 * If monitor mode is enabled then mac80211 will
-                 * set up the SM PS mode to OFF if an HT channel is
-                 * configured.
-                 */
-                if (priv->cfg->ops->hcmd->set_rxon_chain)
-                        for_each_context(priv, ctx)
-                                priv->cfg->ops->hcmd->set_rxon_chain(priv, ctx);
-        }
-
-        /* during scanning mac80211 will delay channel setting until
-         * scan finish with changed = 0
-         */
-        if (!changed || (changed & IEEE80211_CONF_CHANGE_CHANNEL)) {
-                if (scan_active)
-                        goto set_ch_out;
-
-                ch = channel->hw_value;
-                ch_info = iwl_legacy_get_channel_info(priv, channel->band, ch);
-                if (!iwl_legacy_is_channel_valid(ch_info)) {
-                        IWL_DEBUG_MAC80211(priv, "leave - invalid channel\n");
-                        ret = -EINVAL;
-                        goto set_ch_out;
-                }
-
-                if (priv->iw_mode == NL80211_IFTYPE_ADHOC &&
-                    !iwl_legacy_is_channel_ibss(ch_info)) {
-                        IWL_DEBUG_MAC80211(priv, "leave - not IBSS channel\n");
-                        ret = -EINVAL;
-                        goto set_ch_out;
-                }
-
-                spin_lock_irqsave(&priv->lock, flags);
-
-                for_each_context(priv, ctx) {
-                        /* Configure HT40 channels */
-                        if (ctx->ht.enabled != conf_is_ht(conf)) {
-                                ctx->ht.enabled = conf_is_ht(conf);
-                                ht_changed[ctx->ctxid] = true;
-                        }
-                        if (ctx->ht.enabled) {
-                                if (conf_is_ht40_minus(conf)) {
-                                        ctx->ht.extension_chan_offset =
-                                        IEEE80211_HT_PARAM_CHA_SEC_BELOW;
-                                        ctx->ht.is_40mhz = true;
-                                } else if (conf_is_ht40_plus(conf)) {
-                                        ctx->ht.extension_chan_offset =
-                                        IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
-                                        ctx->ht.is_40mhz = true;
-                                } else {
-                                        ctx->ht.extension_chan_offset =
-                                        IEEE80211_HT_PARAM_CHA_SEC_NONE;
-                                        ctx->ht.is_40mhz = false;
-                                }
-                        } else
-                                ctx->ht.is_40mhz = false;
-
-                        /*
-                         * Default to no protection. Protection mode will
-                         * later be set from BSS config in iwl_ht_conf
-                         */
-                        ctx->ht.protection =
-                                        IEEE80211_HT_OP_MODE_PROTECTION_NONE;
-
-                        /* 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(ctx->staging.channel) != ch))
-                                ctx->staging.flags = 0;
-
-                        iwl_legacy_set_rxon_channel(priv, channel, ctx);
-                        iwl_legacy_set_rxon_ht(priv, ht_conf);
-
-                        iwl_legacy_set_flags_for_band(priv, ctx, channel->band,
-                                               ctx->vif);
-                }
-
-                spin_unlock_irqrestore(&priv->lock, flags);
-
-                if (priv->cfg->ops->legacy->update_bcast_stations)
-                        ret =
-                        priv->cfg->ops->legacy->update_bcast_stations(priv);
-
- set_ch_out:
-                /* The list of supported rates and rate mask can be different
-                 * for each band; since the band may have changed, reset
-                 * the rate mask to what mac80211 lists */
-                iwl_legacy_set_rate(priv);
-        }
-
-        if (changed & (IEEE80211_CONF_CHANGE_PS |
-                        IEEE80211_CONF_CHANGE_IDLE)) {
-                ret = iwl_legacy_power_update_mode(priv, false);
-                if (ret)
-                        IWL_DEBUG_MAC80211(priv, "Error setting sleep level\n");
-        }
-
-        if (changed & IEEE80211_CONF_CHANGE_POWER) {
-                IWL_DEBUG_MAC80211(priv, "TX Power old=%d new=%d\n",
-                        priv->tx_power_user_lmt, conf->power_level);
-
-                iwl_legacy_set_tx_power(priv, conf->power_level, false);
-        }
-
-        if (!iwl_legacy_is_ready(priv)) {
-                IWL_DEBUG_MAC80211(priv, "leave - not ready\n");
-                goto out;
-        }
-
-        if (scan_active)
-                goto out;
-
-        for_each_context(priv, ctx) {
-                if (memcmp(&ctx->active, &ctx->staging, sizeof(ctx->staging)))
-                        iwl_legacy_commit_rxon(priv, ctx);
-                else
-                        IWL_DEBUG_INFO(priv,
-                                "Not re-sending same RXON configuration.\n");
-                if (ht_changed[ctx->ctxid])
-                        iwl_legacy_update_qos(priv, ctx);
-        }
-
-out:
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-        mutex_unlock(&priv->mutex);
-        return ret;
-}
-EXPORT_SYMBOL(iwl_legacy_mac_config);
-
-void iwl_legacy_mac_reset_tsf(struct ieee80211_hw *hw,
-                              struct ieee80211_vif *vif)
-{
-        struct iwl_priv *priv = hw->priv;
-        unsigned long flags;
-        /* IBSS can only be the IWL_RXON_CTX_BSS context */
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-        if (WARN_ON(!priv->cfg->ops->legacy))
-                return;
-
-        mutex_lock(&priv->mutex);
-        IWL_DEBUG_MAC80211(priv, "enter\n");
-
-        spin_lock_irqsave(&priv->lock, flags);
-        memset(&priv->current_ht_config, 0, sizeof(struct iwl_ht_config));
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        /* new association get rid of ibss beacon skb */
-        if (priv->beacon_skb)
-                dev_kfree_skb(priv->beacon_skb);
-
-        priv->beacon_skb = NULL;
-
-        priv->timestamp = 0;
-
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        iwl_legacy_scan_cancel_timeout(priv, 100);
-        if (!iwl_legacy_is_ready_rf(priv)) {
-                IWL_DEBUG_MAC80211(priv, "leave - not ready\n");
-                mutex_unlock(&priv->mutex);
-                return;
-        }
-
-        /* we are restarting association process
-         * clear RXON_FILTER_ASSOC_MSK bit
-         */
-        ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
-        iwl_legacy_commit_rxon(priv, ctx);
-
-        iwl_legacy_set_rate(priv);
-
-        mutex_unlock(&priv->mutex);
-
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-}
-EXPORT_SYMBOL(iwl_legacy_mac_reset_tsf);
-
-static void iwl_legacy_ht_conf(struct iwl_priv *priv,
-                        struct ieee80211_vif *vif)
-{
-        struct iwl_ht_config *ht_conf = &priv->current_ht_config;
-        struct ieee80211_sta *sta;
-        struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
-        struct iwl_rxon_context *ctx = iwl_legacy_rxon_ctx_from_vif(vif);
-
-        IWL_DEBUG_ASSOC(priv, "enter:\n");
-
-        if (!ctx->ht.enabled)
-                return;
-
-        ctx->ht.protection =
-                bss_conf->ht_operation_mode & IEEE80211_HT_OP_MODE_PROTECTION;
-        ctx->ht.non_gf_sta_present =
-                !!(bss_conf->ht_operation_mode &
-                                IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);
-
-        ht_conf->single_chain_sufficient = false;
-
-        switch (vif->type) {
-        case NL80211_IFTYPE_STATION:
-                rcu_read_lock();
-                sta = ieee80211_find_sta(vif, bss_conf->bssid);
-                if (sta) {
-                        struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
-                        int maxstreams;
-
-                        maxstreams = (ht_cap->mcs.tx_params &
-                              IEEE80211_HT_MCS_TX_MAX_STREAMS_MASK)
-                                >> IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT;
-                        maxstreams += 1;
-
-                        if ((ht_cap->mcs.rx_mask[1] == 0) &&
-                            (ht_cap->mcs.rx_mask[2] == 0))
-                                ht_conf->single_chain_sufficient = true;
-                        if (maxstreams <= 1)
-                                ht_conf->single_chain_sufficient = true;
-                } else {
-                        /*
-                         * If at all, this can only happen through a race
-                         * when the AP disconnects us while we're still
-                         * setting up the connection, in that case mac80211
-                         * will soon tell us about that.
-                         */
-                        ht_conf->single_chain_sufficient = true;
-                }
-                rcu_read_unlock();
-                break;
-        case NL80211_IFTYPE_ADHOC:
-                ht_conf->single_chain_sufficient = true;
-                break;
-        default:
-                break;
-        }
-
-        IWL_DEBUG_ASSOC(priv, "leave\n");
-}
-
-static inline void iwl_legacy_set_no_assoc(struct iwl_priv *priv,
-                                    struct ieee80211_vif *vif)
-{
-        struct iwl_rxon_context *ctx = iwl_legacy_rxon_ctx_from_vif(vif);
-
-        /*
-         * inform the ucode that there is no longer an
-         * association and that no more packets should be
-         * sent
-         */
-        ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
-        ctx->staging.assoc_id = 0;
-        iwl_legacy_commit_rxon(priv, ctx);
-}
-
-static void iwl_legacy_beacon_update(struct ieee80211_hw *hw,
-                                  struct ieee80211_vif *vif)
-{
-        struct iwl_priv *priv = hw->priv;
-        unsigned long flags;
-        __le64 timestamp;
-        struct sk_buff *skb = ieee80211_beacon_get(hw, vif);
-
-        if (!skb)
-                return;
-
-        IWL_DEBUG_MAC80211(priv, "enter\n");
-
-        lockdep_assert_held(&priv->mutex);
-
-        if (!priv->beacon_ctx) {
-                IWL_ERR(priv, "update beacon but no beacon context!\n");
-                dev_kfree_skb(skb);
-                return;
-        }
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        if (priv->beacon_skb)
-                dev_kfree_skb(priv->beacon_skb);
-
-        priv->beacon_skb = skb;
-
-        timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;
-        priv->timestamp = le64_to_cpu(timestamp);
-
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        if (!iwl_legacy_is_ready_rf(priv)) {
-                IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n");
-                return;
-        }
-
-        priv->cfg->ops->legacy->post_associate(priv);
-}
-
-void iwl_legacy_mac_bss_info_changed(struct ieee80211_hw *hw,
-                                     struct ieee80211_vif *vif,
-                                     struct ieee80211_bss_conf *bss_conf,
-                                     u32 changes)
-{
-        struct iwl_priv *priv = hw->priv;
-        struct iwl_rxon_context *ctx = iwl_legacy_rxon_ctx_from_vif(vif);
-        int ret;
-
-        if (WARN_ON(!priv->cfg->ops->legacy))
-                return;
-
-        IWL_DEBUG_MAC80211(priv, "changes = 0x%X\n", changes);
-
-        mutex_lock(&priv->mutex);
-
-        if (!iwl_legacy_is_alive(priv)) {
-                mutex_unlock(&priv->mutex);
-                return;
-        }
-
-        if (changes & BSS_CHANGED_QOS) {
-                unsigned long flags;
-
-                spin_lock_irqsave(&priv->lock, flags);
-                ctx->qos_data.qos_active = bss_conf->qos;
-                iwl_legacy_update_qos(priv, ctx);
-                spin_unlock_irqrestore(&priv->lock, flags);
-        }
-
-        if (changes & BSS_CHANGED_BEACON_ENABLED) {
-                /*
-                 * the add_interface code must make sure we only ever
-                 * have a single interface that could be beaconing at
-                 * any time.
-                 */
-                if (vif->bss_conf.enable_beacon)
-                        priv->beacon_ctx = ctx;
-                else
-                        priv->beacon_ctx = NULL;
-        }
-
-        if (changes & BSS_CHANGED_BSSID) {
-                IWL_DEBUG_MAC80211(priv, "BSSID %pM\n", bss_conf->bssid);
-
-                /*
-                 * If there is currently a HW scan going on in the
-                 * background then we need to cancel it else the RXON
-                 * below/in post_associate will fail.
-                 */
-                if (iwl_legacy_scan_cancel_timeout(priv, 100)) {
-                        IWL_WARN(priv,
-                                "Aborted scan still in progress after 100ms\n");
-                        IWL_DEBUG_MAC80211(priv,
-                                "leaving - scan abort failed.\n");
-                        mutex_unlock(&priv->mutex);
-                        return;
-                }
-
-                /* mac80211 only sets assoc when in STATION mode */
-                if (vif->type == NL80211_IFTYPE_ADHOC || bss_conf->assoc) {
-                        memcpy(ctx->staging.bssid_addr,
-                               bss_conf->bssid, ETH_ALEN);
-
-                        /* currently needed in a few places */
-                        memcpy(priv->bssid, bss_conf->bssid, ETH_ALEN);
-                } else {
-                        ctx->staging.filter_flags &=
-                                ~RXON_FILTER_ASSOC_MSK;
-                }
-
-        }
-
-        /*
-         * This needs to be after setting the BSSID in case
-         * mac80211 decides to do both changes at once because
-         * it will invoke post_associate.
-         */
-        if (vif->type == NL80211_IFTYPE_ADHOC && changes & BSS_CHANGED_BEACON)
-                iwl_legacy_beacon_update(hw, vif);
-
-        if (changes & BSS_CHANGED_ERP_PREAMBLE) {
-                IWL_DEBUG_MAC80211(priv, "ERP_PREAMBLE %d\n",
-                                   bss_conf->use_short_preamble);
-                if (bss_conf->use_short_preamble)
-                        ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
-                else
-                        ctx->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
-        }
-
-        if (changes & BSS_CHANGED_ERP_CTS_PROT) {
-                IWL_DEBUG_MAC80211(priv,
-                        "ERP_CTS %d\n", bss_conf->use_cts_prot);
-                if (bss_conf->use_cts_prot &&
-                        (priv->band != IEEE80211_BAND_5GHZ))
-                        ctx->staging.flags |= RXON_FLG_TGG_PROTECT_MSK;
-                else
-                        ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
-                if (bss_conf->use_cts_prot)
-                        ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
-                else
-                        ctx->staging.flags &= ~RXON_FLG_SELF_CTS_EN;
-        }
-
-        if (changes & BSS_CHANGED_BASIC_RATES) {
-                /* XXX use this information
-                 *
-                 * To do that, remove code from iwl_legacy_set_rate() and put something
-                 * like this here:
-                 *
-                if (A-band)
-                        ctx->staging.ofdm_basic_rates =
-                                bss_conf->basic_rates;
-                else
-                        ctx->staging.ofdm_basic_rates =
-                                bss_conf->basic_rates >> 4;
-                        ctx->staging.cck_basic_rates =
-                                bss_conf->basic_rates & 0xF;
-                 */
-        }
-
-        if (changes & BSS_CHANGED_HT) {
-                iwl_legacy_ht_conf(priv, vif);
-
-                if (priv->cfg->ops->hcmd->set_rxon_chain)
-                        priv->cfg->ops->hcmd->set_rxon_chain(priv, ctx);
-        }
-
-        if (changes & BSS_CHANGED_ASSOC) {
-                IWL_DEBUG_MAC80211(priv, "ASSOC %d\n", bss_conf->assoc);
-                if (bss_conf->assoc) {
-                        priv->timestamp = bss_conf->timestamp;
-
-                        if (!iwl_legacy_is_rfkill(priv))
-                                priv->cfg->ops->legacy->post_associate(priv);
-                } else
-                        iwl_legacy_set_no_assoc(priv, vif);
-        }
-
-        if (changes && iwl_legacy_is_associated_ctx(ctx) && bss_conf->aid) {
-                IWL_DEBUG_MAC80211(priv, "Changes (%#x) while associated\n",
-                                   changes);
-                ret = iwl_legacy_send_rxon_assoc(priv, ctx);
-                if (!ret) {
-                        /* Sync active_rxon with latest change. */
-                        memcpy((void *)&ctx->active,
-                                &ctx->staging,
-                                sizeof(struct iwl_legacy_rxon_cmd));
-                }
-        }
-
-        if (changes & BSS_CHANGED_BEACON_ENABLED) {
-                if (vif->bss_conf.enable_beacon) {
-                        memcpy(ctx->staging.bssid_addr,
-                               bss_conf->bssid, ETH_ALEN);
-                        memcpy(priv->bssid, bss_conf->bssid, ETH_ALEN);
-                        priv->cfg->ops->legacy->config_ap(priv);
-                } else
-                        iwl_legacy_set_no_assoc(priv, vif);
-        }
-
-        if (changes & BSS_CHANGED_IBSS) {
-                ret = priv->cfg->ops->legacy->manage_ibss_station(priv, vif,
-                                                        bss_conf->ibss_joined);
-                if (ret)
-                        IWL_ERR(priv, "failed to %s IBSS station %pM\n",
-                                bss_conf->ibss_joined ? "add" : "remove",
-                                bss_conf->bssid);
-        }
-
-        mutex_unlock(&priv->mutex);
-
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-}
-EXPORT_SYMBOL(iwl_legacy_mac_bss_info_changed);
-
-irqreturn_t iwl_legacy_isr(int irq, void *data)
-{
-        struct iwl_priv *priv = data;
-        u32 inta, inta_mask;
-        u32 inta_fh;
-        unsigned long flags;
-        if (!priv)
-                return IRQ_NONE;
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        /* Disable (but don't clear!) interrupts here to avoid
-         *    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 = iwl_read32(priv, CSR_INT_MASK);  /* just for debug */
-        iwl_write32(priv, CSR_INT_MASK, 0x00000000);
-
-        /* Discover which interrupts are active/pending */
-        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,
-         * or due to sporadic interrupts thrown from our NIC. */
-        if (!inta && !inta_fh) {
-                IWL_DEBUG_ISR(priv,
-                        "Ignore interrupt, inta == 0, inta_fh == 0\n");
-                goto none;
-        }
-
-        if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) {
-                /* Hardware disappeared. It might have already raised
-                 * an interrupt */
-                IWL_WARN(priv, "HARDWARE GONE?? INTA == 0x%08x\n", inta);
-                goto unplugged;
-        }
-
-        IWL_DEBUG_ISR(priv, "ISR inta 0x%08x, enabled 0x%08x, fh 0x%08x\n",
-                      inta, inta_mask, inta_fh);
-
-        inta &= ~CSR_INT_BIT_SCD;
-
-        /* iwl_irq_tasklet() will service interrupts and re-enable them */
-        if (likely(inta || inta_fh))
-                tasklet_schedule(&priv->irq_tasklet);
-
-unplugged:
-        spin_unlock_irqrestore(&priv->lock, flags);
-        return IRQ_HANDLED;
-
-none:
-        /* re-enable interrupts here since we don't have anything to service. */
-        /* only Re-enable if disabled by irq */
-        if (test_bit(STATUS_INT_ENABLED, &priv->status))
-                iwl_legacy_enable_interrupts(priv);
-        spin_unlock_irqrestore(&priv->lock, flags);
-        return IRQ_NONE;
-}
-EXPORT_SYMBOL(iwl_legacy_isr);
-
-/*
- *  iwl_legacy_tx_cmd_protection: Set rts/cts. 3945 and 4965 only share this
- *  function.
- */
-void iwl_legacy_tx_cmd_protection(struct iwl_priv *priv,
-                               struct ieee80211_tx_info *info,
-                               __le16 fc, __le32 *tx_flags)
-{
-        if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) {
-                *tx_flags |= TX_CMD_FLG_RTS_MSK;
-                *tx_flags &= ~TX_CMD_FLG_CTS_MSK;
-                *tx_flags |= TX_CMD_FLG_FULL_TXOP_PROT_MSK;
-
-                if (!ieee80211_is_mgmt(fc))
-                        return;
-
-                switch (fc & cpu_to_le16(IEEE80211_FCTL_STYPE)) {
-                case cpu_to_le16(IEEE80211_STYPE_AUTH):
-                case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
-                case cpu_to_le16(IEEE80211_STYPE_ASSOC_REQ):
-                case cpu_to_le16(IEEE80211_STYPE_REASSOC_REQ):
-                        *tx_flags &= ~TX_CMD_FLG_RTS_MSK;
-                        *tx_flags |= TX_CMD_FLG_CTS_MSK;
-                        break;
-                }
-        } else if (info->control.rates[0].flags &
-                   IEEE80211_TX_RC_USE_CTS_PROTECT) {
-                *tx_flags &= ~TX_CMD_FLG_RTS_MSK;
-                *tx_flags |= TX_CMD_FLG_CTS_MSK;
-                *tx_flags |= TX_CMD_FLG_FULL_TXOP_PROT_MSK;
-        }
-}
-EXPORT_SYMBOL(iwl_legacy_tx_cmd_protection);
diff --git a/drivers/net/wireless/iwlegacy/iwl-core.h b/drivers/net/wireless/iwlegacy/iwl-core.h
deleted file mode 100644
index d1271fe07d4b..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-core.h
+++ /dev/null
@@ -1,636 +0,0 @@
-/******************************************************************************
- *
- * 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 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2011 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_legacy_core_h__
-#define __iwl_legacy_core_h__
-
-/************************
- * forward declarations *
- ************************/
-struct iwl_host_cmd;
-struct iwl_cmd;
-
-
-#define IWLWIFI_VERSION "in-tree:"
-#define DRV_COPYRIGHT   "Copyright(c) 2003-2011 Intel Corporation"
-#define DRV_AUTHOR     "<ilw@linux.intel.com>"
-
-#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 TIME_UNIT               1024
-
-#define IWL_SKU_G       0x1
-#define IWL_SKU_A       0x2
-#define IWL_SKU_N       0x8
-
-#define IWL_CMD(x) case x: return #x
-
-struct iwl_hcmd_ops {
-        int (*rxon_assoc)(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
-        int (*commit_rxon)(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
-        void (*set_rxon_chain)(struct iwl_priv *priv,
-                               struct iwl_rxon_context *ctx);
-};
-
-struct iwl_hcmd_utils_ops {
-        u16 (*get_hcmd_size)(u8 cmd_id, u16 len);
-        u16 (*build_addsta_hcmd)(const struct iwl_legacy_addsta_cmd *cmd,
-                                                                u8 *data);
-        int (*request_scan)(struct iwl_priv *priv, struct ieee80211_vif *vif);
-        void (*post_scan)(struct iwl_priv *priv);
-};
-
-struct iwl_apm_ops {
-        int (*init)(struct iwl_priv *priv);
-        void (*config)(struct iwl_priv *priv);
-};
-
-struct iwl_debugfs_ops {
-        ssize_t (*rx_stats_read)(struct file *file, char __user *user_buf,
-                                 size_t count, loff_t *ppos);
-        ssize_t (*tx_stats_read)(struct file *file, char __user *user_buf,
-                                 size_t count, loff_t *ppos);
-        ssize_t (*general_stats_read)(struct file *file, char __user *user_buf,
-                                      size_t count, loff_t *ppos);
-};
-
-struct iwl_temp_ops {
-        void (*temperature)(struct iwl_priv *priv);
-};
-
-struct iwl_lib_ops {
-        /* set hw dependent parameters */
-        int (*set_hw_params)(struct iwl_priv *priv);
-        /* Handling TX */
-        void (*txq_update_byte_cnt_tbl)(struct iwl_priv *priv,
-                                        struct iwl_tx_queue *txq,
-                                        u16 byte_cnt);
-        int (*txq_attach_buf_to_tfd)(struct iwl_priv *priv,
-                                     struct iwl_tx_queue *txq,
-                                     dma_addr_t addr,
-                                     u16 len, u8 reset, u8 pad);
-        void (*txq_free_tfd)(struct iwl_priv *priv,
-                             struct iwl_tx_queue *txq);
-        int (*txq_init)(struct iwl_priv *priv,
-                        struct iwl_tx_queue *txq);
-        /* setup Rx handler */
-        void (*rx_handler_setup)(struct iwl_priv *priv);
-        /* alive notification after init uCode load */
-        void (*init_alive_start)(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);
-
-        void (*dump_nic_error_log)(struct iwl_priv *priv);
-        int (*dump_fh)(struct iwl_priv *priv, char **buf, bool display);
-        int (*set_channel_switch)(struct iwl_priv *priv,
-                                  struct ieee80211_channel_switch *ch_switch);
-        /* power management */
-        struct iwl_apm_ops apm_ops;
-
-        /* power */
-        int (*send_tx_power) (struct iwl_priv *priv);
-        void (*update_chain_flags)(struct iwl_priv *priv);
-
-        /* eeprom operations (as defined in iwl-eeprom.h) */
-        struct iwl_eeprom_ops eeprom_ops;
-
-        /* temperature */
-        struct iwl_temp_ops temp_ops;
-
-        struct iwl_debugfs_ops debugfs_ops;
-
-};
-
-struct iwl_led_ops {
-        int (*cmd)(struct iwl_priv *priv, struct iwl_led_cmd *led_cmd);
-};
-
-struct iwl_legacy_ops {
-        void (*post_associate)(struct iwl_priv *priv);
-        void (*config_ap)(struct iwl_priv *priv);
-        /* station management */
-        int (*update_bcast_stations)(struct iwl_priv *priv);
-        int (*manage_ibss_station)(struct iwl_priv *priv,
-                                   struct ieee80211_vif *vif, bool add);
-};
-
-struct iwl_ops {
-        const struct iwl_lib_ops *lib;
-        const struct iwl_hcmd_ops *hcmd;
-        const struct iwl_hcmd_utils_ops *utils;
-        const struct iwl_led_ops *led;
-        const struct iwl_nic_ops *nic;
-        const struct iwl_legacy_ops *legacy;
-        const struct ieee80211_ops *ieee80211_ops;
-};
-
-struct iwl_mod_params {
-        int sw_crypto;          /* def: 0 = using hardware encryption */
-        int disable_hw_scan;    /* def: 0 = use h/w scan */
-        int num_of_queues;      /* def: HW dependent */
-        int disable_11n;        /* def: 0 = 11n capabilities enabled */
-        int amsdu_size_8K;      /* def: 1 = enable 8K amsdu size */
-        int antenna;            /* def: 0 = both antennas (use diversity) */
-        int restart_fw;         /* def: 1 = restart firmware */
-};
-
-/*
- * @led_compensation: compensate on the led on/off time per HW according
- *      to the deviation to achieve the desired led frequency.
- *      The detail algorithm is described in iwl-led.c
- * @chain_noise_num_beacons: number of beacons used to compute chain noise
- * @wd_timeout: TX queues watchdog timeout
- * @temperature_kelvin: temperature report by uCode in kelvin
- * @ucode_tracing: support ucode continuous tracing
- * @sensitivity_calib_by_driver: driver has the capability to perform
- *      sensitivity calibration operation
- * @chain_noise_calib_by_driver: driver has the capability to perform
- *      chain noise calibration operation
- */
-struct iwl_base_params {
-        int eeprom_size;
-        int num_of_queues;      /* def: HW dependent */
-        int num_of_ampdu_queues;/* def: HW dependent */
-        /* for iwl_legacy_apm_init() */
-        u32 pll_cfg_val;
-        bool set_l0s;
-        bool use_bsm;
-
-        u16 led_compensation;
-        int chain_noise_num_beacons;
-        unsigned int wd_timeout;
-        bool temperature_kelvin;
-        const bool ucode_tracing;
-        const bool sensitivity_calib_by_driver;
-        const bool chain_noise_calib_by_driver;
-};
-
-/**
- * struct iwl_cfg
- * @fw_name_pre: Firmware filename prefix. The api version and extension
- *      (.ucode) will be added to filename before loading from disk. The
- *      filename is constructed as fw_name_pre<api>.ucode.
- * @ucode_api_max: Highest version of uCode API supported by driver.
- * @ucode_api_min: Lowest version of uCode API supported by driver.
- * @scan_antennas: available antenna for scan operation
- * @led_mode: 0=blinking, 1=On(RF On)/Off(RF Off)
- *
- * We enable the driver to be backward compatible wrt API version. The
- * driver specifies which APIs it supports (with @ucode_api_max being the
- * highest and @ucode_api_min the lowest). Firmware will only be loaded if
- * it has a supported API version. The firmware's API version will be
- * stored in @iwl_priv, enabling the driver to make runtime changes based
- * on firmware version used.
- *
- * For example,
- * if (IWL_UCODE_API(priv->ucode_ver) >= 2) {
- *      Driver interacts with Firmware API version >= 2.
- * } else {
- *      Driver interacts with Firmware API version 1.
- * }
- *
- * The ideal usage of this infrastructure is to treat a new ucode API
- * release as a new hardware revision. That is, through utilizing the
- * iwl_hcmd_utils_ops etc. we accommodate different command structures
- * and flows between hardware versions as well as their API
- * versions.
- *
- */
-struct iwl_cfg {
-        /* params specific to an individual device within a device family */
-        const char *name;
-        const char *fw_name_pre;
-        const unsigned int ucode_api_max;
-        const unsigned int ucode_api_min;
-        u8   valid_tx_ant;
-        u8   valid_rx_ant;
-        unsigned int sku;
-        u16  eeprom_ver;
-        u16  eeprom_calib_ver;
-        const struct iwl_ops *ops;
-        /* module based parameters which can be set from modprobe cmd */
-        const struct iwl_mod_params *mod_params;
-        /* params not likely to change within a device family */
-        struct iwl_base_params *base_params;
-        /* params likely to change within a device family */
-        u8 scan_rx_antennas[IEEE80211_NUM_BANDS];
-        enum iwl_led_mode led_mode;
-};
-
-/***************************
- *   L i b                 *
- ***************************/
-
-struct ieee80211_hw *iwl_legacy_alloc_all(struct iwl_cfg *cfg);
-int iwl_legacy_mac_conf_tx(struct ieee80211_hw *hw,
-                    struct ieee80211_vif *vif, u16 queue,
-                    const struct ieee80211_tx_queue_params *params);
-int iwl_legacy_mac_tx_last_beacon(struct ieee80211_hw *hw);
-void iwl_legacy_set_rxon_hwcrypto(struct iwl_priv *priv,
-                        struct iwl_rxon_context *ctx,
-                        int hw_decrypt);
-int iwl_legacy_check_rxon_cmd(struct iwl_priv *priv,
-                        struct iwl_rxon_context *ctx);
-int iwl_legacy_full_rxon_required(struct iwl_priv *priv,
-                        struct iwl_rxon_context *ctx);
-int iwl_legacy_set_rxon_channel(struct iwl_priv *priv,
-                        struct ieee80211_channel *ch,
-                        struct iwl_rxon_context *ctx);
-void iwl_legacy_set_flags_for_band(struct iwl_priv *priv,
-                            struct iwl_rxon_context *ctx,
-                            enum ieee80211_band band,
-                            struct ieee80211_vif *vif);
-u8 iwl_legacy_get_single_channel_number(struct iwl_priv *priv,
-                                  enum ieee80211_band band);
-void iwl_legacy_set_rxon_ht(struct iwl_priv *priv,
-                        struct iwl_ht_config *ht_conf);
-bool iwl_legacy_is_ht40_tx_allowed(struct iwl_priv *priv,
-                            struct iwl_rxon_context *ctx,
-                            struct ieee80211_sta_ht_cap *ht_cap);
-void iwl_legacy_connection_init_rx_config(struct iwl_priv *priv,
-                                   struct iwl_rxon_context *ctx);
-void iwl_legacy_set_rate(struct iwl_priv *priv);
-int iwl_legacy_set_decrypted_flag(struct iwl_priv *priv,
-                           struct ieee80211_hdr *hdr,
-                           u32 decrypt_res,
-                           struct ieee80211_rx_status *stats);
-void iwl_legacy_irq_handle_error(struct iwl_priv *priv);
-int iwl_legacy_mac_add_interface(struct ieee80211_hw *hw,
-                          struct ieee80211_vif *vif);
-void iwl_legacy_mac_remove_interface(struct ieee80211_hw *hw,
-                              struct ieee80211_vif *vif);
-int iwl_legacy_mac_change_interface(struct ieee80211_hw *hw,
-                             struct ieee80211_vif *vif,
-                             enum nl80211_iftype newtype, bool newp2p);
-int iwl_legacy_alloc_txq_mem(struct iwl_priv *priv);
-void iwl_legacy_txq_mem(struct iwl_priv *priv);
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
-int iwl_legacy_alloc_traffic_mem(struct iwl_priv *priv);
-void iwl_legacy_free_traffic_mem(struct iwl_priv *priv);
-void iwl_legacy_reset_traffic_log(struct iwl_priv *priv);
-void iwl_legacy_dbg_log_tx_data_frame(struct iwl_priv *priv,
-                                u16 length, struct ieee80211_hdr *header);
-void iwl_legacy_dbg_log_rx_data_frame(struct iwl_priv *priv,
-                                u16 length, struct ieee80211_hdr *header);
-const char *iwl_legacy_get_mgmt_string(int cmd);
-const char *iwl_legacy_get_ctrl_string(int cmd);
-void iwl_legacy_clear_traffic_stats(struct iwl_priv *priv);
-void iwl_legacy_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc,
-                      u16 len);
-#else
-static inline int iwl_legacy_alloc_traffic_mem(struct iwl_priv *priv)
-{
-        return 0;
-}
-static inline void iwl_legacy_free_traffic_mem(struct iwl_priv *priv)
-{
-}
-static inline void iwl_legacy_reset_traffic_log(struct iwl_priv *priv)
-{
-}
-static inline void iwl_legacy_dbg_log_tx_data_frame(struct iwl_priv *priv,
-                      u16 length, struct ieee80211_hdr *header)
-{
-}
-static inline void iwl_legacy_dbg_log_rx_data_frame(struct iwl_priv *priv,
-                      u16 length, struct ieee80211_hdr *header)
-{
-}
-static inline void iwl_legacy_update_stats(struct iwl_priv *priv, bool is_tx,
-                                    __le16 fc, u16 len)
-{
-}
-#endif
-/*****************************************************
- * RX handlers.
- * **************************************************/
-void iwl_legacy_rx_pm_sleep_notif(struct iwl_priv *priv,
-                           struct iwl_rx_mem_buffer *rxb);
-void iwl_legacy_rx_pm_debug_statistics_notif(struct iwl_priv *priv,
-                                      struct iwl_rx_mem_buffer *rxb);
-void iwl_legacy_rx_reply_error(struct iwl_priv *priv,
-                        struct iwl_rx_mem_buffer *rxb);
-
-/*****************************************************
-* RX
-******************************************************/
-void iwl_legacy_cmd_queue_unmap(struct iwl_priv *priv);
-void iwl_legacy_cmd_queue_free(struct iwl_priv *priv);
-int iwl_legacy_rx_queue_alloc(struct iwl_priv *priv);
-void iwl_legacy_rx_queue_update_write_ptr(struct iwl_priv *priv,
-                                  struct iwl_rx_queue *q);
-int iwl_legacy_rx_queue_space(const struct iwl_rx_queue *q);
-void iwl_legacy_tx_cmd_complete(struct iwl_priv *priv,
-                                struct iwl_rx_mem_buffer *rxb);
-/* Handlers */
-void iwl_legacy_rx_spectrum_measure_notif(struct iwl_priv *priv,
-                                          struct iwl_rx_mem_buffer *rxb);
-void iwl_legacy_recover_from_statistics(struct iwl_priv *priv,
-                                struct iwl_rx_packet *pkt);
-void iwl_legacy_chswitch_done(struct iwl_priv *priv, bool is_success);
-void iwl_legacy_rx_csa(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb);
-
-/* TX helpers */
-
-/*****************************************************
-* TX
-******************************************************/
-void iwl_legacy_txq_update_write_ptr(struct iwl_priv *priv,
-                                        struct iwl_tx_queue *txq);
-int iwl_legacy_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
-                      int slots_num, u32 txq_id);
-void iwl_legacy_tx_queue_reset(struct iwl_priv *priv,
-                        struct iwl_tx_queue *txq,
-                        int slots_num, u32 txq_id);
-void iwl_legacy_tx_queue_unmap(struct iwl_priv *priv, int txq_id);
-void iwl_legacy_tx_queue_free(struct iwl_priv *priv, int txq_id);
-void iwl_legacy_setup_watchdog(struct iwl_priv *priv);
-/*****************************************************
- * TX power
- ****************************************************/
-int iwl_legacy_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force);
-
-/*******************************************************************************
- * Rate
- ******************************************************************************/
-
-u8 iwl_legacy_get_lowest_plcp(struct iwl_priv *priv,
-                            struct iwl_rxon_context *ctx);
-
-/*******************************************************************************
- * Scanning
- ******************************************************************************/
-void iwl_legacy_init_scan_params(struct iwl_priv *priv);
-int iwl_legacy_scan_cancel(struct iwl_priv *priv);
-int iwl_legacy_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);
-void iwl_legacy_force_scan_end(struct iwl_priv *priv);
-int iwl_legacy_mac_hw_scan(struct ieee80211_hw *hw,
-                    struct ieee80211_vif *vif,
-                    struct cfg80211_scan_request *req);
-void iwl_legacy_internal_short_hw_scan(struct iwl_priv *priv);
-int iwl_legacy_force_reset(struct iwl_priv *priv, bool external);
-u16 iwl_legacy_fill_probe_req(struct iwl_priv *priv,
-                        struct ieee80211_mgmt *frame,
-                       const u8 *ta, const u8 *ie, int ie_len, int left);
-void iwl_legacy_setup_rx_scan_handlers(struct iwl_priv *priv);
-u16 iwl_legacy_get_active_dwell_time(struct iwl_priv *priv,
-                              enum ieee80211_band band,
-                              u8 n_probes);
-u16 iwl_legacy_get_passive_dwell_time(struct iwl_priv *priv,
-                               enum ieee80211_band band,
-                               struct ieee80211_vif *vif);
-void iwl_legacy_setup_scan_deferred_work(struct iwl_priv *priv);
-void iwl_legacy_cancel_scan_deferred_work(struct iwl_priv *priv);
-
-/* For faster active scanning, scan will move to the next channel if fewer than
- * PLCP_QUIET_THRESH packets are heard on this channel within
- * ACTIVE_QUIET_TIME after sending probe request.  This shortens the dwell
- * time if it's a quiet channel (nothing responded to our probe, and there's
- * no other traffic).
- * Disable "quiet" feature by setting PLCP_QUIET_THRESH to 0. */
-#define IWL_ACTIVE_QUIET_TIME       cpu_to_le16(10)  /* msec */
-#define IWL_PLCP_QUIET_THRESH       cpu_to_le16(1)  /* packets */
-
-#define IWL_SCAN_CHECK_WATCHDOG         (HZ * 7)
-
-/*****************************************************
- *   S e n d i n g     H o s t     C o m m a n d s   *
- *****************************************************/
-
-const char *iwl_legacy_get_cmd_string(u8 cmd);
-int __must_check iwl_legacy_send_cmd_sync(struct iwl_priv *priv,
-                                   struct iwl_host_cmd *cmd);
-int iwl_legacy_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd);
-int __must_check iwl_legacy_send_cmd_pdu(struct iwl_priv *priv, u8 id,
-                                  u16 len, const void *data);
-int iwl_legacy_send_cmd_pdu_async(struct iwl_priv *priv, u8 id, u16 len,
-                           const void *data,
-                           void (*callback)(struct iwl_priv *priv,
-                                            struct iwl_device_cmd *cmd,
-                                            struct iwl_rx_packet *pkt));
-
-int iwl_legacy_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd);
-
-
-/*****************************************************
- * PCI                                               *
- *****************************************************/
-
-static inline u16 iwl_legacy_pcie_link_ctl(struct iwl_priv *priv)
-{
-        int pos;
-        u16 pci_lnk_ctl;
-        pos = pci_pcie_cap(priv->pci_dev);
-        pci_read_config_word(priv->pci_dev, pos + PCI_EXP_LNKCTL, &pci_lnk_ctl);
-        return pci_lnk_ctl;
-}
-
-void iwl_legacy_bg_watchdog(unsigned long data);
-u32 iwl_legacy_usecs_to_beacons(struct iwl_priv *priv,
-                                        u32 usec, u32 beacon_interval);
-__le32 iwl_legacy_add_beacon_time(struct iwl_priv *priv, u32 base,
-                           u32 addon, u32 beacon_interval);
-
-#ifdef CONFIG_PM
-int iwl_legacy_pci_suspend(struct device *device);
-int iwl_legacy_pci_resume(struct device *device);
-extern const struct dev_pm_ops iwl_legacy_pm_ops;
-
-#define IWL_LEGACY_PM_OPS       (&iwl_legacy_pm_ops)
-
-#else /* !CONFIG_PM */
-
-#define IWL_LEGACY_PM_OPS       NULL
-
-#endif /* !CONFIG_PM */
-
-/*****************************************************
-*  Error Handling Debugging
-******************************************************/
-void iwl4965_dump_nic_error_log(struct iwl_priv *priv);
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-void iwl_legacy_print_rx_config_cmd(struct iwl_priv *priv,
-                             struct iwl_rxon_context *ctx);
-#else
-static inline void iwl_legacy_print_rx_config_cmd(struct iwl_priv *priv,
-                                           struct iwl_rxon_context *ctx)
-{
-}
-#endif
-
-void iwl_legacy_clear_isr_stats(struct iwl_priv *priv);
-
-/*****************************************************
-*  GEOS
-******************************************************/
-int iwl_legacy_init_geos(struct iwl_priv *priv);
-void iwl_legacy_free_geos(struct iwl_priv *priv);
-
-/*************** DRIVER STATUS FUNCTIONS   *****/
-
-#define STATUS_HCMD_ACTIVE      0       /* host command in progress */
-/* 1 is unused (used to be STATUS_HCMD_SYNC_ACTIVE) */
-#define STATUS_INT_ENABLED      2
-#define STATUS_RF_KILL_HW       3
-#define STATUS_CT_KILL          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_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_CHANNEL_SWITCH_PENDING 18
-
-static inline int iwl_legacy_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_legacy_is_alive(struct iwl_priv *priv)
-{
-        return test_bit(STATUS_ALIVE, &priv->status);
-}
-
-static inline int iwl_legacy_is_init(struct iwl_priv *priv)
-{
-        return test_bit(STATUS_INIT, &priv->status);
-}
-
-static inline int iwl_legacy_is_rfkill_hw(struct iwl_priv *priv)
-{
-        return test_bit(STATUS_RF_KILL_HW, &priv->status);
-}
-
-static inline int iwl_legacy_is_rfkill(struct iwl_priv *priv)
-{
-        return iwl_legacy_is_rfkill_hw(priv);
-}
-
-static inline int iwl_legacy_is_ctkill(struct iwl_priv *priv)
-{
-        return test_bit(STATUS_CT_KILL, &priv->status);
-}
-
-static inline int iwl_legacy_is_ready_rf(struct iwl_priv *priv)
-{
-
-        if (iwl_legacy_is_rfkill(priv))
-                return 0;
-
-        return iwl_legacy_is_ready(priv);
-}
-
-extern void iwl_legacy_send_bt_config(struct iwl_priv *priv);
-extern int iwl_legacy_send_statistics_request(struct iwl_priv *priv,
-                                       u8 flags, bool clear);
-void iwl_legacy_apm_stop(struct iwl_priv *priv);
-int iwl_legacy_apm_init(struct iwl_priv *priv);
-
-int iwl_legacy_send_rxon_timing(struct iwl_priv *priv,
-                                struct iwl_rxon_context *ctx);
-static inline int iwl_legacy_send_rxon_assoc(struct iwl_priv *priv,
-                                      struct iwl_rxon_context *ctx)
-{
-        return priv->cfg->ops->hcmd->rxon_assoc(priv, ctx);
-}
-static inline int iwl_legacy_commit_rxon(struct iwl_priv *priv,
-                                      struct iwl_rxon_context *ctx)
-{
-        return priv->cfg->ops->hcmd->commit_rxon(priv, ctx);
-}
-static inline const struct ieee80211_supported_band *iwl_get_hw_mode(
-                        struct iwl_priv *priv, enum ieee80211_band band)
-{
-        return priv->hw->wiphy->bands[band];
-}
-
-/* mac80211 handlers */
-int iwl_legacy_mac_config(struct ieee80211_hw *hw, u32 changed);
-void iwl_legacy_mac_reset_tsf(struct ieee80211_hw *hw,
-                              struct ieee80211_vif *vif);
-void iwl_legacy_mac_bss_info_changed(struct ieee80211_hw *hw,
-                                     struct ieee80211_vif *vif,
-                                     struct ieee80211_bss_conf *bss_conf,
-                                     u32 changes);
-void iwl_legacy_tx_cmd_protection(struct iwl_priv *priv,
-                                struct ieee80211_tx_info *info,
-                                __le16 fc, __le32 *tx_flags);
-
-irqreturn_t iwl_legacy_isr(int irq, void *data);
-
-#endif /* __iwl_legacy_core_h__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-debug.h b/drivers/net/wireless/iwlegacy/iwl-debug.h
deleted file mode 100644
index ae13112701bf..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-debug.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-
-#ifndef __iwl_legacy_debug_h__
-#define __iwl_legacy_debug_h__
-
-struct iwl_priv;
-extern u32 iwlegacy_debug_level;
-
-#define IWL_ERR(p, f, a...) dev_err(&((p)->pci_dev->dev), f, ## a)
-#define IWL_WARN(p, f, a...) dev_warn(&((p)->pci_dev->dev), f, ## a)
-#define IWL_INFO(p, f, a...) dev_info(&((p)->pci_dev->dev), f, ## a)
-#define IWL_CRIT(p, f, a...) dev_crit(&((p)->pci_dev->dev), f, ## a)
-
-#define iwl_print_hex_error(priv, p, len)                                \
-do {                                                                    \
-        print_hex_dump(KERN_ERR, "iwl data: ",                          \
-                       DUMP_PREFIX_OFFSET, 16, 1, p, len, 1);           \
-} while (0)
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-#define IWL_DEBUG(__priv, level, fmt, args...)                          \
-do {                                                                    \
-        if (iwl_legacy_get_debug_level(__priv) & (level))                       \
-                dev_printk(KERN_ERR, &(__priv->hw->wiphy->dev),         \
-                         "%c %s " fmt, in_interrupt() ? 'I' : 'U',      \
-                        __func__ , ## args);                            \
-} while (0)
-
-#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...)                    \
-do {                                                                    \
-        if ((iwl_legacy_get_debug_level(__priv) & (level)) && net_ratelimit())  \
-                dev_printk(KERN_ERR, &(__priv->hw->wiphy->dev),         \
-                        "%c %s " fmt, in_interrupt() ? 'I' : 'U',       \
-                         __func__ , ## args);                           \
-} while (0)
-
-#define iwl_print_hex_dump(priv, level, p, len)                         \
-do {                                                                    \
-        if (iwl_legacy_get_debug_level(priv) & level)                           \
-                print_hex_dump(KERN_DEBUG, "iwl data: ",                \
-                               DUMP_PREFIX_OFFSET, 16, 1, p, len, 1);   \
-} while (0)
-
-#else
-#define IWL_DEBUG(__priv, level, fmt, args...)
-#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...)
-static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
-                                      const void *p, u32 len)
-{}
-#endif                          /* CONFIG_IWLWIFI_LEGACY_DEBUG */
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
-int iwl_legacy_dbgfs_register(struct iwl_priv *priv, const char *name);
-void iwl_legacy_dbgfs_unregister(struct iwl_priv *priv);
-#else
-static inline int
-iwl_legacy_dbgfs_register(struct iwl_priv *priv, const char *name)
-{
-        return 0;
-}
-static inline void iwl_legacy_dbgfs_unregister(struct iwl_priv *priv)
-{
-}
-#endif                          /* CONFIG_IWLWIFI_LEGACY_DEBUGFS */
-
-/*
- * To use the debug system:
- *
- * If you are defining a new debug classification, simply add it to the #define
- * list here in the form of
- *
- * #define IWL_DL_xxxx VALUE
- *
- * where xxxx should be the name of the classification (for example, WEP).
- *
- * You then need to either add a IWL_xxxx_DEBUG() macro definition for your
- * classification, or use IWL_DEBUG(IWL_DL_xxxx, ...) whenever you want
- * to send output to that classification.
- *
- * The active debug levels can be accessed via files
- *
- *      /sys/module/iwl4965/parameters/debug{50}
- *      /sys/module/iwl3945/parameters/debug
- *      /sys/class/net/wlan0/device/debug_level
- *
- * when CONFIG_IWLWIFI_LEGACY_DEBUG=y.
- */
-
-/* 0x0000000F - 0x00000001 */
-#define IWL_DL_INFO             (1 << 0)
-#define IWL_DL_MAC80211         (1 << 1)
-#define IWL_DL_HCMD             (1 << 2)
-#define IWL_DL_STATE            (1 << 3)
-/* 0x000000F0 - 0x00000010 */
-#define IWL_DL_MACDUMP          (1 << 4)
-#define IWL_DL_HCMD_DUMP        (1 << 5)
-#define IWL_DL_EEPROM           (1 << 6)
-#define IWL_DL_RADIO            (1 << 7)
-/* 0x00000F00 - 0x00000100 */
-#define IWL_DL_POWER            (1 << 8)
-#define IWL_DL_TEMP             (1 << 9)
-#define IWL_DL_NOTIF            (1 << 10)
-#define IWL_DL_SCAN             (1 << 11)
-/* 0x0000F000 - 0x00001000 */
-#define IWL_DL_ASSOC            (1 << 12)
-#define IWL_DL_DROP             (1 << 13)
-#define IWL_DL_TXPOWER          (1 << 14)
-#define IWL_DL_AP               (1 << 15)
-/* 0x000F0000 - 0x00010000 */
-#define IWL_DL_FW               (1 << 16)
-#define IWL_DL_RF_KILL          (1 << 17)
-#define IWL_DL_FW_ERRORS        (1 << 18)
-#define IWL_DL_LED              (1 << 19)
-/* 0x00F00000 - 0x00100000 */
-#define IWL_DL_RATE             (1 << 20)
-#define IWL_DL_CALIB            (1 << 21)
-#define IWL_DL_WEP              (1 << 22)
-#define IWL_DL_TX               (1 << 23)
-/* 0x0F000000 - 0x01000000 */
-#define IWL_DL_RX               (1 << 24)
-#define IWL_DL_ISR              (1 << 25)
-#define IWL_DL_HT               (1 << 26)
-#define IWL_DL_IO               (1 << 27)
-/* 0xF0000000 - 0x10000000 */
-#define IWL_DL_11H              (1 << 28)
-#define IWL_DL_STATS            (1 << 29)
-#define IWL_DL_TX_REPLY         (1 << 30)
-#define IWL_DL_QOS              (1 << 31)
-
-#define IWL_DEBUG_INFO(p, f, a...)      IWL_DEBUG(p, IWL_DL_INFO, f, ## a)
-#define IWL_DEBUG_MAC80211(p, f, a...)  IWL_DEBUG(p, IWL_DL_MAC80211, f, ## a)
-#define IWL_DEBUG_MACDUMP(p, f, a...)   IWL_DEBUG(p, IWL_DL_MACDUMP, f, ## a)
-#define IWL_DEBUG_TEMP(p, f, a...)      IWL_DEBUG(p, IWL_DL_TEMP, f, ## a)
-#define IWL_DEBUG_SCAN(p, f, a...)      IWL_DEBUG(p, IWL_DL_SCAN, f, ## a)
-#define IWL_DEBUG_RX(p, f, a...)        IWL_DEBUG(p, IWL_DL_RX, f, ## a)
-#define IWL_DEBUG_TX(p, f, a...)        IWL_DEBUG(p, IWL_DL_TX, f, ## a)
-#define IWL_DEBUG_ISR(p, f, a...)       IWL_DEBUG(p, IWL_DL_ISR, f, ## a)
-#define IWL_DEBUG_LED(p, f, a...)       IWL_DEBUG(p, IWL_DL_LED, f, ## a)
-#define IWL_DEBUG_WEP(p, f, a...)       IWL_DEBUG(p, IWL_DL_WEP, f, ## a)
-#define IWL_DEBUG_HC(p, f, a...)        IWL_DEBUG(p, IWL_DL_HCMD, f, ## a)
-#define IWL_DEBUG_HC_DUMP(p, f, a...)   IWL_DEBUG(p, IWL_DL_HCMD_DUMP, f, ## a)
-#define IWL_DEBUG_EEPROM(p, f, a...)    IWL_DEBUG(p, IWL_DL_EEPROM, f, ## a)
-#define IWL_DEBUG_CALIB(p, f, a...)     IWL_DEBUG(p, IWL_DL_CALIB, f, ## a)
-#define IWL_DEBUG_FW(p, f, a...)        IWL_DEBUG(p, IWL_DL_FW, f, ## a)
-#define IWL_DEBUG_RF_KILL(p, f, a...)   IWL_DEBUG(p, IWL_DL_RF_KILL, f, ## a)
-#define IWL_DEBUG_DROP(p, f, a...)      IWL_DEBUG(p, IWL_DL_DROP, f, ## a)
-#define IWL_DEBUG_DROP_LIMIT(p, f, a...)        \
-                IWL_DEBUG_LIMIT(p, IWL_DL_DROP, f, ## a)
-#define IWL_DEBUG_AP(p, f, a...)        IWL_DEBUG(p, IWL_DL_AP, f, ## a)
-#define IWL_DEBUG_TXPOWER(p, f, a...)   IWL_DEBUG(p, IWL_DL_TXPOWER, f, ## a)
-#define IWL_DEBUG_IO(p, f, a...)        IWL_DEBUG(p, IWL_DL_IO, f, ## a)
-#define IWL_DEBUG_RATE(p, f, a...)      IWL_DEBUG(p, IWL_DL_RATE, f, ## a)
-#define IWL_DEBUG_RATE_LIMIT(p, f, a...)        \
-                IWL_DEBUG_LIMIT(p, IWL_DL_RATE, f, ## a)
-#define IWL_DEBUG_NOTIF(p, f, a...)     IWL_DEBUG(p, IWL_DL_NOTIF, f, ## a)
-#define IWL_DEBUG_ASSOC(p, f, a...)     \
-                IWL_DEBUG(p, IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)
-#define IWL_DEBUG_ASSOC_LIMIT(p, f, a...)       \
-                IWL_DEBUG_LIMIT(p, IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)
-#define IWL_DEBUG_HT(p, f, a...)        IWL_DEBUG(p, IWL_DL_HT, f, ## a)
-#define IWL_DEBUG_STATS(p, f, a...)     IWL_DEBUG(p, IWL_DL_STATS, f, ## a)
-#define IWL_DEBUG_STATS_LIMIT(p, f, a...)       \
-                IWL_DEBUG_LIMIT(p, IWL_DL_STATS, f, ## a)
-#define IWL_DEBUG_TX_REPLY(p, f, a...)  IWL_DEBUG(p, IWL_DL_TX_REPLY, f, ## a)
-#define IWL_DEBUG_TX_REPLY_LIMIT(p, f, a...) \
-                IWL_DEBUG_LIMIT(p, IWL_DL_TX_REPLY, f, ## a)
-#define IWL_DEBUG_QOS(p, f, a...)       IWL_DEBUG(p, IWL_DL_QOS, f, ## a)
-#define IWL_DEBUG_RADIO(p, f, a...)     IWL_DEBUG(p, IWL_DL_RADIO, f, ## a)
-#define IWL_DEBUG_POWER(p, f, a...)     IWL_DEBUG(p, IWL_DL_POWER, f, ## a)
-#define IWL_DEBUG_11H(p, f, a...)       IWL_DEBUG(p, IWL_DL_11H, f, ## a)
-
-#endif
diff --git a/drivers/net/wireless/iwlegacy/iwl-debugfs.c b/drivers/net/wireless/iwlegacy/iwl-debugfs.c
deleted file mode 100644
index 996996a71657..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-debugfs.c
+++ /dev/null
@@ -1,1313 +0,0 @@
-/******************************************************************************
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *****************************************************************************/
-#include <linux/ieee80211.h>
-#include <net/mac80211.h>
-
-
-#include "iwl-dev.h"
-#include "iwl-debug.h"
-#include "iwl-core.h"
-#include "iwl-io.h"
-
-/* create and remove of files */
-#define DEBUGFS_ADD_FILE(name, parent, mode) do {                       \
-        if (!debugfs_create_file(#name, mode, parent, priv,             \
-                         &iwl_legacy_dbgfs_##name##_ops))               \
-                goto err;                                               \
-} while (0)
-
-#define DEBUGFS_ADD_BOOL(name, parent, ptr) do {                        \
-        struct dentry *__tmp;                                           \
-        __tmp = debugfs_create_bool(#name, S_IWUSR | S_IRUSR,           \
-                                    parent, ptr);                       \
-        if (IS_ERR(__tmp) || !__tmp)                                    \
-                goto err;                                               \
-} while (0)
-
-#define DEBUGFS_ADD_X32(name, parent, ptr) do {                         \
-        struct dentry *__tmp;                                           \
-        __tmp = debugfs_create_x32(#name, S_IWUSR | S_IRUSR,            \
-                                   parent, ptr);                        \
-        if (IS_ERR(__tmp) || !__tmp)                                    \
-                goto err;                                               \
-} while (0)
-
-/* file operation */
-#define DEBUGFS_READ_FUNC(name)                                         \
-static ssize_t iwl_legacy_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_legacy_dbgfs_##name##_write(struct file *file,              \
-                                        const char __user *user_buf,    \
-                                        size_t count, loff_t *ppos);
-
-
-static int
-iwl_legacy_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_legacy_dbgfs_##name##_ops = {   \
-        .read = iwl_legacy_dbgfs_##name##_read,                         \
-        .open = iwl_legacy_dbgfs_open_file_generic,                     \
-        .llseek = generic_file_llseek,                                  \
-};
-
-#define DEBUGFS_WRITE_FILE_OPS(name)                            \
-        DEBUGFS_WRITE_FUNC(name);                                       \
-static const struct file_operations iwl_legacy_dbgfs_##name##_ops = {   \
-        .write = iwl_legacy_dbgfs_##name##_write,                       \
-        .open = iwl_legacy_dbgfs_open_file_generic,                     \
-        .llseek = generic_file_llseek,                                  \
-};
-
-#define DEBUGFS_READ_WRITE_FILE_OPS(name)                           \
-        DEBUGFS_READ_FUNC(name);                                        \
-        DEBUGFS_WRITE_FUNC(name);                                       \
-static const struct file_operations iwl_legacy_dbgfs_##name##_ops = {   \
-        .write = iwl_legacy_dbgfs_##name##_write,                       \
-        .read = iwl_legacy_dbgfs_##name##_read,                         \
-        .open = iwl_legacy_dbgfs_open_file_generic,                     \
-        .llseek = generic_file_llseek,                                  \
-};
-
-static ssize_t iwl_legacy_dbgfs_tx_statistics_read(struct file *file,
-                                                char __user *user_buf,
-                                                size_t count, loff_t *ppos) {
-
-        struct iwl_priv *priv = file->private_data;
-        char *buf;
-        int pos = 0;
-
-        int cnt;
-        ssize_t ret;
-        const size_t bufsz = 100 +
-                sizeof(char) * 50 * (MANAGEMENT_MAX + CONTROL_MAX);
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
-        pos += scnprintf(buf + pos, bufsz - pos, "Management:\n");
-        for (cnt = 0; cnt < MANAGEMENT_MAX; cnt++) {
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                 "\t%25s\t\t: %u\n",
-                                 iwl_legacy_get_mgmt_string(cnt),
-                                 priv->tx_stats.mgmt[cnt]);
-        }
-        pos += scnprintf(buf + pos, bufsz - pos, "Control\n");
-        for (cnt = 0; cnt < CONTROL_MAX; cnt++) {
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                 "\t%25s\t\t: %u\n",
-                                 iwl_legacy_get_ctrl_string(cnt),
-                                 priv->tx_stats.ctrl[cnt]);
-        }
-        pos += scnprintf(buf + pos, bufsz - pos, "Data:\n");
-        pos += scnprintf(buf + pos, bufsz - pos, "\tcnt: %u\n",
-                         priv->tx_stats.data_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos, "\tbytes: %llu\n",
-                         priv->tx_stats.data_bytes);
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-static ssize_t
-iwl_legacy_dbgfs_clear_traffic_statistics_write(struct file *file,
-                                        const char __user *user_buf,
-                                        size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        u32 clear_flag;
-        char buf[8];
-        int buf_size;
-
-        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", &clear_flag) != 1)
-                return -EFAULT;
-        iwl_legacy_clear_traffic_stats(priv);
-
-        return count;
-}
-
-static ssize_t iwl_legacy_dbgfs_rx_statistics_read(struct file *file,
-                                                char __user *user_buf,
-                                                size_t count, loff_t *ppos) {
-
-        struct iwl_priv *priv = file->private_data;
-        char *buf;
-        int pos = 0;
-        int cnt;
-        ssize_t ret;
-        const size_t bufsz = 100 +
-                sizeof(char) * 50 * (MANAGEMENT_MAX + CONTROL_MAX);
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
-
-        pos += scnprintf(buf + pos, bufsz - pos, "Management:\n");
-        for (cnt = 0; cnt < MANAGEMENT_MAX; cnt++) {
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                 "\t%25s\t\t: %u\n",
-                                 iwl_legacy_get_mgmt_string(cnt),
-                                 priv->rx_stats.mgmt[cnt]);
-        }
-        pos += scnprintf(buf + pos, bufsz - pos, "Control:\n");
-        for (cnt = 0; cnt < CONTROL_MAX; cnt++) {
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                 "\t%25s\t\t: %u\n",
-                                 iwl_legacy_get_ctrl_string(cnt),
-                                 priv->rx_stats.ctrl[cnt]);
-        }
-        pos += scnprintf(buf + pos, bufsz - pos, "Data:\n");
-        pos += scnprintf(buf + pos, bufsz - pos, "\tcnt: %u\n",
-                         priv->rx_stats.data_cnt);
-        pos += scnprintf(buf + pos, bufsz - pos, "\tbytes: %llu\n",
-                         priv->rx_stats.data_bytes);
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-#define BYTE1_MASK 0x000000ff;
-#define BYTE2_MASK 0x0000ffff;
-#define BYTE3_MASK 0x00ffffff;
-static ssize_t iwl_legacy_dbgfs_sram_read(struct file *file,
-                                        char __user *user_buf,
-                                        size_t count, loff_t *ppos)
-{
-        u32 val;
-        char *buf;
-        ssize_t ret;
-        int i;
-        int pos = 0;
-        struct iwl_priv *priv = file->private_data;
-        size_t bufsz;
-
-        /* default is to dump the entire data segment */
-        if (!priv->dbgfs_sram_offset && !priv->dbgfs_sram_len) {
-                priv->dbgfs_sram_offset = 0x800000;
-                if (priv->ucode_type == UCODE_INIT)
-                        priv->dbgfs_sram_len = priv->ucode_init_data.len;
-                else
-                        priv->dbgfs_sram_len = priv->ucode_data.len;
-        }
-        bufsz =  30 + priv->dbgfs_sram_len * sizeof(char) * 10;
-        buf = kmalloc(bufsz, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
-        pos += scnprintf(buf + pos, bufsz - pos, "sram_len: 0x%x\n",
-                        priv->dbgfs_sram_len);
-        pos += scnprintf(buf + pos, bufsz - pos, "sram_offset: 0x%x\n",
-                        priv->dbgfs_sram_offset);
-        for (i = priv->dbgfs_sram_len; i > 0; i -= 4) {
-                val = iwl_legacy_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;
-                        }
-                }
-                if (!(i % 16))
-                        pos += scnprintf(buf + pos, bufsz - pos, "\n");
-                pos += scnprintf(buf + pos, bufsz - pos, "0x%08x ", val);
-        }
-        pos += scnprintf(buf + pos, bufsz - pos, "\n");
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-static ssize_t iwl_legacy_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_legacy_dbgfs_stations_read(struct file *file, char __user *user_buf,
-                                        size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        struct iwl_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);
-
-        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)
-                        continue;
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                 "station %d - addr: %pM, flags: %#x\n",
-                                 i, station->sta.sta.addr,
-                                 station->sta.station_flags_msk);
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                "TID\tseq_num\ttxq_id\tframes\ttfds\t");
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                "start_idx\tbitmap\t\t\trate_n_flags\n");
-
-                for (j = 0; j < MAX_TID_COUNT; j++) {
-                        pos += scnprintf(buf + pos, bufsz - pos,
-                                "%d:\t%#x\t%#x\t%u\t%u\t%u\t\t%#.16llx\t%#x",
-                                j, station->tid[j].seq_number,
-                                station->tid[j].agg.txq_id,
-                                station->tid[j].agg.frame_count,
-                                station->tid[j].tfds_in_queue,
-                                station->tid[j].agg.start_idx,
-                                station->tid[j].agg.bitmap,
-                                station->tid[j].agg.rate_n_flags);
-
-                        if (station->tid[j].agg.wait_for_ba)
-                                pos += scnprintf(buf + pos, bufsz - pos,
-                                                 " - waitforba");
-                        pos += scnprintf(buf + pos, bufsz - pos, "\n");
-                }
-
-                pos += scnprintf(buf + pos, bufsz - pos, "\n");
-        }
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-static ssize_t iwl_legacy_dbgfs_nvm_read(struct file *file,
-                                       char __user *user_buf,
-                                       size_t count,
-                                       loff_t *ppos)
-{
-        ssize_t ret;
-        struct iwl_priv *priv = file->private_data;
-        int pos = 0, ofs = 0, buf_size = 0;
-        const u8 *ptr;
-        char *buf;
-        u16 eeprom_ver;
-        size_t eeprom_len = priv->cfg->base_params->eeprom_size;
-        buf_size = 4 * eeprom_len + 256;
-
-        if (eeprom_len % 16) {
-                IWL_ERR(priv, "NVM size is not multiple of 16.\n");
-                return -ENODATA;
-        }
-
-        ptr = priv->eeprom;
-        if (!ptr) {
-                IWL_ERR(priv, "Invalid EEPROM memory\n");
-                return -ENOMEM;
-        }
-
-        /* 4 characters for byte 0xYY */
-        buf = kzalloc(buf_size, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
-                return -ENOMEM;
-        }
-        eeprom_ver = iwl_legacy_eeprom_query16(priv, EEPROM_VERSION);
-        pos += scnprintf(buf + pos, buf_size - pos, "EEPROM "
-                        "version: 0x%x\n", eeprom_ver);
-        for (ofs = 0 ; ofs < eeprom_len ; ofs += 16) {
-                pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x ", ofs);
-                hex_dump_to_buffer(ptr + ofs, 16 , 16, 2, buf + pos,
-                                   buf_size - pos, 0);
-                pos += strlen(buf + pos);
-                if (buf_size - pos > 0)
-                        buf[pos++] = '\n';
-        }
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-static ssize_t
-iwl_legacy_dbgfs_channels_read(struct file *file, char __user *user_buf,
-                                       size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        struct ieee80211_channel *channels = NULL;
-        const struct ieee80211_supported_band *supp_band = NULL;
-        int pos = 0, i, bufsz = PAGE_SIZE;
-        char *buf;
-        ssize_t ret;
-
-        if (!test_bit(STATUS_GEO_CONFIGURED, &priv->status))
-                return -EAGAIN;
-
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
-                return -ENOMEM;
-        }
-
-        supp_band = iwl_get_hw_mode(priv, IEEE80211_BAND_2GHZ);
-        if (supp_band) {
-                channels = supp_band->channels;
-
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                "Displaying %d channels in 2.4GHz band 802.11bg):\n",
-                                supp_band->n_channels);
-
-                for (i = 0; i < supp_band->n_channels; i++)
-                        pos += scnprintf(buf + pos, bufsz - pos,
-                                "%d: %ddBm: BSS%s%s, %s.\n",
-                                channels[i].hw_value,
-                                channels[i].max_power,
-                                channels[i].flags & IEEE80211_CHAN_RADAR ?
-                                " (IEEE 802.11h required)" : "",
-                                ((channels[i].flags & IEEE80211_CHAN_NO_IBSS)
-                                || (channels[i].flags &
-                                IEEE80211_CHAN_RADAR)) ? "" :
-                                ", IBSS",
-                                channels[i].flags &
-                                IEEE80211_CHAN_PASSIVE_SCAN ?
-                                "passive only" : "active/passive");
-        }
-        supp_band = iwl_get_hw_mode(priv, IEEE80211_BAND_5GHZ);
-        if (supp_band) {
-                channels = supp_band->channels;
-
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                "Displaying %d channels in 5.2GHz band (802.11a)\n",
-                                supp_band->n_channels);
-
-                for (i = 0; i < supp_band->n_channels; i++)
-                        pos += scnprintf(buf + pos, bufsz - pos,
-                                "%d: %ddBm: BSS%s%s, %s.\n",
-                                channels[i].hw_value,
-                                channels[i].max_power,
-                                channels[i].flags & IEEE80211_CHAN_RADAR ?
-                                " (IEEE 802.11h required)" : "",
-                                ((channels[i].flags & IEEE80211_CHAN_NO_IBSS)
-                                || (channels[i].flags &
-                                IEEE80211_CHAN_RADAR)) ? "" :
-                                ", IBSS",
-                                channels[i].flags &
-                                IEEE80211_CHAN_PASSIVE_SCAN ?
-                                "passive only" : "active/passive");
-        }
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-static ssize_t iwl_legacy_dbgfs_status_read(struct file *file,
-                                                char __user *user_buf,
-                                                size_t count, loff_t *ppos) {
-
-        struct iwl_priv *priv = file->private_data;
-        char buf[512];
-        int pos = 0;
-        const size_t bufsz = sizeof(buf);
-
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_ACTIVE:\t %d\n",
-                test_bit(STATUS_HCMD_ACTIVE, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_INT_ENABLED:\t %d\n",
-                test_bit(STATUS_INT_ENABLED, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_RF_KILL_HW:\t %d\n",
-                test_bit(STATUS_RF_KILL_HW, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_CT_KILL:\t\t %d\n",
-                test_bit(STATUS_CT_KILL, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_INIT:\t\t %d\n",
-                test_bit(STATUS_INIT, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_ALIVE:\t\t %d\n",
-                test_bit(STATUS_ALIVE, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_READY:\t\t %d\n",
-                test_bit(STATUS_READY, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_TEMPERATURE:\t %d\n",
-                test_bit(STATUS_TEMPERATURE, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_GEO_CONFIGURED:\t %d\n",
-                test_bit(STATUS_GEO_CONFIGURED, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_EXIT_PENDING:\t %d\n",
-                test_bit(STATUS_EXIT_PENDING, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_STATISTICS:\t %d\n",
-                test_bit(STATUS_STATISTICS, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_SCANNING:\t %d\n",
-                test_bit(STATUS_SCANNING, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_SCAN_ABORTING:\t %d\n",
-                test_bit(STATUS_SCAN_ABORTING, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_SCAN_HW:\t\t %d\n",
-                test_bit(STATUS_SCAN_HW, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_POWER_PMI:\t %d\n",
-                test_bit(STATUS_POWER_PMI, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_FW_ERROR:\t %d\n",
-                test_bit(STATUS_FW_ERROR, &priv->status));
-        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-}
-
-static ssize_t iwl_legacy_dbgfs_interrupt_read(struct file *file,
-                                        char __user *user_buf,
-                                        size_t count, loff_t *ppos) {
-
-        struct iwl_priv *priv = file->private_data;
-        int pos = 0;
-        int cnt = 0;
-        char *buf;
-        int bufsz = 24 * 64; /* 24 items * 64 char per item */
-        ssize_t ret;
-
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
-                return -ENOMEM;
-        }
-
-        pos += scnprintf(buf + pos, bufsz - pos,
-                        "Interrupt Statistics Report:\n");
-
-        pos += scnprintf(buf + pos, bufsz - pos, "HW Error:\t\t\t %u\n",
-                priv->isr_stats.hw);
-        pos += scnprintf(buf + pos, bufsz - pos, "SW Error:\t\t\t %u\n",
-                priv->isr_stats.sw);
-        if (priv->isr_stats.sw || priv->isr_stats.hw) {
-                pos += scnprintf(buf + pos, bufsz - pos,
-                        "\tLast Restarting Code:  0x%X\n",
-                        priv->isr_stats.err_code);
-        }
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        pos += scnprintf(buf + pos, bufsz - pos, "Frame transmitted:\t\t %u\n",
-                priv->isr_stats.sch);
-        pos += scnprintf(buf + pos, bufsz - pos, "Alive interrupt:\t\t %u\n",
-                priv->isr_stats.alive);
-#endif
-        pos += scnprintf(buf + pos, bufsz - pos,
-                "HW RF KILL switch toggled:\t %u\n",
-                priv->isr_stats.rfkill);
-
-        pos += scnprintf(buf + pos, bufsz - pos, "CT KILL:\t\t\t %u\n",
-                priv->isr_stats.ctkill);
-
-        pos += scnprintf(buf + pos, bufsz - pos, "Wakeup Interrupt:\t\t %u\n",
-                priv->isr_stats.wakeup);
-
-        pos += scnprintf(buf + pos, bufsz - pos,
-                "Rx command responses:\t\t %u\n",
-                priv->isr_stats.rx);
-        for (cnt = 0; cnt < REPLY_MAX; cnt++) {
-                if (priv->isr_stats.rx_handlers[cnt] > 0)
-                        pos += scnprintf(buf + pos, bufsz - pos,
-                                "\tRx handler[%36s]:\t\t %u\n",
-                                iwl_legacy_get_cmd_string(cnt),
-                                priv->isr_stats.rx_handlers[cnt]);
-        }
-
-        pos += scnprintf(buf + pos, bufsz - pos, "Tx/FH interrupt:\t\t %u\n",
-                priv->isr_stats.tx);
-
-        pos += scnprintf(buf + pos, bufsz - pos, "Unexpected INTA:\t\t %u\n",
-                priv->isr_stats.unhandled);
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-static ssize_t iwl_legacy_dbgfs_interrupt_write(struct file *file,
-                                         const char __user *user_buf,
-                                         size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        char buf[8];
-        int buf_size;
-        u32 reset_flag;
-
-        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", &reset_flag) != 1)
-                return -EFAULT;
-        if (reset_flag == 0)
-                iwl_legacy_clear_isr_stats(priv);
-
-        return count;
-}
-
-static ssize_t
-iwl_legacy_dbgfs_qos_read(struct file *file, char __user *user_buf,
-                                       size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        struct iwl_rxon_context *ctx;
-        int pos = 0, i;
-        char buf[256 * NUM_IWL_RXON_CTX];
-        const size_t bufsz = sizeof(buf);
-
-        for_each_context(priv, ctx) {
-                pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n",
-                                 ctx->ctxid);
-                for (i = 0; i < AC_NUM; i++) {
-                        pos += scnprintf(buf + pos, bufsz - pos,
-                                "\tcw_min\tcw_max\taifsn\ttxop\n");
-                        pos += scnprintf(buf + pos, bufsz - pos,
-                                "AC[%d]\t%u\t%u\t%u\t%u\n", i,
-                                ctx->qos_data.def_qos_parm.ac[i].cw_min,
-                                ctx->qos_data.def_qos_parm.ac[i].cw_max,
-                                ctx->qos_data.def_qos_parm.ac[i].aifsn,
-                                ctx->qos_data.def_qos_parm.ac[i].edca_txop);
-                }
-                pos += scnprintf(buf + pos, bufsz - pos, "\n");
-        }
-        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-}
-
-static ssize_t iwl_legacy_dbgfs_disable_ht40_write(struct file *file,
-                                         const char __user *user_buf,
-                                         size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        char buf[8];
-        int buf_size;
-        int ht40;
-
-        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, "%d", &ht40) != 1)
-                return -EFAULT;
-        if (!iwl_legacy_is_any_associated(priv))
-                priv->disable_ht40 = ht40 ? true : false;
-        else {
-                IWL_ERR(priv, "Sta associated with AP - "
-                        "Change to 40MHz channel support is not allowed\n");
-                return -EINVAL;
-        }
-
-        return count;
-}
-
-static ssize_t iwl_legacy_dbgfs_disable_ht40_read(struct file *file,
-                                         char __user *user_buf,
-                                         size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        char buf[100];
-        int pos = 0;
-        const size_t bufsz = sizeof(buf);
-
-        pos += scnprintf(buf + pos, bufsz - pos,
-                        "11n 40MHz Mode: %s\n",
-                        priv->disable_ht40 ? "Disabled" : "Enabled");
-        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-}
-
-DEBUGFS_READ_WRITE_FILE_OPS(sram);
-DEBUGFS_READ_FILE_OPS(nvm);
-DEBUGFS_READ_FILE_OPS(stations);
-DEBUGFS_READ_FILE_OPS(channels);
-DEBUGFS_READ_FILE_OPS(status);
-DEBUGFS_READ_WRITE_FILE_OPS(interrupt);
-DEBUGFS_READ_FILE_OPS(qos);
-DEBUGFS_READ_WRITE_FILE_OPS(disable_ht40);
-
-static ssize_t iwl_legacy_dbgfs_traffic_log_read(struct file *file,
-                                         char __user *user_buf,
-                                         size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        int pos = 0, ofs = 0;
-        int cnt = 0, entry;
-        struct iwl_tx_queue *txq;
-        struct iwl_queue *q;
-        struct iwl_rx_queue *rxq = &priv->rxq;
-        char *buf;
-        int bufsz = ((IWL_TRAFFIC_ENTRIES * IWL_TRAFFIC_ENTRY_SIZE * 64) * 2) +
-                (priv->cfg->base_params->num_of_queues * 32 * 8) + 400;
-        const u8 *ptr;
-        ssize_t ret;
-
-        if (!priv->txq) {
-                IWL_ERR(priv, "txq not ready\n");
-                return -EAGAIN;
-        }
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate buffer\n");
-                return -ENOMEM;
-        }
-        pos += scnprintf(buf + pos, bufsz - pos, "Tx Queue\n");
-        for (cnt = 0; cnt < priv->hw_params.max_txq_num; cnt++) {
-                txq = &priv->txq[cnt];
-                q = &txq->q;
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                "q[%d]: read_ptr: %u, write_ptr: %u\n",
-                                cnt, q->read_ptr, q->write_ptr);
-        }
-        if (priv->tx_traffic && (iwlegacy_debug_level & IWL_DL_TX)) {
-                ptr = priv->tx_traffic;
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                "Tx Traffic idx: %u\n", priv->tx_traffic_idx);
-                for (cnt = 0, ofs = 0; cnt < IWL_TRAFFIC_ENTRIES; cnt++) {
-                        for (entry = 0; entry < IWL_TRAFFIC_ENTRY_SIZE / 16;
-                             entry++,  ofs += 16) {
-                                pos += scnprintf(buf + pos, bufsz - pos,
-                                                "0x%.4x ", ofs);
-                                hex_dump_to_buffer(ptr + ofs, 16, 16, 2,
-                                                   buf + pos, bufsz - pos, 0);
-                                pos += strlen(buf + pos);
-                                if (bufsz - pos > 0)
-                                        buf[pos++] = '\n';
-                        }
-                }
-        }
-
-        pos += scnprintf(buf + pos, bufsz - pos, "Rx Queue\n");
-        pos += scnprintf(buf + pos, bufsz - pos,
-                        "read: %u, write: %u\n",
-                         rxq->read, rxq->write);
-
-        if (priv->rx_traffic && (iwlegacy_debug_level & IWL_DL_RX)) {
-                ptr = priv->rx_traffic;
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                "Rx Traffic idx: %u\n", priv->rx_traffic_idx);
-                for (cnt = 0, ofs = 0; cnt < IWL_TRAFFIC_ENTRIES; cnt++) {
-                        for (entry = 0; entry < IWL_TRAFFIC_ENTRY_SIZE / 16;
-                             entry++,  ofs += 16) {
-                                pos += scnprintf(buf + pos, bufsz - pos,
-                                                "0x%.4x ", ofs);
-                                hex_dump_to_buffer(ptr + ofs, 16, 16, 2,
-                                                   buf + pos, bufsz - pos, 0);
-                                pos += strlen(buf + pos);
-                                if (bufsz - pos > 0)
-                                        buf[pos++] = '\n';
-                        }
-                }
-        }
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-static ssize_t iwl_legacy_dbgfs_traffic_log_write(struct file *file,
-                                         const char __user *user_buf,
-                                         size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        char buf[8];
-        int buf_size;
-        int traffic_log;
-
-        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, "%d", &traffic_log) != 1)
-                return -EFAULT;
-        if (traffic_log == 0)
-                iwl_legacy_reset_traffic_log(priv);
-
-        return count;
-}
-
-static ssize_t iwl_legacy_dbgfs_tx_queue_read(struct file *file,
-                                                char __user *user_buf,
-                                                size_t count, loff_t *ppos) {
-
-        struct iwl_priv *priv = file->private_data;
-        struct iwl_tx_queue *txq;
-        struct iwl_queue *q;
-        char *buf;
-        int pos = 0;
-        int cnt;
-        int ret;
-        const size_t bufsz = sizeof(char) * 64 *
-                                priv->cfg->base_params->num_of_queues;
-
-        if (!priv->txq) {
-                IWL_ERR(priv, "txq not ready\n");
-                return -EAGAIN;
-        }
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
-
-        for (cnt = 0; cnt < priv->hw_params.max_txq_num; cnt++) {
-                txq = &priv->txq[cnt];
-                q = &txq->q;
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                "hwq %.2d: read=%u write=%u stop=%d"
-                                " swq_id=%#.2x (ac %d/hwq %d)\n",
-                                cnt, q->read_ptr, q->write_ptr,
-                                !!test_bit(cnt, priv->queue_stopped),
-                                txq->swq_id, txq->swq_id & 3,
-                                (txq->swq_id >> 2) & 0x1f);
-                if (cnt >= 4)
-                        continue;
-                /* for the ACs, display the stop count too */
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                "        stop-count: %d\n",
-                                atomic_read(&priv->queue_stop_count[cnt]));
-        }
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-static ssize_t iwl_legacy_dbgfs_rx_queue_read(struct file *file,
-                                                char __user *user_buf,
-                                                size_t count, loff_t *ppos) {
-
-        struct iwl_priv *priv = file->private_data;
-        struct iwl_rx_queue *rxq = &priv->rxq;
-        char buf[256];
-        int pos = 0;
-        const size_t bufsz = sizeof(buf);
-
-        pos += scnprintf(buf + pos, bufsz - pos, "read: %u\n",
-                                                rxq->read);
-        pos += scnprintf(buf + pos, bufsz - pos, "write: %u\n",
-                                                rxq->write);
-        pos += scnprintf(buf + pos, bufsz - pos, "free_count: %u\n",
-                                                rxq->free_count);
-        if (rxq->rb_stts) {
-                pos += scnprintf(buf + pos, bufsz - pos, "closed_rb_num: %u\n",
-                         le16_to_cpu(rxq->rb_stts->closed_rb_num) &  0x0FFF);
-        } else {
-                pos += scnprintf(buf + pos, bufsz - pos,
-                                        "closed_rb_num: Not Allocated\n");
-        }
-        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-}
-
-static ssize_t iwl_legacy_dbgfs_ucode_rx_stats_read(struct file *file,
-                                        char __user *user_buf,
-                                        size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        return priv->cfg->ops->lib->debugfs_ops.rx_stats_read(file,
-                        user_buf, count, ppos);
-}
-
-static ssize_t iwl_legacy_dbgfs_ucode_tx_stats_read(struct file *file,
-                                        char __user *user_buf,
-                                        size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        return priv->cfg->ops->lib->debugfs_ops.tx_stats_read(file,
-                        user_buf, count, ppos);
-}
-
-static ssize_t iwl_legacy_dbgfs_ucode_general_stats_read(struct file *file,
-                                        char __user *user_buf,
-                                        size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        return priv->cfg->ops->lib->debugfs_ops.general_stats_read(file,
-                        user_buf, count, ppos);
-}
-
-static ssize_t iwl_legacy_dbgfs_sensitivity_read(struct file *file,
-                                        char __user *user_buf,
-                                        size_t count, loff_t *ppos) {
-
-        struct iwl_priv *priv = file->private_data;
-        int pos = 0;
-        int cnt = 0;
-        char *buf;
-        int bufsz = sizeof(struct iwl_sensitivity_data) * 4 + 100;
-        ssize_t ret;
-        struct iwl_sensitivity_data *data;
-
-        data = &priv->sensitivity_data;
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
-                return -ENOMEM;
-        }
-
-        pos += scnprintf(buf + pos, bufsz - pos, "auto_corr_ofdm:\t\t\t %u\n",
-                        data->auto_corr_ofdm);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                        "auto_corr_ofdm_mrc:\t\t %u\n",
-                        data->auto_corr_ofdm_mrc);
-        pos += scnprintf(buf + pos, bufsz - pos, "auto_corr_ofdm_x1:\t\t %u\n",
-                        data->auto_corr_ofdm_x1);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                        "auto_corr_ofdm_mrc_x1:\t\t %u\n",
-                        data->auto_corr_ofdm_mrc_x1);
-        pos += scnprintf(buf + pos, bufsz - pos, "auto_corr_cck:\t\t\t %u\n",
-                        data->auto_corr_cck);
-        pos += scnprintf(buf + pos, bufsz - pos, "auto_corr_cck_mrc:\t\t %u\n",
-                        data->auto_corr_cck_mrc);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                        "last_bad_plcp_cnt_ofdm:\t\t %u\n",
-                        data->last_bad_plcp_cnt_ofdm);
-        pos += scnprintf(buf + pos, bufsz - pos, "last_fa_cnt_ofdm:\t\t %u\n",
-                        data->last_fa_cnt_ofdm);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                        "last_bad_plcp_cnt_cck:\t\t %u\n",
-                        data->last_bad_plcp_cnt_cck);
-        pos += scnprintf(buf + pos, bufsz - pos, "last_fa_cnt_cck:\t\t %u\n",
-                        data->last_fa_cnt_cck);
-        pos += scnprintf(buf + pos, bufsz - pos, "nrg_curr_state:\t\t\t %u\n",
-                        data->nrg_curr_state);
-        pos += scnprintf(buf + pos, bufsz - pos, "nrg_prev_state:\t\t\t %u\n",
-                        data->nrg_prev_state);
-        pos += scnprintf(buf + pos, bufsz - pos, "nrg_value:\t\t\t");
-        for (cnt = 0; cnt < 10; cnt++) {
-                pos += scnprintf(buf + pos, bufsz - pos, " %u",
-                                data->nrg_value[cnt]);
-        }
-        pos += scnprintf(buf + pos, bufsz - pos, "\n");
-        pos += scnprintf(buf + pos, bufsz - pos, "nrg_silence_rssi:\t\t");
-        for (cnt = 0; cnt < NRG_NUM_PREV_STAT_L; cnt++) {
-                pos += scnprintf(buf + pos, bufsz - pos, " %u",
-                                data->nrg_silence_rssi[cnt]);
-        }
-        pos += scnprintf(buf + pos, bufsz - pos, "\n");
-        pos += scnprintf(buf + pos, bufsz - pos, "nrg_silence_ref:\t\t %u\n",
-                        data->nrg_silence_ref);
-        pos += scnprintf(buf + pos, bufsz - pos, "nrg_energy_idx:\t\t\t %u\n",
-                        data->nrg_energy_idx);
-        pos += scnprintf(buf + pos, bufsz - pos, "nrg_silence_idx:\t\t %u\n",
-                        data->nrg_silence_idx);
-        pos += scnprintf(buf + pos, bufsz - pos, "nrg_th_cck:\t\t\t %u\n",
-                        data->nrg_th_cck);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                        "nrg_auto_corr_silence_diff:\t %u\n",
-                        data->nrg_auto_corr_silence_diff);
-        pos += scnprintf(buf + pos, bufsz - pos, "num_in_cck_no_fa:\t\t %u\n",
-                        data->num_in_cck_no_fa);
-        pos += scnprintf(buf + pos, bufsz - pos, "nrg_th_ofdm:\t\t\t %u\n",
-                        data->nrg_th_ofdm);
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-
-static ssize_t iwl_legacy_dbgfs_chain_noise_read(struct file *file,
-                                        char __user *user_buf,
-                                        size_t count, loff_t *ppos) {
-
-        struct iwl_priv *priv = file->private_data;
-        int pos = 0;
-        int cnt = 0;
-        char *buf;
-        int bufsz = sizeof(struct iwl_chain_noise_data) * 4 + 100;
-        ssize_t ret;
-        struct iwl_chain_noise_data *data;
-
-        data = &priv->chain_noise_data;
-        buf = kzalloc(bufsz, GFP_KERNEL);
-        if (!buf) {
-                IWL_ERR(priv, "Can not allocate Buffer\n");
-                return -ENOMEM;
-        }
-
-        pos += scnprintf(buf + pos, bufsz - pos, "active_chains:\t\t\t %u\n",
-                        data->active_chains);
-        pos += scnprintf(buf + pos, bufsz - pos, "chain_noise_a:\t\t\t %u\n",
-                        data->chain_noise_a);
-        pos += scnprintf(buf + pos, bufsz - pos, "chain_noise_b:\t\t\t %u\n",
-                        data->chain_noise_b);
-        pos += scnprintf(buf + pos, bufsz - pos, "chain_noise_c:\t\t\t %u\n",
-                        data->chain_noise_c);
-        pos += scnprintf(buf + pos, bufsz - pos, "chain_signal_a:\t\t\t %u\n",
-                        data->chain_signal_a);
-        pos += scnprintf(buf + pos, bufsz - pos, "chain_signal_b:\t\t\t %u\n",
-                        data->chain_signal_b);
-        pos += scnprintf(buf + pos, bufsz - pos, "chain_signal_c:\t\t\t %u\n",
-                        data->chain_signal_c);
-        pos += scnprintf(buf + pos, bufsz - pos, "beacon_count:\t\t\t %u\n",
-                        data->beacon_count);
-
-        pos += scnprintf(buf + pos, bufsz - pos, "disconn_array:\t\t\t");
-        for (cnt = 0; cnt < NUM_RX_CHAINS; cnt++) {
-                pos += scnprintf(buf + pos, bufsz - pos, " %u",
-                                data->disconn_array[cnt]);
-        }
-        pos += scnprintf(buf + pos, bufsz - pos, "\n");
-        pos += scnprintf(buf + pos, bufsz - pos, "delta_gain_code:\t\t");
-        for (cnt = 0; cnt < NUM_RX_CHAINS; cnt++) {
-                pos += scnprintf(buf + pos, bufsz - pos, " %u",
-                                data->delta_gain_code[cnt]);
-        }
-        pos += scnprintf(buf + pos, bufsz - pos, "\n");
-        pos += scnprintf(buf + pos, bufsz - pos, "radio_write:\t\t\t %u\n",
-                        data->radio_write);
-        pos += scnprintf(buf + pos, bufsz - pos, "state:\t\t\t\t %u\n",
-                        data->state);
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-        kfree(buf);
-        return ret;
-}
-
-static ssize_t iwl_legacy_dbgfs_power_save_status_read(struct file *file,
-                                                    char __user *user_buf,
-                                                    size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        char buf[60];
-        int pos = 0;
-        const size_t bufsz = sizeof(buf);
-        u32 pwrsave_status;
-
-        pwrsave_status = iwl_read32(priv, CSR_GP_CNTRL) &
-                        CSR_GP_REG_POWER_SAVE_STATUS_MSK;
-
-        pos += scnprintf(buf + pos, bufsz - pos, "Power Save Status: ");
-        pos += scnprintf(buf + pos, bufsz - pos, "%s\n",
-                (pwrsave_status == CSR_GP_REG_NO_POWER_SAVE) ? "none" :
-                (pwrsave_status == CSR_GP_REG_MAC_POWER_SAVE) ? "MAC" :
-                (pwrsave_status == CSR_GP_REG_PHY_POWER_SAVE) ? "PHY" :
-                "error");
-
-        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-}
-
-static ssize_t iwl_legacy_dbgfs_clear_ucode_statistics_write(struct file *file,
-                                         const char __user *user_buf,
-                                         size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        char buf[8];
-        int buf_size;
-        int clear;
-
-        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, "%d", &clear) != 1)
-                return -EFAULT;
-
-        /* make request to uCode to retrieve statistics information */
-        mutex_lock(&priv->mutex);
-        iwl_legacy_send_statistics_request(priv, CMD_SYNC, true);
-        mutex_unlock(&priv->mutex);
-
-        return count;
-}
-
-static ssize_t iwl_legacy_dbgfs_rxon_flags_read(struct file *file,
-                                         char __user *user_buf,
-                                         size_t count, loff_t *ppos) {
-
-        struct iwl_priv *priv = file->private_data;
-        int len = 0;
-        char buf[20];
-
-        len = sprintf(buf, "0x%04X\n",
-                le32_to_cpu(priv->contexts[IWL_RXON_CTX_BSS].active.flags));
-        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t iwl_legacy_dbgfs_rxon_filter_flags_read(struct file *file,
-                                                char __user *user_buf,
-                                                size_t count, loff_t *ppos) {
-
-        struct iwl_priv *priv = file->private_data;
-        int len = 0;
-        char buf[20];
-
-        len = sprintf(buf, "0x%04X\n",
-        le32_to_cpu(priv->contexts[IWL_RXON_CTX_BSS].active.filter_flags));
-        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t iwl_legacy_dbgfs_fh_reg_read(struct file *file,
-                                         char __user *user_buf,
-                                         size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        char *buf;
-        int pos = 0;
-        ssize_t ret = -EFAULT;
-
-        if (priv->cfg->ops->lib->dump_fh) {
-                ret = pos = priv->cfg->ops->lib->dump_fh(priv, &buf, true);
-                if (buf) {
-                        ret = simple_read_from_buffer(user_buf,
-                                                      count, ppos, buf, pos);
-                        kfree(buf);
-                }
-        }
-
-        return ret;
-}
-
-static ssize_t iwl_legacy_dbgfs_missed_beacon_read(struct file *file,
-                                        char __user *user_buf,
-                                        size_t count, loff_t *ppos) {
-
-        struct iwl_priv *priv = file->private_data;
-        int pos = 0;
-        char buf[12];
-        const size_t bufsz = sizeof(buf);
-
-        pos += scnprintf(buf + pos, bufsz - pos, "%d\n",
-                        priv->missed_beacon_threshold);
-
-        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-}
-
-static ssize_t iwl_legacy_dbgfs_missed_beacon_write(struct file *file,
-                                         const char __user *user_buf,
-                                         size_t count, loff_t *ppos)
-{
-        struct iwl_priv *priv = file->private_data;
-        char buf[8];
-        int buf_size;
-        int missed;
-
-        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, "%d", &missed) != 1)
-                return -EINVAL;
-
-        if (missed < IWL_MISSED_BEACON_THRESHOLD_MIN ||
-            missed > IWL_MISSED_BEACON_THRESHOLD_MAX)
-                priv->missed_beacon_threshold =
-                        IWL_MISSED_BEACON_THRESHOLD_DEF;
-        else
-                priv->missed_beacon_threshold = missed;
-
-        return count;
-}
-
-static ssize_t iwl_legacy_dbgfs_force_reset_read(struct file *file,
-                                        char __user *user_buf,
-                                        size_t count, loff_t *ppos) {
-
-        struct iwl_priv *priv = file->private_data;
-        int pos = 0;
-        char buf[300];
-        const size_t bufsz = sizeof(buf);
-        struct iwl_force_reset *force_reset;
-
-        force_reset = &priv->force_reset;
-
-        pos += scnprintf(buf + pos, bufsz - pos,
-                        "\tnumber of reset request: %d\n",
-                        force_reset->reset_request_count);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                        "\tnumber of reset request success: %d\n",
-                        force_reset->reset_success_count);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                        "\tnumber of reset request reject: %d\n",
-                        force_reset->reset_reject_count);
-        pos += scnprintf(buf + pos, bufsz - pos,
-                        "\treset duration: %lu\n",
-                        force_reset->reset_duration);
-
-        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
-}
-
-static ssize_t iwl_legacy_dbgfs_force_reset_write(struct file *file,
-                                        const char __user *user_buf,
-                                        size_t count, loff_t *ppos) {
-
-        int ret;
-        struct iwl_priv *priv = file->private_data;
-
-        ret = iwl_legacy_force_reset(priv, true);
-
-        return ret ? ret : count;
-}
-
-static ssize_t iwl_legacy_dbgfs_wd_timeout_write(struct file *file,
-                                        const char __user *user_buf,
-                                        size_t count, loff_t *ppos) {
-
-        struct iwl_priv *priv = file->private_data;
-        char buf[8];
-        int buf_size;
-        int timeout;
-
-        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, "%d", &timeout) != 1)
-                return -EINVAL;
-        if (timeout < 0 || timeout > IWL_MAX_WD_TIMEOUT)
-                timeout = IWL_DEF_WD_TIMEOUT;
-
-        priv->cfg->base_params->wd_timeout = timeout;
-        iwl_legacy_setup_watchdog(priv);
-        return count;
-}
-
-DEBUGFS_READ_FILE_OPS(rx_statistics);
-DEBUGFS_READ_FILE_OPS(tx_statistics);
-DEBUGFS_READ_WRITE_FILE_OPS(traffic_log);
-DEBUGFS_READ_FILE_OPS(rx_queue);
-DEBUGFS_READ_FILE_OPS(tx_queue);
-DEBUGFS_READ_FILE_OPS(ucode_rx_stats);
-DEBUGFS_READ_FILE_OPS(ucode_tx_stats);
-DEBUGFS_READ_FILE_OPS(ucode_general_stats);
-DEBUGFS_READ_FILE_OPS(sensitivity);
-DEBUGFS_READ_FILE_OPS(chain_noise);
-DEBUGFS_READ_FILE_OPS(power_save_status);
-DEBUGFS_WRITE_FILE_OPS(clear_ucode_statistics);
-DEBUGFS_WRITE_FILE_OPS(clear_traffic_statistics);
-DEBUGFS_READ_FILE_OPS(fh_reg);
-DEBUGFS_READ_WRITE_FILE_OPS(missed_beacon);
-DEBUGFS_READ_WRITE_FILE_OPS(force_reset);
-DEBUGFS_READ_FILE_OPS(rxon_flags);
-DEBUGFS_READ_FILE_OPS(rxon_filter_flags);
-DEBUGFS_WRITE_FILE_OPS(wd_timeout);
-
-/*
- * Create the debugfs files and directories
- *
- */
-int iwl_legacy_dbgfs_register(struct iwl_priv *priv, const char *name)
-{
-        struct dentry *phyd = priv->hw->wiphy->debugfsdir;
-        struct dentry *dir_drv, *dir_data, *dir_rf, *dir_debug;
-
-        dir_drv = debugfs_create_dir(name, phyd);
-        if (!dir_drv)
-                return -ENOMEM;
-
-        priv->debugfs_dir = dir_drv;
-
-        dir_data = debugfs_create_dir("data", dir_drv);
-        if (!dir_data)
-                goto err;
-        dir_rf = debugfs_create_dir("rf", dir_drv);
-        if (!dir_rf)
-                goto err;
-        dir_debug = debugfs_create_dir("debug", dir_drv);
-        if (!dir_debug)
-                goto err;
-
-        DEBUGFS_ADD_FILE(nvm, dir_data, S_IRUSR);
-        DEBUGFS_ADD_FILE(sram, dir_data, S_IWUSR | S_IRUSR);
-        DEBUGFS_ADD_FILE(stations, dir_data, S_IRUSR);
-        DEBUGFS_ADD_FILE(channels, dir_data, S_IRUSR);
-        DEBUGFS_ADD_FILE(status, dir_data, S_IRUSR);
-        DEBUGFS_ADD_FILE(interrupt, dir_data, S_IWUSR | S_IRUSR);
-        DEBUGFS_ADD_FILE(qos, dir_data, S_IRUSR);
-        DEBUGFS_ADD_FILE(disable_ht40, dir_data, S_IWUSR | S_IRUSR);
-        DEBUGFS_ADD_FILE(rx_statistics, dir_debug, S_IRUSR);
-        DEBUGFS_ADD_FILE(tx_statistics, dir_debug, S_IRUSR);
-        DEBUGFS_ADD_FILE(traffic_log, dir_debug, S_IWUSR | S_IRUSR);
-        DEBUGFS_ADD_FILE(rx_queue, dir_debug, S_IRUSR);
-        DEBUGFS_ADD_FILE(tx_queue, dir_debug, S_IRUSR);
-        DEBUGFS_ADD_FILE(power_save_status, dir_debug, S_IRUSR);
-        DEBUGFS_ADD_FILE(clear_ucode_statistics, dir_debug, S_IWUSR);
-        DEBUGFS_ADD_FILE(clear_traffic_statistics, dir_debug, S_IWUSR);
-        DEBUGFS_ADD_FILE(fh_reg, dir_debug, S_IRUSR);
-        DEBUGFS_ADD_FILE(missed_beacon, dir_debug, S_IWUSR);
-        DEBUGFS_ADD_FILE(force_reset, dir_debug, S_IWUSR | S_IRUSR);
-        DEBUGFS_ADD_FILE(ucode_rx_stats, dir_debug, S_IRUSR);
-        DEBUGFS_ADD_FILE(ucode_tx_stats, dir_debug, S_IRUSR);
-        DEBUGFS_ADD_FILE(ucode_general_stats, dir_debug, S_IRUSR);
-
-        if (priv->cfg->base_params->sensitivity_calib_by_driver)
-                DEBUGFS_ADD_FILE(sensitivity, dir_debug, S_IRUSR);
-        if (priv->cfg->base_params->chain_noise_calib_by_driver)
-                DEBUGFS_ADD_FILE(chain_noise, dir_debug, S_IRUSR);
-        DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR);
-        DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR);
-        DEBUGFS_ADD_FILE(wd_timeout, dir_debug, S_IWUSR);
-        if (priv->cfg->base_params->sensitivity_calib_by_driver)
-                DEBUGFS_ADD_BOOL(disable_sensitivity, dir_rf,
-                                 &priv->disable_sens_cal);
-        if (priv->cfg->base_params->chain_noise_calib_by_driver)
-                DEBUGFS_ADD_BOOL(disable_chain_noise, dir_rf,
-                                 &priv->disable_chain_noise_cal);
-        DEBUGFS_ADD_BOOL(disable_tx_power, dir_rf,
-                                &priv->disable_tx_power_cal);
-        return 0;
-
-err:
-        IWL_ERR(priv, "Can't create the debugfs directory\n");
-        iwl_legacy_dbgfs_unregister(priv);
-        return -ENOMEM;
-}
-EXPORT_SYMBOL(iwl_legacy_dbgfs_register);
-
-/**
- * Remove the debugfs files and directories
- *
- */
-void iwl_legacy_dbgfs_unregister(struct iwl_priv *priv)
-{
-        if (!priv->debugfs_dir)
-                return;
-
-        debugfs_remove_recursive(priv->debugfs_dir);
-        priv->debugfs_dir = NULL;
-}
-EXPORT_SYMBOL(iwl_legacy_dbgfs_unregister);
diff --git a/drivers/net/wireless/iwlegacy/iwl-dev.h b/drivers/net/wireless/iwlegacy/iwl-dev.h
deleted file mode 100644
index 9c786edf56fd..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-dev.h
+++ /dev/null
@@ -1,1364 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-/*
- * Please use this file (iwl-dev.h) for driver implementation definitions.
- * Please use iwl-commands.h for uCode API definitions.
- * Please use iwl-4965-hw.h for hardware-related definitions.
- */
-
-#ifndef __iwl_legacy_dev_h__
-#define __iwl_legacy_dev_h__
-
-#include <linux/interrupt.h>
-#include <linux/pci.h> /* for struct pci_device_id */
-#include <linux/kernel.h>
-#include <linux/leds.h>
-#include <linux/wait.h>
-#include <net/ieee80211_radiotap.h>
-
-#include "iwl-eeprom.h"
-#include "iwl-csr.h"
-#include "iwl-prph.h"
-#include "iwl-fh.h"
-#include "iwl-debug.h"
-#include "iwl-4965-hw.h"
-#include "iwl-3945-hw.h"
-#include "iwl-led.h"
-#include "iwl-power.h"
-#include "iwl-legacy-rs.h"
-
-struct iwl_tx_queue;
-
-/* CT-KILL constants */
-#define CT_KILL_THRESHOLD_LEGACY   110 /* in Celsius */
-
-/* Default noise level to report when noise measurement is not available.
- *   This may be because we're:
- *   1)  Not associated (4965, no beacon statistics being sent to driver)
- *   2)  Scanning (noise measurement does not apply to associated channel)
- *   3)  Receiving CCK (3945 delivers noise info only for OFDM frames)
- * Use default noise value of -127 ... this is below the range of measurable
- *   Rx dBm for either 3945 or 4965, so it can indicate "unmeasurable" to user.
- *   Also, -127 works better than 0 when averaging frames with/without
- *   noise info (e.g. averaging might be done in app); measured dBm values are
- *   always negative ... using a negative value as the default keeps all
- *   averages within an s8's (used in some apps) range of negative values. */
-#define IWL_NOISE_MEAS_NOT_AVAILABLE (-127)
-
-/*
- * RTS threshold here is total size [2347] minus 4 FCS bytes
- * Per spec:
- *   a value of 0 means RTS on all data/management packets
- *   a value > max MSDU size means no RTS
- * else RTS for data/management frames where MPDU is larger
- *   than RTS value.
- */
-#define DEFAULT_RTS_THRESHOLD     2347U
-#define MIN_RTS_THRESHOLD         0U
-#define MAX_RTS_THRESHOLD         2347U
-#define MAX_MSDU_SIZE             2304U
-#define MAX_MPDU_SIZE             2346U
-#define DEFAULT_BEACON_INTERVAL   100U
-#define DEFAULT_SHORT_RETRY_LIMIT 7U
-#define DEFAULT_LONG_RETRY_LIMIT  4U
-
-struct iwl_rx_mem_buffer {
-        dma_addr_t page_dma;
-        struct page *page;
-        struct list_head list;
-};
-
-#define rxb_addr(r) page_address(r->page)
-
-/* defined below */
-struct iwl_device_cmd;
-
-struct iwl_cmd_meta {
-        /* only for SYNC commands, iff the reply skb is wanted */
-        struct iwl_host_cmd *source;
-        /*
-         * only for ASYNC commands
-         * (which is somewhat stupid -- look at iwl-sta.c for instance
-         * which duplicates a bunch of code because the callback isn't
-         * invoked for SYNC commands, if it were and its result passed
-         * through it would be simpler...)
-         */
-        void (*callback)(struct iwl_priv *priv,
-                         struct iwl_device_cmd *cmd,
-                         struct iwl_rx_packet *pkt);
-
-        /* The CMD_SIZE_HUGE flag bit indicates that the command
-         * structure is stored at the end of the shared queue memory. */
-        u32 flags;
-
-        DEFINE_DMA_UNMAP_ADDR(mapping);
-        DEFINE_DMA_UNMAP_LEN(len);
-};
-
-/*
- * Generic queue structure
- *
- * Contains common data for Rx and Tx queues
- */
-struct iwl_queue {
-        int n_bd;              /* number of BDs in this queue */
-        int write_ptr;       /* 1-st empty entry (index) host_w*/
-        int read_ptr;         /* last used entry (index) host_r*/
-        /* use for monitoring and recovering the stuck queue */
-        dma_addr_t dma_addr;   /* physical addr for BD's */
-        int n_window;          /* safe queue window */
-        u32 id;
-        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 */
-};
-
-/* One for each TFD */
-struct iwl_tx_info {
-        struct sk_buff *skb;
-        struct iwl_rxon_context *ctx;
-};
-
-/**
- * struct iwl_tx_queue - Tx Queue for DMA
- * @q: generic Rx/Tx queue descriptor
- * @bd: base of circular buffer of TFDs
- * @cmd: array of command/TX buffer pointers
- * @meta: array of meta data for each command/tx buffer
- * @dma_addr_cmd: physical address of cmd/tx buffer array
- * @txb: array of per-TFD driver data
- * @time_stamp: time (in jiffies) of last read_ptr change
- * @need_update: indicates need to update read/write index
- * @sched_retry: indicates queue is high-throughput aggregation (HT AGG) enabled
- *
- * A Tx queue consists of circular buffer of BDs (a.k.a. TFDs, transmit frame
- * descriptors) and required locking structures.
- */
-#define TFD_TX_CMD_SLOTS 256
-#define TFD_CMD_SLOTS 32
-
-struct iwl_tx_queue {
-        struct iwl_queue q;
-        void *tfds;
-        struct iwl_device_cmd **cmd;
-        struct iwl_cmd_meta *meta;
-        struct iwl_tx_info *txb;
-        unsigned long time_stamp;
-        u8 need_update;
-        u8 sched_retry;
-        u8 active;
-        u8 swq_id;
-};
-
-#define IWL_NUM_SCAN_RATES         (2)
-
-struct iwl4965_channel_tgd_info {
-        u8 type;
-        s8 max_power;
-};
-
-struct iwl4965_channel_tgh_info {
-        s64 last_radar_time;
-};
-
-#define IWL4965_MAX_RATE (33)
-
-struct iwl3945_clip_group {
-        /* maximum power level to prevent clipping for each rate, derived by
-         *   us from this band's saturation power in EEPROM */
-        const s8 clip_powers[IWL_MAX_RATES];
-};
-
-/* current Tx power values to use, one for each rate for each channel.
- * requested power is limited by:
- * -- regulatory EEPROM limits for this channel
- * -- hardware capabilities (clip-powers)
- * -- spectrum management
- * -- user preference (e.g. iwconfig)
- * when requested power is set, base power index must also be set. */
-struct iwl3945_channel_power_info {
-        struct iwl3945_tx_power tpc;    /* actual radio and DSP gain settings */
-        s8 power_table_index;   /* actual (compenst'd) index into gain table */
-        s8 base_power_index;    /* gain index for power at factory temp. */
-        s8 requested_power;     /* power (dBm) requested for this chnl/rate */
-};
-
-/* current scan Tx power values to use, one for each scan rate for each
- * channel. */
-struct iwl3945_scan_power_info {
-        struct iwl3945_tx_power tpc;    /* actual radio and DSP gain settings */
-        s8 power_table_index;   /* actual (compenst'd) index into gain table */
-        s8 requested_power;     /* scan pwr (dBm) requested for chnl/rate */
-};
-
-/*
- * One for each channel, holds all channel setup data
- * Some of the fields (e.g. eeprom and flags/max_power_avg) are redundant
- *     with one another!
- */
-struct iwl_channel_info {
-        struct iwl4965_channel_tgd_info tgd;
-        struct iwl4965_channel_tgh_info tgh;
-        struct iwl_eeprom_channel eeprom;       /* EEPROM regulatory limit */
-        struct iwl_eeprom_channel ht40_eeprom;  /* EEPROM regulatory limit for
-                                                 * HT40 channel */
-
-        u8 channel;       /* channel number */
-        u8 flags;         /* flags copied from EEPROM */
-        s8 max_power_avg; /* (dBm) regul. eeprom, normal Tx, any rate */
-        s8 curr_txpow;    /* (dBm) regulatory/spectrum/user (not h/w) limit */
-        s8 min_power;     /* always 0 */
-        s8 scan_power;    /* (dBm) regul. eeprom, direct scans, any rate */
-
-        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 */
-        enum ieee80211_band band;
-
-        /* HT40 channel info */
-        s8 ht40_max_power_avg;  /* (dBm) regul. eeprom, normal Tx, any rate */
-        u8 ht40_flags;          /* flags copied from EEPROM */
-        u8 ht40_extension_channel; /* HT_IE_EXT_CHANNEL_* */
-
-        /* Radio/DSP gain settings for each "normal" data Tx rate.
-         * These include, in addition to RF and DSP gain, a few fields for
-         *   remembering/modifying gain settings (indexes). */
-        struct iwl3945_channel_power_info power_info[IWL4965_MAX_RATE];
-
-        /* Radio/DSP gain settings for each scan rate, for directed scans. */
-        struct iwl3945_scan_power_info scan_pwr_info[IWL_NUM_SCAN_RATES];
-};
-
-#define IWL_TX_FIFO_BK          0       /* shared */
-#define IWL_TX_FIFO_BE          1
-#define IWL_TX_FIFO_VI          2       /* shared */
-#define IWL_TX_FIFO_VO          3
-#define IWL_TX_FIFO_UNUSED      -1
-
-/* Minimum number of queues. MAX_NUM is defined in hw specific files.
- * Set the minimum to accommodate the 4 standard TX queues, 1 command
- * queue, 2 (unused) HCCA queues, and 4 HT queues (one for each AC) */
-#define IWL_MIN_NUM_QUEUES      10
-
-#define IWL_DEFAULT_CMD_QUEUE_NUM       4
-
-#define IEEE80211_DATA_LEN              2304
-#define IEEE80211_4ADDR_LEN             30
-#define IEEE80211_HLEN                  (IEEE80211_4ADDR_LEN)
-#define IEEE80211_FRAME_LEN             (IEEE80211_DATA_LEN + IEEE80211_HLEN)
-
-struct iwl_frame {
-        union {
-                struct ieee80211_hdr frame;
-                struct iwl_tx_beacon_cmd beacon;
-                u8 raw[IEEE80211_FRAME_LEN];
-                u8 cmd[360];
-        } u;
-        struct list_head list;
-};
-
-#define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)
-#define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)
-#define MAX_SN ((IEEE80211_SCTL_SEQ) >> 4)
-
-enum {
-        CMD_SYNC = 0,
-        CMD_SIZE_NORMAL = 0,
-        CMD_NO_SKB = 0,
-        CMD_SIZE_HUGE = (1 << 0),
-        CMD_ASYNC = (1 << 1),
-        CMD_WANT_SKB = (1 << 2),
-        CMD_MAPPED = (1 << 3),
-};
-
-#define DEF_CMD_PAYLOAD_SIZE 320
-
-/**
- * struct iwl_device_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 iwl_device_cmd {
-        struct iwl_cmd_header hdr;      /* uCode API */
-        union {
-                u32 flags;
-                u8 val8;
-                u16 val16;
-                u32 val32;
-                struct iwl_tx_cmd tx;
-                u8 payload[DEF_CMD_PAYLOAD_SIZE];
-        } __packed cmd;
-} __packed;
-
-#define TFD_MAX_PAYLOAD_SIZE (sizeof(struct iwl_device_cmd))
-
-
-struct iwl_host_cmd {
-        const void *data;
-        unsigned long reply_page;
-        void (*callback)(struct iwl_priv *priv,
-                         struct iwl_device_cmd *cmd,
-                         struct iwl_rx_packet *pkt);
-        u32 flags;
-        u16 len;
-        u8 id;
-};
-
-#define SUP_RATE_11A_MAX_NUM_CHANNELS  8
-#define SUP_RATE_11B_MAX_NUM_CHANNELS  4
-#define SUP_RATE_11G_MAX_NUM_CHANNELS  12
-
-/**
- * struct iwl_rx_queue - Rx queue
- * @bd: driver's pointer to buffer of receive buffer descriptors (rbd)
- * @bd_dma: bus address of buffer of receive buffer descriptors (rbd)
- * @read: Shared index to newest available Rx buffer
- * @write: Shared index to oldest written Rx packet
- * @free_count: Number of pre-allocated buffers in rx_free
- * @rx_free: list of free SKBs for use
- * @rx_used: List of Rx buffers with no SKB
- * @need_update: flag to indicate we need to update read/write index
- * @rb_stts: driver's pointer to receive buffer status
- * @rb_stts_dma: bus address of receive buffer status
- *
- * NOTE:  rx_free and rx_used are used as a FIFO for iwl_rx_mem_buffers
- */
-struct iwl_rx_queue {
-        __le32 *bd;
-        dma_addr_t bd_dma;
-        struct iwl_rx_mem_buffer pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];
-        struct iwl_rx_mem_buffer *queue[RX_QUEUE_SIZE];
-        u32 read;
-        u32 write;
-        u32 free_count;
-        u32 write_actual;
-        struct list_head rx_free;
-        struct list_head rx_used;
-        int need_update;
-        struct iwl_rb_status *rb_stts;
-        dma_addr_t rb_stts_dma;
-        spinlock_t lock;
-};
-
-#define IWL_SUPPORTED_RATES_IE_LEN         8
-
-#define MAX_TID_COUNT        9
-
-#define IWL_INVALID_RATE     0xFF
-#define IWL_INVALID_VALUE    -1
-
-/**
- * struct iwl_ht_agg -- aggregation status while waiting for block-ack
- * @txq_id: Tx queue used for Tx attempt
- * @frame_count: # frames attempted by Tx command
- * @wait_for_ba: Expect block-ack before next Tx reply
- * @start_idx: Index of 1st Transmit Frame Descriptor (TFD) in Tx window
- * @bitmap0: Low order bitmap, one bit for each frame pending ACK in Tx window
- * @bitmap1: High order, one bit for each frame pending ACK in Tx window
- * @rate_n_flags: Rate at which Tx was attempted
- *
- * If REPLY_TX indicates that aggregation was attempted, driver must wait
- * for block ack (REPLY_COMPRESSED_BA).  This struct stores tx reply info
- * until block ack arrives.
- */
-struct iwl_ht_agg {
-        u16 txq_id;
-        u16 frame_count;
-        u16 wait_for_ba;
-        u16 start_idx;
-        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;
-};
-
-
-struct iwl_tid_data {
-        u16 seq_number; /* 4965 only */
-        u16 tfds_in_queue;
-        struct iwl_ht_agg agg;
-};
-
-struct iwl_hw_key {
-        u32 cipher;
-        int keylen;
-        u8 keyidx;
-        u8 key[32];
-};
-
-union iwl_ht_rate_supp {
-        u16 rates;
-        struct {
-                u8 siso_rate;
-                u8 mimo_rate;
-        };
-};
-
-#define CFG_HT_RX_AMPDU_FACTOR_8K   (0x0)
-#define CFG_HT_RX_AMPDU_FACTOR_16K  (0x1)
-#define CFG_HT_RX_AMPDU_FACTOR_32K  (0x2)
-#define CFG_HT_RX_AMPDU_FACTOR_64K  (0x3)
-#define CFG_HT_RX_AMPDU_FACTOR_DEF  CFG_HT_RX_AMPDU_FACTOR_64K
-#define CFG_HT_RX_AMPDU_FACTOR_MAX  CFG_HT_RX_AMPDU_FACTOR_64K
-#define CFG_HT_RX_AMPDU_FACTOR_MIN  CFG_HT_RX_AMPDU_FACTOR_8K
-
-/*
- * Maximal MPDU density for TX aggregation
- * 4 - 2us density
- * 5 - 4us density
- * 6 - 8us density
- * 7 - 16us density
- */
-#define CFG_HT_MPDU_DENSITY_2USEC   (0x4)
-#define CFG_HT_MPDU_DENSITY_4USEC   (0x5)
-#define CFG_HT_MPDU_DENSITY_8USEC   (0x6)
-#define CFG_HT_MPDU_DENSITY_16USEC  (0x7)
-#define CFG_HT_MPDU_DENSITY_DEF CFG_HT_MPDU_DENSITY_4USEC
-#define CFG_HT_MPDU_DENSITY_MAX CFG_HT_MPDU_DENSITY_16USEC
-#define CFG_HT_MPDU_DENSITY_MIN     (0x1)
-
-struct iwl_ht_config {
-        bool single_chain_sufficient;
-        enum ieee80211_smps_mode smps; /* current smps mode */
-};
-
-/* QoS structures */
-struct iwl_qos_info {
-        int qos_active;
-        struct iwl_qosparam_cmd def_qos_parm;
-};
-
-/*
- * Structure should be accessed with sta_lock held. When station addition
- * is in progress (IWL_STA_UCODE_INPROGRESS) it is possible to access only
- * the commands (iwl_legacy_addsta_cmd and iwl_link_quality_cmd) without
- * sta_lock held.
- */
-struct iwl_station_entry {
-        struct iwl_legacy_addsta_cmd sta;
-        struct iwl_tid_data tid[MAX_TID_COUNT];
-        u8 used, ctxid;
-        struct iwl_hw_key keyinfo;
-        struct iwl_link_quality_cmd *lq;
-};
-
-struct iwl_station_priv_common {
-        struct iwl_rxon_context *ctx;
-        u8 sta_id;
-};
-
-/*
- * iwl_station_priv: Driver's private station information
- *
- * When mac80211 creates a station it reserves some space (hw->sta_data_size)
- * in the structure for use by driver. This structure is places in that
- * space.
- *
- * The common struct MUST be first because it is shared between
- * 3945 and 4965!
- */
-struct iwl_station_priv {
-        struct iwl_station_priv_common common;
-        struct iwl_lq_sta lq_sta;
-        atomic_t pending_frames;
-        bool client;
-        bool asleep;
-};
-
-/**
- * struct iwl_vif_priv - driver's private per-interface information
- *
- * When mac80211 allocates a virtual interface, it can allocate
- * space for us to put data into.
- */
-struct iwl_vif_priv {
-        struct iwl_rxon_context *ctx;
-        u8 ibss_bssid_sta_id;
-};
-
-/* one for each uCode image (inst/data, boot/init/runtime) */
-struct fw_desc {
-        void *v_addr;           /* access by driver */
-        dma_addr_t p_addr;      /* access by card's busmaster DMA */
-        u32 len;                /* bytes */
-};
-
-/* uCode file layout */
-struct iwl_ucode_header {
-        __le32 ver;     /* major/minor/API/serial */
-        struct {
-                __le32 inst_size;       /* bytes of runtime code */
-                __le32 data_size;       /* bytes of runtime data */
-                __le32 init_size;       /* bytes of init code */
-                __le32 init_data_size;  /* bytes of init data */
-                __le32 boot_size;       /* bytes of bootstrap code */
-                u8 data[0];             /* in same order as sizes */
-        } v1;
-};
-
-struct iwl4965_ibss_seq {
-        u8 mac[ETH_ALEN];
-        u16 seq_num;
-        u16 frag_num;
-        unsigned long packet_time;
-        struct list_head list;
-};
-
-struct iwl_sensitivity_ranges {
-        u16 min_nrg_cck;
-        u16 max_nrg_cck;
-
-        u16 nrg_th_cck;
-        u16 nrg_th_ofdm;
-
-        u16 auto_corr_min_ofdm;
-        u16 auto_corr_min_ofdm_mrc;
-        u16 auto_corr_min_ofdm_x1;
-        u16 auto_corr_min_ofdm_mrc_x1;
-
-        u16 auto_corr_max_ofdm;
-        u16 auto_corr_max_ofdm_mrc;
-        u16 auto_corr_max_ofdm_x1;
-        u16 auto_corr_max_ofdm_mrc_x1;
-
-        u16 auto_corr_max_cck;
-        u16 auto_corr_max_cck_mrc;
-        u16 auto_corr_min_cck;
-        u16 auto_corr_min_cck_mrc;
-
-        u16 barker_corr_th_min;
-        u16 barker_corr_th_min_mrc;
-        u16 nrg_th_cca;
-};
-
-
-#define KELVIN_TO_CELSIUS(x) ((x)-273)
-#define CELSIUS_TO_KELVIN(x) ((x)+273)
-
-
-/**
- * struct iwl_hw_params
- * @max_txq_num: Max # Tx queues supported
- * @dma_chnl_num: Number of Tx DMA/FIFO channels
- * @scd_bc_tbls_size: size of scheduler byte count tables
- * @tfd_size: TFD size
- * @tx/rx_chains_num: Number of TX/RX chains
- * @valid_tx/rx_ant: usable antennas
- * @max_rxq_size: Max # Rx frames in Rx queue (must be power-of-2)
- * @max_rxq_log: Log-base-2 of max_rxq_size
- * @rx_page_order: Rx buffer page order
- * @rx_wrt_ptr_reg: FH{39}_RSCSR_CHNL0_WPTR
- * @max_stations:
- * @ht40_channel: is 40MHz width possible in band 2.4
- * BIT(IEEE80211_BAND_5GHZ) BIT(IEEE80211_BAND_5GHZ)
- * @sw_crypto: 0 for hw, 1 for sw
- * @max_xxx_size: for ucode uses
- * @ct_kill_threshold: temperature threshold
- * @beacon_time_tsf_bits: number of valid tsf bits for beacon time
- * @struct iwl_sensitivity_ranges: range of sensitivity values
- */
-struct iwl_hw_params {
-        u8 max_txq_num;
-        u8 dma_chnl_num;
-        u16 scd_bc_tbls_size;
-        u32 tfd_size;
-        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_page_order;
-        u32 rx_wrt_ptr_reg;
-        u8  max_stations;
-        u8  ht40_channel;
-        u8  max_beacon_itrvl;   /* in 1024 ms */
-        u32 max_inst_size;
-        u32 max_data_size;
-        u32 max_bsm_size;
-        u32 ct_kill_threshold; /* value in hw-dependent units */
-        u16 beacon_time_tsf_bits;
-        const struct iwl_sensitivity_ranges *sens;
-};
-
-
-/******************************************************************************
- *
- * Functions implemented in core module which are forward declared here
- * for use by iwl-[4-5].c
- *
- * NOTE:  The implementation of these functions are not hardware specific
- * which is why they are in the core module files.
- *
- * Naming convention --
- * iwl_         <-- Is part of iwlwifi
- * iwlXXXX_     <-- Hardware specific (implemented in iwl-XXXX.c for XXXX)
- * iwl4965_bg_      <-- Called from work queue context
- * iwl4965_mac_     <-- mac80211 callback
- *
- ****************************************************************************/
-extern void iwl4965_update_chain_flags(struct iwl_priv *priv);
-extern const u8 iwlegacy_bcast_addr[ETH_ALEN];
-extern int iwl_legacy_queue_space(const struct iwl_queue *q);
-static inline int iwl_legacy_queue_used(const struct iwl_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 iwl_legacy_get_cmd_index(struct iwl_queue *q, u32 index,
-                                                                int is_huge)
-{
-        /*
-         * This is for init calibration result and scan command which
-         * required buffer > TFD_MAX_PAYLOAD_SIZE,
-         * the big buffer at end of command array
-         */
-        if (is_huge)
-                return q->n_window;     /* must be power of 2 */
-
-        /* Otherwise, use normal size buffers */
-        return index & (q->n_window - 1);
-}
-
-
-struct iwl_dma_ptr {
-        dma_addr_t dma;
-        void *addr;
-        size_t size;
-};
-
-#define IWL_OPERATION_MODE_AUTO     0
-#define IWL_OPERATION_MODE_HT_ONLY  1
-#define IWL_OPERATION_MODE_MIXED    2
-#define IWL_OPERATION_MODE_20MHZ    3
-
-#define IWL_TX_CRC_SIZE 4
-#define IWL_TX_DELIMITER_SIZE 4
-
-#define TX_POWER_IWL_ILLEGAL_VOLTAGE -10000
-
-/* Sensitivity and chain noise calibration */
-#define INITIALIZATION_VALUE            0xFFFF
-#define IWL4965_CAL_NUM_BEACONS         20
-#define IWL_CAL_NUM_BEACONS             16
-#define MAXIMUM_ALLOWED_PATHLOSS        15
-
-#define CHAIN_NOISE_MAX_DELTA_GAIN_CODE 3
-
-#define MAX_FA_OFDM  50
-#define MIN_FA_OFDM  5
-#define MAX_FA_CCK   50
-#define MIN_FA_CCK   5
-
-#define AUTO_CORR_STEP_OFDM       1
-
-#define AUTO_CORR_STEP_CCK     3
-#define AUTO_CORR_MAX_TH_CCK   160
-
-#define NRG_DIFF               2
-#define NRG_STEP_CCK           2
-#define NRG_MARGIN             8
-#define MAX_NUMBER_CCK_NO_FA 100
-
-#define AUTO_CORR_CCK_MIN_VAL_DEF    (125)
-
-#define CHAIN_A             0
-#define CHAIN_B             1
-#define CHAIN_C             2
-#define CHAIN_NOISE_DELTA_GAIN_INIT_VAL 4
-#define ALL_BAND_FILTER                 0xFF00
-#define IN_BAND_FILTER                  0xFF
-#define MIN_AVERAGE_NOISE_MAX_VALUE     0xFFFFFFFF
-
-#define NRG_NUM_PREV_STAT_L     20
-#define NUM_RX_CHAINS           3
-
-enum iwl4965_false_alarm_state {
-        IWL_FA_TOO_MANY = 0,
-        IWL_FA_TOO_FEW = 1,
-        IWL_FA_GOOD_RANGE = 2,
-};
-
-enum iwl4965_chain_noise_state {
-        IWL_CHAIN_NOISE_ALIVE = 0,  /* must be 0 */
-        IWL_CHAIN_NOISE_ACCUMULATE,
-        IWL_CHAIN_NOISE_CALIBRATED,
-        IWL_CHAIN_NOISE_DONE,
-};
-
-enum iwl4965_calib_enabled_state {
-        IWL_CALIB_DISABLED = 0,  /* must be 0 */
-        IWL_CALIB_ENABLED = 1,
-};
-
-/*
- * enum iwl_calib
- * defines the order in which results of initial calibrations
- * should be sent to the runtime uCode
- */
-enum iwl_calib {
-        IWL_CALIB_MAX,
-};
-
-/* Opaque calibration results */
-struct iwl_calib_result {
-        void *buf;
-        size_t buf_len;
-};
-
-enum ucode_type {
-        UCODE_NONE = 0,
-        UCODE_INIT,
-        UCODE_RT
-};
-
-/* Sensitivity calib data */
-struct iwl_sensitivity_data {
-        u32 auto_corr_ofdm;
-        u32 auto_corr_ofdm_mrc;
-        u32 auto_corr_ofdm_x1;
-        u32 auto_corr_ofdm_mrc_x1;
-        u32 auto_corr_cck;
-        u32 auto_corr_cck_mrc;
-
-        u32 last_bad_plcp_cnt_ofdm;
-        u32 last_fa_cnt_ofdm;
-        u32 last_bad_plcp_cnt_cck;
-        u32 last_fa_cnt_cck;
-
-        u32 nrg_curr_state;
-        u32 nrg_prev_state;
-        u32 nrg_value[10];
-        u8  nrg_silence_rssi[NRG_NUM_PREV_STAT_L];
-        u32 nrg_silence_ref;
-        u32 nrg_energy_idx;
-        u32 nrg_silence_idx;
-        u32 nrg_th_cck;
-        s32 nrg_auto_corr_silence_diff;
-        u32 num_in_cck_no_fa;
-        u32 nrg_th_ofdm;
-
-        u16 barker_corr_th_min;
-        u16 barker_corr_th_min_mrc;
-        u16 nrg_th_cca;
-};
-
-/* Chain noise (differential Rx gain) calib data */
-struct iwl_chain_noise_data {
-        u32 active_chains;
-        u32 chain_noise_a;
-        u32 chain_noise_b;
-        u32 chain_noise_c;
-        u32 chain_signal_a;
-        u32 chain_signal_b;
-        u32 chain_signal_c;
-        u16 beacon_count;
-        u8 disconn_array[NUM_RX_CHAINS];
-        u8 delta_gain_code[NUM_RX_CHAINS];
-        u8 radio_write;
-        u8 state;
-};
-
-#define EEPROM_SEM_TIMEOUT 10           /* milliseconds */
-#define EEPROM_SEM_RETRY_LIMIT 1000     /* number of attempts (not time) */
-
-#define IWL_TRAFFIC_ENTRIES     (256)
-#define IWL_TRAFFIC_ENTRY_SIZE  (64)
-
-enum {
-        MEASUREMENT_READY = (1 << 0),
-        MEASUREMENT_ACTIVE = (1 << 1),
-};
-
-/* interrupt statistics */
-struct isr_statistics {
-        u32 hw;
-        u32 sw;
-        u32 err_code;
-        u32 sch;
-        u32 alive;
-        u32 rfkill;
-        u32 ctkill;
-        u32 wakeup;
-        u32 rx;
-        u32 rx_handlers[REPLY_MAX];
-        u32 tx;
-        u32 unhandled;
-};
-
-/* management statistics */
-enum iwl_mgmt_stats {
-        MANAGEMENT_ASSOC_REQ = 0,
-        MANAGEMENT_ASSOC_RESP,
-        MANAGEMENT_REASSOC_REQ,
-        MANAGEMENT_REASSOC_RESP,
-        MANAGEMENT_PROBE_REQ,
-        MANAGEMENT_PROBE_RESP,
-        MANAGEMENT_BEACON,
-        MANAGEMENT_ATIM,
-        MANAGEMENT_DISASSOC,
-        MANAGEMENT_AUTH,
-        MANAGEMENT_DEAUTH,
-        MANAGEMENT_ACTION,
-        MANAGEMENT_MAX,
-};
-/* control statistics */
-enum iwl_ctrl_stats {
-        CONTROL_BACK_REQ =  0,
-        CONTROL_BACK,
-        CONTROL_PSPOLL,
-        CONTROL_RTS,
-        CONTROL_CTS,
-        CONTROL_ACK,
-        CONTROL_CFEND,
-        CONTROL_CFENDACK,
-        CONTROL_MAX,
-};
-
-struct traffic_stats {
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
-        u32 mgmt[MANAGEMENT_MAX];
-        u32 ctrl[CONTROL_MAX];
-        u32 data_cnt;
-        u64 data_bytes;
-#endif
-};
-
-/*
- * host interrupt timeout value
- * used with setting interrupt coalescing timer
- * the CSR_INT_COALESCING is an 8 bit register in 32-usec unit
- *
- * default interrupt coalescing timer is 64 x 32 = 2048 usecs
- * default interrupt coalescing calibration timer is 16 x 32 = 512 usecs
- */
-#define IWL_HOST_INT_TIMEOUT_MAX        (0xFF)
-#define IWL_HOST_INT_TIMEOUT_DEF        (0x40)
-#define IWL_HOST_INT_TIMEOUT_MIN        (0x0)
-#define IWL_HOST_INT_CALIB_TIMEOUT_MAX  (0xFF)
-#define IWL_HOST_INT_CALIB_TIMEOUT_DEF  (0x10)
-#define IWL_HOST_INT_CALIB_TIMEOUT_MIN  (0x0)
-
-#define IWL_DELAY_NEXT_FORCE_FW_RELOAD (HZ*5)
-
-/* TX queue watchdog timeouts in mSecs */
-#define IWL_DEF_WD_TIMEOUT      (2000)
-#define IWL_LONG_WD_TIMEOUT     (10000)
-#define IWL_MAX_WD_TIMEOUT      (120000)
-
-struct iwl_force_reset {
-        int reset_request_count;
-        int reset_success_count;
-        int reset_reject_count;
-        unsigned long reset_duration;
-        unsigned long last_force_reset_jiffies;
-};
-
-/* extend beacon time format bit shifting  */
-/*
- * for _3945 devices
- * bits 31:24 - extended
- * bits 23:0  - interval
- */
-#define IWL3945_EXT_BEACON_TIME_POS     24
-/*
- * for _4965 devices
- * bits 31:22 - extended
- * bits 21:0  - interval
- */
-#define IWL4965_EXT_BEACON_TIME_POS     22
-
-enum iwl_rxon_context_id {
-        IWL_RXON_CTX_BSS,
-
-        NUM_IWL_RXON_CTX
-};
-
-struct iwl_rxon_context {
-        struct ieee80211_vif *vif;
-
-        const u8 *ac_to_fifo;
-        const u8 *ac_to_queue;
-        u8 mcast_queue;
-
-        /*
-         * We could use the vif to indicate active, but we
-         * also need it to be active during disabling when
-         * we already removed the vif for type setting.
-         */
-        bool always_active, is_active;
-
-        bool ht_need_multiple_chains;
-
-        enum iwl_rxon_context_id ctxid;
-
-        u32 interface_modes, exclusive_interface_modes;
-        u8 unused_devtype, ap_devtype, ibss_devtype, station_devtype;
-
-        /*
-         * We declare this const so it can only be
-         * changed via explicit cast within the
-         * routines that actually update the physical
-         * hardware.
-         */
-        const struct iwl_legacy_rxon_cmd active;
-        struct iwl_legacy_rxon_cmd staging;
-
-        struct iwl_rxon_time_cmd timing;
-
-        struct iwl_qos_info qos_data;
-
-        u8 bcast_sta_id, ap_sta_id;
-
-        u8 rxon_cmd, rxon_assoc_cmd, rxon_timing_cmd;
-        u8 qos_cmd;
-        u8 wep_key_cmd;
-
-        struct iwl_wep_key wep_keys[WEP_KEYS_MAX];
-        u8 key_mapping_keys;
-
-        __le32 station_flags;
-
-        struct {
-                bool non_gf_sta_present;
-                u8 protection;
-                bool enabled, is_40mhz;
-                u8 extension_chan_offset;
-        } ht;
-};
-
-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;
-
-        enum ieee80211_band band;
-        int alloc_rxb_page;
-
-        void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,
-                                       struct iwl_rx_mem_buffer *rxb);
-
-        struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
-
-        /* spectrum measurement report caching */
-        struct iwl_spectrum_notification measure_report;
-        u8 measurement_status;
-
-        /* ucode beacon time */
-        u32 ucode_beacon_time;
-        int missed_beacon_threshold;
-
-        /* track IBSS manager (last beacon) status */
-        u32 ibss_manager;
-
-        /* force reset */
-        struct iwl_force_reset force_reset;
-
-        /* we allocate array of iwl_channel_info for NIC's valid channels.
-         *    Access via channel # using indirect index array */
-        struct iwl_channel_info *channel_info;  /* channel info array */
-        u8 channel_count;       /* # of channels */
-
-        /* thermal calibration */
-        s32 temperature;        /* degrees Kelvin */
-        s32 last_temperature;
-
-        /* init calibration results */
-        struct iwl_calib_result calib_results[IWL_CALIB_MAX];
-
-        /* Scan related variables */
-        unsigned long scan_start;
-        unsigned long scan_start_tsf;
-        void *scan_cmd;
-        enum ieee80211_band scan_band;
-        struct cfg80211_scan_request *scan_request;
-        struct ieee80211_vif *scan_vif;
-        u8 scan_tx_ant[IEEE80211_NUM_BANDS];
-        u8 mgmt_tx_ant;
-
-        /* spinlock */
-        spinlock_t lock;        /* protect general shared data */
-        spinlock_t hcmd_lock;   /* protect hcmd */
-        spinlock_t reg_lock;    /* protect hw register access */
-        struct mutex mutex;
-
-        /* basic pci-network driver stuff */
-        struct pci_dev *pci_dev;
-
-        /* pci hardware address support */
-        void __iomem *hw_base;
-        u32  hw_rev;
-        u32  hw_wa_rev;
-        u8   rev_id;
-
-        /* microcode/device supports multiple contexts */
-        u8 valid_contexts;
-
-        /* command queue number */
-        u8 cmd_queue;
-
-        /* max number of station keys */
-        u8 sta_key_max_num;
-
-        /* EEPROM MAC addresses */
-        struct mac_address addresses[1];
-
-        /* uCode images, save to reload in case of failure */
-        int fw_index;                   /* firmware we're trying to load */
-        u32 ucode_ver;                  /* version of ucode, copy of
-                                           iwl_ucode.ver */
-        struct fw_desc ucode_code;      /* runtime inst */
-        struct fw_desc ucode_data;      /* runtime data original */
-        struct fw_desc ucode_data_backup;       /* runtime data save/restore */
-        struct fw_desc ucode_init;      /* initialization inst */
-        struct fw_desc ucode_init_data; /* initialization data */
-        struct fw_desc ucode_boot;      /* bootstrap inst */
-        enum ucode_type ucode_type;
-        u8 ucode_write_complete;        /* the image write is complete */
-        char firmware_name[25];
-
-        struct iwl_rxon_context contexts[NUM_IWL_RXON_CTX];
-
-        __le16 switch_channel;
-
-        /* 1st responses from initialize and runtime uCode images.
-         * _4965's initialize alive response contains some calibration data. */
-        struct iwl_init_alive_resp card_alive_init;
-        struct iwl_alive_resp card_alive;
-
-        u16 active_rate;
-
-        u8 start_calib;
-        struct iwl_sensitivity_data sensitivity_data;
-        struct iwl_chain_noise_data chain_noise_data;
-        __le16 sensitivity_tbl[HD_TABLE_SIZE];
-
-        struct iwl_ht_config current_ht_config;
-
-        /* Rate scaling data */
-        u8 retry_rate;
-
-        wait_queue_head_t wait_command_queue;
-
-        int activity_timer_active;
-
-        /* Rx and Tx DMA processing queues */
-        struct iwl_rx_queue rxq;
-        struct iwl_tx_queue *txq;
-        unsigned long txq_ctx_active_msk;
-        struct iwl_dma_ptr  kw; /* keep warm address */
-        struct iwl_dma_ptr  scd_bc_tbls;
-
-        u32 scd_base_addr;      /* scheduler sram base address */
-
-        unsigned long status;
-
-        /* counts mgmt, ctl, and data packets */
-        struct traffic_stats tx_stats;
-        struct traffic_stats rx_stats;
-
-        /* counts interrupts */
-        struct isr_statistics isr_stats;
-
-        struct iwl_power_mgr power_data;
-
-        /* context information */
-        u8 bssid[ETH_ALEN]; /* used only on 3945 but filled by core */
-
-        /* station table variables */
-
-        /* Note: if lock and sta_lock are needed, lock must be acquired first */
-        spinlock_t sta_lock;
-        int num_stations;
-        struct iwl_station_entry stations[IWL_STATION_COUNT];
-        unsigned long ucode_key_table;
-
-        /* queue refcounts */
-#define IWL_MAX_HW_QUEUES       32
-        unsigned long queue_stopped[BITS_TO_LONGS(IWL_MAX_HW_QUEUES)];
-        /* for each AC */
-        atomic_t queue_stop_count[4];
-
-        /* Indication if ieee80211_ops->open has been called */
-        u8 is_open;
-
-        u8 mac80211_registered;
-
-        /* eeprom -- this is in the card's little endian byte order */
-        u8 *eeprom;
-        struct iwl_eeprom_calib_info *calib_info;
-
-        enum nl80211_iftype iw_mode;
-
-        /* Last Rx'd beacon timestamp */
-        u64 timestamp;
-
-        union {
-#if defined(CONFIG_IWL3945) || defined(CONFIG_IWL3945_MODULE)
-                struct {
-                        void *shared_virt;
-                        dma_addr_t shared_phys;
-
-                        struct delayed_work thermal_periodic;
-                        struct delayed_work rfkill_poll;
-
-                        struct iwl3945_notif_statistics statistics;
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
-                        struct iwl3945_notif_statistics accum_statistics;
-                        struct iwl3945_notif_statistics delta_statistics;
-                        struct iwl3945_notif_statistics max_delta;
-#endif
-
-                        u32 sta_supp_rates;
-                        int last_rx_rssi;       /* From Rx packet statistics */
-
-                        /* Rx'd packet timing information */
-                        u32 last_beacon_time;
-                        u64 last_tsf;
-
-                        /*
-                         * each calibration channel group in the
-                         * EEPROM has a derived clip setting for
-                         * each rate.
-                         */
-                        const struct iwl3945_clip_group clip_groups[5];
-
-                } _3945;
-#endif
-#if defined(CONFIG_IWL4965) || defined(CONFIG_IWL4965_MODULE)
-                struct {
-                        struct iwl_rx_phy_res last_phy_res;
-                        bool last_phy_res_valid;
-
-                        struct completion firmware_loading_complete;
-
-                        /*
-                         * chain noise reset and gain commands are the
-                         * two extra calibration commands follows the standard
-                         * phy calibration commands
-                         */
-                        u8 phy_calib_chain_noise_reset_cmd;
-                        u8 phy_calib_chain_noise_gain_cmd;
-
-                        struct iwl_notif_statistics statistics;
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
-                        struct iwl_notif_statistics accum_statistics;
-                        struct iwl_notif_statistics delta_statistics;
-                        struct iwl_notif_statistics max_delta;
-#endif
-
-                } _4965;
-#endif
-        };
-
-        struct iwl_hw_params hw_params;
-
-        u32 inta_mask;
-
-        struct workqueue_struct *workqueue;
-
-        struct work_struct restart;
-        struct work_struct scan_completed;
-        struct work_struct rx_replenish;
-        struct work_struct abort_scan;
-
-        struct iwl_rxon_context *beacon_ctx;
-        struct sk_buff *beacon_skb;
-
-        struct work_struct tx_flush;
-
-        struct tasklet_struct irq_tasklet;
-
-        struct delayed_work init_alive_start;
-        struct delayed_work alive_start;
-        struct delayed_work scan_check;
-
-        /* TX Power */
-        s8 tx_power_user_lmt;
-        s8 tx_power_device_lmt;
-        s8 tx_power_next;
-
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        /* debugging info */
-        u32 debug_level; /* per device debugging will override global
-                            iwlegacy_debug_level if set */
-#endif /* CONFIG_IWLWIFI_LEGACY_DEBUG */
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
-        /* debugfs */
-        u16 tx_traffic_idx;
-        u16 rx_traffic_idx;
-        u8 *tx_traffic;
-        u8 *rx_traffic;
-        struct dentry *debugfs_dir;
-        u32 dbgfs_sram_offset, dbgfs_sram_len;
-        bool disable_ht40;
-#endif /* CONFIG_IWLWIFI_LEGACY_DEBUGFS */
-
-        struct work_struct txpower_work;
-        u32 disable_sens_cal;
-        u32 disable_chain_noise_cal;
-        u32 disable_tx_power_cal;
-        struct work_struct run_time_calib_work;
-        struct timer_list statistics_periodic;
-        struct timer_list watchdog;
-        bool hw_ready;
-
-        struct led_classdev led;
-        unsigned long blink_on, blink_off;
-        bool led_registered;
-}; /*iwl_priv */
-
-static inline void iwl_txq_ctx_activate(struct iwl_priv *priv, int txq_id)
-{
-        set_bit(txq_id, &priv->txq_ctx_active_msk);
-}
-
-static inline void iwl_txq_ctx_deactivate(struct iwl_priv *priv, int txq_id)
-{
-        clear_bit(txq_id, &priv->txq_ctx_active_msk);
-}
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-/*
- * iwl_legacy_get_debug_level: Return active debug level for device
- *
- * Using sysfs it is possible to set per device debug level. This debug
- * level will be used if set, otherwise the global debug level which can be
- * set via module parameter is used.
- */
-static inline u32 iwl_legacy_get_debug_level(struct iwl_priv *priv)
-{
-        if (priv->debug_level)
-                return priv->debug_level;
-        else
-                return iwlegacy_debug_level;
-}
-#else
-static inline u32 iwl_legacy_get_debug_level(struct iwl_priv *priv)
-{
-        return iwlegacy_debug_level;
-}
-#endif
-
-
-static inline struct ieee80211_hdr *
-iwl_legacy_tx_queue_get_hdr(struct iwl_priv *priv,
-                                                 int txq_id, int idx)
-{
-        if (priv->txq[txq_id].txb[idx].skb)
-                return (struct ieee80211_hdr *)priv->txq[txq_id].
-                                txb[idx].skb->data;
-        return NULL;
-}
-
-static inline struct iwl_rxon_context *
-iwl_legacy_rxon_ctx_from_vif(struct ieee80211_vif *vif)
-{
-        struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
-
-        return vif_priv->ctx;
-}
-
-#define for_each_context(priv, ctx)                             \
-        for (ctx = &priv->contexts[IWL_RXON_CTX_BSS];           \
-             ctx < &priv->contexts[NUM_IWL_RXON_CTX]; ctx++)    \
-                if (priv->valid_contexts & BIT(ctx->ctxid))
-
-static inline int iwl_legacy_is_associated(struct iwl_priv *priv,
-                                    enum iwl_rxon_context_id ctxid)
-{
-        return (priv->contexts[ctxid].active.filter_flags &
-                        RXON_FILTER_ASSOC_MSK) ? 1 : 0;
-}
-
-static inline int iwl_legacy_is_any_associated(struct iwl_priv *priv)
-{
-        return iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS);
-}
-
-static inline int iwl_legacy_is_associated_ctx(struct iwl_rxon_context *ctx)
-{
-        return (ctx->active.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0;
-}
-
-static inline int iwl_legacy_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 iwl_legacy_is_channel_radar(const struct iwl_channel_info *ch_info)
-{
-        return (ch_info->flags & EEPROM_CHANNEL_RADAR) ? 1 : 0;
-}
-
-static inline u8 iwl_legacy_is_channel_a_band(const struct iwl_channel_info *ch_info)
-{
-        return ch_info->band == IEEE80211_BAND_5GHZ;
-}
-
-static inline int
-iwl_legacy_is_channel_passive(const struct iwl_channel_info *ch)
-{
-        return (!(ch->flags & EEPROM_CHANNEL_ACTIVE)) ? 1 : 0;
-}
-
-static inline int
-iwl_legacy_is_channel_ibss(const struct iwl_channel_info *ch)
-{
-        return (ch->flags & EEPROM_CHANNEL_IBSS) ? 1 : 0;
-}
-
-static inline void
-__iwl_legacy_free_pages(struct iwl_priv *priv, struct page *page)
-{
-        __free_pages(page, priv->hw_params.rx_page_order);
-        priv->alloc_rxb_page--;
-}
-
-static inline void iwl_legacy_free_pages(struct iwl_priv *priv, unsigned long page)
-{
-        free_pages(page, priv->hw_params.rx_page_order);
-        priv->alloc_rxb_page--;
-}
-#endif                          /* __iwl_legacy_dev_h__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-devtrace.c b/drivers/net/wireless/iwlegacy/iwl-devtrace.c
deleted file mode 100644
index acec99197ce0..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-devtrace.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2009 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-
-#include <linux/module.h>
-
-/* sparse doesn't like tracepoint macros */
-#ifndef __CHECKER__
-#include "iwl-dev.h"
-
-#define CREATE_TRACE_POINTS
-#include "iwl-devtrace.h"
-
-EXPORT_TRACEPOINT_SYMBOL(iwlwifi_legacy_dev_iowrite8);
-EXPORT_TRACEPOINT_SYMBOL(iwlwifi_legacy_dev_ioread32);
-EXPORT_TRACEPOINT_SYMBOL(iwlwifi_legacy_dev_iowrite32);
-EXPORT_TRACEPOINT_SYMBOL(iwlwifi_legacy_dev_rx);
-EXPORT_TRACEPOINT_SYMBOL(iwlwifi_legacy_dev_tx);
-EXPORT_TRACEPOINT_SYMBOL(iwlwifi_legacy_dev_ucode_error);
-#endif
diff --git a/drivers/net/wireless/iwlegacy/iwl-devtrace.h b/drivers/net/wireless/iwlegacy/iwl-devtrace.h
deleted file mode 100644
index a443725ba6be..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-devtrace.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2009 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-
-#if !defined(__IWLWIFI_LEGACY_DEVICE_TRACE) || defined(TRACE_HEADER_MULTI_READ)
-#define __IWLWIFI_LEGACY_DEVICE_TRACE
-
-#include <linux/tracepoint.h>
-
-#if !defined(CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING) || defined(__CHECKER__)
-#undef TRACE_EVENT
-#define TRACE_EVENT(name, proto, ...) \
-static inline void trace_ ## name(proto) {}
-#endif
-
-
-#define PRIV_ENTRY      __field(struct iwl_priv *, priv)
-#define PRIV_ASSIGN     (__entry->priv = priv)
-
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM iwlwifi_legacy_io
-
-TRACE_EVENT(iwlwifi_legacy_dev_ioread32,
-        TP_PROTO(struct iwl_priv *priv, u32 offs, u32 val),
-        TP_ARGS(priv, offs, val),
-        TP_STRUCT__entry(
-                PRIV_ENTRY
-                __field(u32, offs)
-                __field(u32, val)
-        ),
-        TP_fast_assign(
-                PRIV_ASSIGN;
-                __entry->offs = offs;
-                __entry->val = val;
-        ),
-        TP_printk("[%p] read io[%#x] = %#x", __entry->priv,
-                                        __entry->offs, __entry->val)
-);
-
-TRACE_EVENT(iwlwifi_legacy_dev_iowrite8,
-        TP_PROTO(struct iwl_priv *priv, u32 offs, u8 val),
-        TP_ARGS(priv, offs, val),
-        TP_STRUCT__entry(
-                PRIV_ENTRY
-                __field(u32, offs)
-                __field(u8, val)
-        ),
-        TP_fast_assign(
-                PRIV_ASSIGN;
-                __entry->offs = offs;
-                __entry->val = val;
-        ),
-        TP_printk("[%p] write io[%#x] = %#x)", __entry->priv,
-                                        __entry->offs, __entry->val)
-);
-
-TRACE_EVENT(iwlwifi_legacy_dev_iowrite32,
-        TP_PROTO(struct iwl_priv *priv, u32 offs, u32 val),
-        TP_ARGS(priv, offs, val),
-        TP_STRUCT__entry(
-                PRIV_ENTRY
-                __field(u32, offs)
-                __field(u32, val)
-        ),
-        TP_fast_assign(
-                PRIV_ASSIGN;
-                __entry->offs = offs;
-                __entry->val = val;
-        ),
-        TP_printk("[%p] write io[%#x] = %#x)", __entry->priv,
-                                        __entry->offs, __entry->val)
-);
-
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM iwlwifi_legacy_ucode
-
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM iwlwifi
-
-TRACE_EVENT(iwlwifi_legacy_dev_hcmd,
-        TP_PROTO(struct iwl_priv *priv, void *hcmd, size_t len, u32 flags),
-        TP_ARGS(priv, hcmd, len, flags),
-        TP_STRUCT__entry(
-                PRIV_ENTRY
-                __dynamic_array(u8, hcmd, len)
-                __field(u32, flags)
-        ),
-        TP_fast_assign(
-                PRIV_ASSIGN;
-                memcpy(__get_dynamic_array(hcmd), hcmd, len);
-                __entry->flags = flags;
-        ),
-        TP_printk("[%p] hcmd %#.2x (%ssync)",
-                  __entry->priv, ((u8 *)__get_dynamic_array(hcmd))[0],
-                  __entry->flags & CMD_ASYNC ? "a" : "")
-);
-
-TRACE_EVENT(iwlwifi_legacy_dev_rx,
-        TP_PROTO(struct iwl_priv *priv, void *rxbuf, size_t len),
-        TP_ARGS(priv, rxbuf, len),
-        TP_STRUCT__entry(
-                PRIV_ENTRY
-                __dynamic_array(u8, rxbuf, len)
-        ),
-        TP_fast_assign(
-                PRIV_ASSIGN;
-                memcpy(__get_dynamic_array(rxbuf), rxbuf, len);
-        ),
-        TP_printk("[%p] RX cmd %#.2x",
-                  __entry->priv, ((u8 *)__get_dynamic_array(rxbuf))[4])
-);
-
-TRACE_EVENT(iwlwifi_legacy_dev_tx,
-        TP_PROTO(struct iwl_priv *priv, void *tfd, size_t tfdlen,
-                 void *buf0, size_t buf0_len,
-                 void *buf1, size_t buf1_len),
-        TP_ARGS(priv, tfd, tfdlen, buf0, buf0_len, buf1, buf1_len),
-        TP_STRUCT__entry(
-                PRIV_ENTRY
-
-                __field(size_t, framelen)
-                __dynamic_array(u8, tfd, tfdlen)
-
-                /*
-                 * Do not insert between or below these items,
-                 * we want to keep the frame together (except
-                 * for the possible padding).
-                 */
-                __dynamic_array(u8, buf0, buf0_len)
-                __dynamic_array(u8, buf1, buf1_len)
-        ),
-        TP_fast_assign(
-                PRIV_ASSIGN;
-                __entry->framelen = buf0_len + buf1_len;
-                memcpy(__get_dynamic_array(tfd), tfd, tfdlen);
-                memcpy(__get_dynamic_array(buf0), buf0, buf0_len);
-                memcpy(__get_dynamic_array(buf1), buf1, buf1_len);
-        ),
-        TP_printk("[%p] TX %.2x (%zu bytes)",
-                  __entry->priv,
-                  ((u8 *)__get_dynamic_array(buf0))[0],
-                  __entry->framelen)
-);
-
-TRACE_EVENT(iwlwifi_legacy_dev_ucode_error,
-        TP_PROTO(struct iwl_priv *priv, u32 desc, u32 time,
-                 u32 data1, u32 data2, u32 line, u32 blink1,
-                 u32 blink2, u32 ilink1, u32 ilink2),
-        TP_ARGS(priv, desc, time, data1, data2, line,
-                blink1, blink2, ilink1, ilink2),
-        TP_STRUCT__entry(
-                PRIV_ENTRY
-                __field(u32, desc)
-                __field(u32, time)
-                __field(u32, data1)
-                __field(u32, data2)
-                __field(u32, line)
-                __field(u32, blink1)
-                __field(u32, blink2)
-                __field(u32, ilink1)
-                __field(u32, ilink2)
-        ),
-        TP_fast_assign(
-                PRIV_ASSIGN;
-                __entry->desc = desc;
-                __entry->time = time;
-                __entry->data1 = data1;
-                __entry->data2 = data2;
-                __entry->line = line;
-                __entry->blink1 = blink1;
-                __entry->blink2 = blink2;
-                __entry->ilink1 = ilink1;
-                __entry->ilink2 = ilink2;
-        ),
-        TP_printk("[%p] #%02d %010u data 0x%08X 0x%08X line %u, "
-                  "blink 0x%05X 0x%05X ilink 0x%05X 0x%05X",
-                  __entry->priv, __entry->desc, __entry->time, __entry->data1,
-                  __entry->data2, __entry->line, __entry->blink1,
-                  __entry->blink2, __entry->ilink1, __entry->ilink2)
-);
-
-#endif /* __IWLWIFI_DEVICE_TRACE */
-
-#undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH .
-#undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_FILE iwl-devtrace
-#include <trace/define_trace.h>
diff --git a/drivers/net/wireless/iwlegacy/iwl-eeprom.c b/drivers/net/wireless/iwlegacy/iwl-eeprom.c
deleted file mode 100644
index 5bf3f49b74ab..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-eeprom.c
+++ /dev/null
@@ -1,553 +0,0 @@
-/******************************************************************************
- *
- * 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 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2011 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/slab.h>
-#include <linux/init.h>
-
-#include <net/mac80211.h>
-
-#include "iwl-commands.h"
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-debug.h"
-#include "iwl-eeprom.h"
-#include "iwl-io.h"
-
-/************************** EEPROM BANDS ****************************
- *
- * The iwlegacy_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 iwlegacy_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 iwlegacy_eeprom_band_2[] = {    /* 4915-5080MHz */
-        183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16
-};
-
-static const u8 iwlegacy_eeprom_band_3[] = {    /* 5170-5320MHz */
-        34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64
-};
-
-static const u8 iwlegacy_eeprom_band_4[] = {    /* 5500-5700MHz */
-        100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140
-};
-
-static const u8 iwlegacy_eeprom_band_5[] = {    /* 5725-5825MHz */
-        145, 149, 153, 157, 161, 165
-};
-
-static const u8 iwlegacy_eeprom_band_6[] = {       /* 2.4 ht40 channel */
-        1, 2, 3, 4, 5, 6, 7
-};
-
-static const u8 iwlegacy_eeprom_band_7[] = {       /* 5.2 ht40 channel */
-        36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157
-};
-
-/******************************************************************************
- *
- * EEPROM related functions
- *
-******************************************************************************/
-
-static int iwl_legacy_eeprom_verify_signature(struct iwl_priv *priv)
-{
-        u32 gp = iwl_read32(priv, CSR_EEPROM_GP) & CSR_EEPROM_GP_VALID_MSK;
-        int ret = 0;
-
-        IWL_DEBUG_EEPROM(priv, "EEPROM signature=0x%08x\n", gp);
-        switch (gp) {
-        case CSR_EEPROM_GP_GOOD_SIG_EEP_LESS_THAN_4K:
-        case CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K:
-                break;
-        default:
-                IWL_ERR(priv, "bad EEPROM signature,"
-                        "EEPROM_GP=0x%08x\n", gp);
-                ret = -ENOENT;
-                break;
-        }
-        return ret;
-}
-
-const u8
-*iwl_legacy_eeprom_query_addr(const struct iwl_priv *priv, size_t offset)
-{
-        BUG_ON(offset >= priv->cfg->base_params->eeprom_size);
-        return &priv->eeprom[offset];
-}
-EXPORT_SYMBOL(iwl_legacy_eeprom_query_addr);
-
-u16 iwl_legacy_eeprom_query16(const struct iwl_priv *priv, size_t offset)
-{
-        if (!priv->eeprom)
-                return 0;
-        return (u16)priv->eeprom[offset] | ((u16)priv->eeprom[offset + 1] << 8);
-}
-EXPORT_SYMBOL(iwl_legacy_eeprom_query16);
-
-/**
- * iwl_legacy_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_legacy_eeprom_init(struct iwl_priv *priv)
-{
-        __le16 *e;
-        u32 gp = iwl_read32(priv, CSR_EEPROM_GP);
-        int sz;
-        int ret;
-        u16 addr;
-
-        /* allocate eeprom */
-        sz = priv->cfg->base_params->eeprom_size;
-        IWL_DEBUG_EEPROM(priv, "NVM size = %d\n", sz);
-        priv->eeprom = kzalloc(sz, GFP_KERNEL);
-        if (!priv->eeprom) {
-                ret = -ENOMEM;
-                goto alloc_err;
-        }
-        e = (__le16 *)priv->eeprom;
-
-        priv->cfg->ops->lib->apm_ops.init(priv);
-
-        ret = iwl_legacy_eeprom_verify_signature(priv);
-        if (ret < 0) {
-                IWL_ERR(priv, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);
-                ret = -ENOENT;
-                goto err;
-        }
-
-        /* 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_ERR(priv, "Failed to acquire EEPROM semaphore.\n");
-                ret = -ENOENT;
-                goto err;
-        }
-
-        /* eeprom is an array of 16bit values */
-        for (addr = 0; addr < sz; addr += sizeof(u16)) {
-                u32 r;
-
-                _iwl_legacy_write32(priv, CSR_EEPROM_REG,
-                             CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
-
-                ret = iwl_poll_bit(priv, CSR_EEPROM_REG,
-                                          CSR_EEPROM_REG_READ_VALID_MSK,
-                                          CSR_EEPROM_REG_READ_VALID_MSK,
-                                          IWL_EEPROM_ACCESS_TIMEOUT);
-                if (ret < 0) {
-                        IWL_ERR(priv, "Time out reading EEPROM[%d]\n",
-                                                        addr);
-                        goto done;
-                }
-                r = _iwl_legacy_read_direct32(priv, CSR_EEPROM_REG);
-                e[addr / 2] = cpu_to_le16(r >> 16);
-        }
-
-        IWL_DEBUG_EEPROM(priv, "NVM Type: %s, version: 0x%x\n",
-                       "EEPROM",
-                       iwl_legacy_eeprom_query16(priv, EEPROM_VERSION));
-
-        ret = 0;
-done:
-        priv->cfg->ops->lib->eeprom_ops.release_semaphore(priv);
-
-err:
-        if (ret)
-                iwl_legacy_eeprom_free(priv);
-        /* Reset chip to save power until we load uCode during "up". */
-        iwl_legacy_apm_stop(priv);
-alloc_err:
-        return ret;
-}
-EXPORT_SYMBOL(iwl_legacy_eeprom_init);
-
-void iwl_legacy_eeprom_free(struct iwl_priv *priv)
-{
-        kfree(priv->eeprom);
-        priv->eeprom = NULL;
-}
-EXPORT_SYMBOL(iwl_legacy_eeprom_free);
-
-static void iwl_legacy_init_band_reference(const struct iwl_priv *priv,
-                        int eep_band, int *eeprom_ch_count,
-                        const struct iwl_eeprom_channel **eeprom_ch_info,
-                        const u8 **eeprom_ch_index)
-{
-        u32 offset = priv->cfg->ops->lib->
-                        eeprom_ops.regulatory_bands[eep_band - 1];
-        switch (eep_band) {
-        case 1:         /* 2.4GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_1);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_legacy_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwlegacy_eeprom_band_1;
-                break;
-        case 2:         /* 4.9GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_2);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_legacy_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwlegacy_eeprom_band_2;
-                break;
-        case 3:         /* 5.2GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_3);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_legacy_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwlegacy_eeprom_band_3;
-                break;
-        case 4:         /* 5.5GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_4);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_legacy_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwlegacy_eeprom_band_4;
-                break;
-        case 5:         /* 5.7GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_5);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_legacy_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwlegacy_eeprom_band_5;
-                break;
-        case 6:         /* 2.4GHz ht40 channels */
-                *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_6);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_legacy_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwlegacy_eeprom_band_6;
-                break;
-        case 7:         /* 5 GHz ht40 channels */
-                *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_7);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_legacy_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwlegacy_eeprom_band_7;
-                break;
-        default:
-                BUG();
-        }
-}
-
-#define CHECK_AND_PRINT(x) ((eeprom_ch->flags & EEPROM_CHANNEL_##x) \
-                            ? # x " " : "")
-/**
- * iwl_legacy_mod_ht40_chan_info - Copy ht40 channel info into driver's priv.
- *
- * Does not set up a command, or touch hardware.
- */
-static int iwl_legacy_mod_ht40_chan_info(struct iwl_priv *priv,
-                              enum ieee80211_band band, u16 channel,
-                              const struct iwl_eeprom_channel *eeprom_ch,
-                              u8 clear_ht40_extension_channel)
-{
-        struct iwl_channel_info *ch_info;
-
-        ch_info = (struct iwl_channel_info *)
-                        iwl_legacy_get_channel_info(priv, band, channel);
-
-        if (!iwl_legacy_is_channel_valid(ch_info))
-                return -1;
-
-        IWL_DEBUG_EEPROM(priv, "HT40 Ch. %d [%sGHz] %s%s%s%s%s(0x%02x %ddBm):"
-                        " Ad-Hoc %ssupported\n",
-                        ch_info->channel,
-                        iwl_legacy_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(DFS),
-                        eeprom_ch->flags,
-                        eeprom_ch->max_power_avg,
-                        ((eeprom_ch->flags & EEPROM_CHANNEL_IBSS)
-                         && !(eeprom_ch->flags & EEPROM_CHANNEL_RADAR)) ?
-                        "" : "not ");
-
-        ch_info->ht40_eeprom = *eeprom_ch;
-        ch_info->ht40_max_power_avg = eeprom_ch->max_power_avg;
-        ch_info->ht40_flags = eeprom_ch->flags;
-        if (eeprom_ch->flags & EEPROM_CHANNEL_VALID)
-                ch_info->ht40_extension_channel &=
-                                        ~clear_ht40_extension_channel;
-
-        return 0;
-}
-
-#define CHECK_AND_PRINT_I(x) ((eeprom_ch_info[ch].flags & EEPROM_CHANNEL_##x) \
-                            ? # x " " : "")
-
-/**
- * iwl_legacy_init_channel_map - Set up driver's info for all possible channels
- */
-int iwl_legacy_init_channel_map(struct iwl_priv *priv)
-{
-        int eeprom_ch_count = 0;
-        const u8 *eeprom_ch_index = NULL;
-        const struct iwl_eeprom_channel *eeprom_ch_info = NULL;
-        int band, ch;
-        struct iwl_channel_info *ch_info;
-
-        if (priv->channel_count) {
-                IWL_DEBUG_EEPROM(priv, "Channel map already initialized.\n");
-                return 0;
-        }
-
-        IWL_DEBUG_EEPROM(priv, "Initializing regulatory info from EEPROM\n");
-
-        priv->channel_count =
-            ARRAY_SIZE(iwlegacy_eeprom_band_1) +
-            ARRAY_SIZE(iwlegacy_eeprom_band_2) +
-            ARRAY_SIZE(iwlegacy_eeprom_band_3) +
-            ARRAY_SIZE(iwlegacy_eeprom_band_4) +
-            ARRAY_SIZE(iwlegacy_eeprom_band_5);
-
-        IWL_DEBUG_EEPROM(priv, "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_ERR(priv, "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_legacy_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;
-                        /* First write that ht40 is not enabled, and then enable
-                         * one by one */
-                        ch_info->ht40_extension_channel =
-                                        IEEE80211_CHAN_NO_HT40;
-
-                        if (!(iwl_legacy_is_channel_valid(ch_info))) {
-                                IWL_DEBUG_EEPROM(priv,
-                                               "Ch. %d Flags %x [%sGHz] - "
-                                               "No traffic\n",
-                                               ch_info->channel,
-                                               ch_info->flags,
-                                               iwl_legacy_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_EEPROM(priv, "Ch. %d [%sGHz] "
-                                       "%s%s%s%s%s%s(0x%02x %ddBm):"
-                                       " Ad-Hoc %ssupported\n",
-                                       ch_info->channel,
-                                       iwl_legacy_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(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 ");
-
-                        ch_info++;
-                }
-        }
-
-        /* Check if we do have HT40 channels */
-        if (priv->cfg->ops->lib->eeprom_ops.regulatory_bands[5] ==
-            EEPROM_REGULATORY_BAND_NO_HT40 &&
-            priv->cfg->ops->lib->eeprom_ops.regulatory_bands[6] ==
-            EEPROM_REGULATORY_BAND_NO_HT40)
-                return 0;
-
-        /* Two additional EEPROM bands for 2.4 and 5 GHz HT40 channels */
-        for (band = 6; band <= 7; band++) {
-                enum ieee80211_band ieeeband;
-
-                iwl_legacy_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++) {
-                        /* Set up driver's info for lower half */
-                        iwl_legacy_mod_ht40_chan_info(priv, ieeeband,
-                                                eeprom_ch_index[ch],
-                                                &eeprom_ch_info[ch],
-                                                IEEE80211_CHAN_NO_HT40PLUS);
-
-                        /* Set up driver's info for upper half */
-                        iwl_legacy_mod_ht40_chan_info(priv, ieeeband,
-                                                eeprom_ch_index[ch] + 4,
-                                                &eeprom_ch_info[ch],
-                                                IEEE80211_CHAN_NO_HT40MINUS);
-                }
-        }
-
-        return 0;
-}
-EXPORT_SYMBOL(iwl_legacy_init_channel_map);
-
-/*
- * iwl_legacy_free_channel_map - undo allocations in iwl_legacy_init_channel_map
- */
-void iwl_legacy_free_channel_map(struct iwl_priv *priv)
-{
-        kfree(priv->channel_info);
-        priv->channel_count = 0;
-}
-EXPORT_SYMBOL(iwl_legacy_free_channel_map);
-
-/**
- * iwl_legacy_get_channel_info - Find driver's private channel info
- *
- * Based on band and channel number.
- */
-const struct
-iwl_channel_info *iwl_legacy_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_legacy_get_channel_info);
diff --git a/drivers/net/wireless/iwlegacy/iwl-eeprom.h b/drivers/net/wireless/iwlegacy/iwl-eeprom.h
deleted file mode 100644
index c59c81002022..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-eeprom.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/******************************************************************************
- *
- * 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 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2011 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_legacy_eeprom_h__
-#define __iwl_legacy_eeprom_h__
-
-#include <net/mac80211.h>
-
-struct iwl_priv;
-
-/*
- * EEPROM access time values:
- *
- * Driver initiates EEPROM read by writing byte address << 1 to CSR_EEPROM_REG.
- * 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_SEM_TIMEOUT          10   /* microseconds */
-#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 "HT40" 40 MHz channels.
- *        It only indicates that 20 MHz channel use is supported; HT40 channel
- *        usage is indicated by a separate set of regulatory flags for each
- *        HT40 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 */
-        /* Bit 6 Reserved (was Narrow Channel) */
-        EEPROM_CHANNEL_DFS = (1 << 7),  /* dynamic freq selection candidate */
-};
-
-/* SKU Capabilities */
-/* 3945 only */
-#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 HT40 (40 MHz) vs. normal (20 MHz) channels. */
-struct iwl_eeprom_channel {
-        u8 flags;               /* EEPROM_CHANNEL_* flags copied from EEPROM */
-        s8 max_power_avg;       /* max power (dBm) on this chnl, limit 31 */
-} __packed;
-
-/* 3945 Specific */
-#define EEPROM_3945_EEPROM_VERSION      (0x2f)
-
-/* 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 Specific */
-/* 4965 driver does not work with txpower calibration version < 5 */
-#define EEPROM_4965_TX_POWER_VERSION    (5)
-#define EEPROM_4965_EEPROM_VERSION      (0x2f)
-#define EEPROM_4965_CALIB_VERSION_OFFSET       (2*0xB6) /* 2 bytes */
-#define EEPROM_4965_CALIB_TXPOWER_OFFSET       (2*0xE8) /* 48  bytes */
-#define EEPROM_4965_BOARD_REVISION             (2*0x4F) /* 2 bytes */
-#define EEPROM_4965_BOARD_PBA                  (2*0x56+1) /* 9 bytes */
-
-/* 2.4 GHz */
-extern const u8 iwlegacy_eeprom_band_1[14];
-
-/*
- * 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 iwl_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) */
-} __packed;
-
-
-/*
- * 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 iwl_eeprom_calib_ch_info {
-        u8 ch_num;
-        struct iwl_eeprom_calib_measure
-                measurements[EEPROM_TX_POWER_TX_CHAINS]
-                        [EEPROM_TX_POWER_MEASUREMENTS];
-} __packed;
-
-/*
- * 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 iwl_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 iwl_eeprom_calib_ch_info ch1;
-        struct iwl_eeprom_calib_ch_info ch2;
-} __packed;
-
-
-/*
- * 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 iwl_eeprom_calib_subband_info contains range of channels
- *     (0 if unused) for each set of data.
- */
-struct iwl_eeprom_calib_info {
-        u8 saturation_power24;  /* half-dBm (e.g. "34" = 17 dBm) */
-        u8 saturation_power52;  /* half-dBm */
-        __le16 voltage;         /* signed */
-        struct iwl_eeprom_calib_subband_info
-                band_info[EEPROM_TX_POWER_BANDS];
-} __packed;
-
-
-/* General */
-#define EEPROM_DEVICE_ID                    (2*0x08)    /* 2 bytes */
-#define EEPROM_MAC_ADDRESS                  (2*0x15)    /* 6  bytes */
-#define EEPROM_BOARD_REVISION               (2*0x35)    /* 2  bytes */
-#define EEPROM_BOARD_PBA_NUMBER             (2*0x3B+1)  /* 9  bytes */
-#define EEPROM_VERSION                      (2*0x44)    /* 2  bytes */
-#define EEPROM_SKU_CAP                      (2*0x45)    /* 2  bytes */
-#define EEPROM_OEM_MODE                     (2*0x46)    /* 2  bytes */
-#define EEPROM_WOWLAN_MODE                  (2*0x47)    /* 2  bytes */
-#define EEPROM_RADIO_CONFIG                 (2*0x48)    /* 2  bytes */
-#define EEPROM_NUM_MAC_ADDRESS              (2*0x4C)    /* 2  bytes */
-
-/* The following masks are to be applied on EEPROM_RADIO_CONFIG */
-#define EEPROM_RF_CFG_TYPE_MSK(x)   (x & 0x3)         /* bits 0-1   */
-#define EEPROM_RF_CFG_STEP_MSK(x)   ((x >> 2)  & 0x3) /* bits 2-3   */
-#define EEPROM_RF_CFG_DASH_MSK(x)   ((x >> 4)  & 0x3) /* bits 4-5   */
-#define EEPROM_RF_CFG_PNUM_MSK(x)   ((x >> 6)  & 0x3) /* bits 6-7   */
-#define EEPROM_RF_CFG_TX_ANT_MSK(x) ((x >> 8)  & 0xF) /* bits 8-11  */
-#define EEPROM_RF_CFG_RX_ANT_MSK(x) ((x >> 12) & 0xF) /* bits 12-15 */
-
-#define EEPROM_3945_RF_CFG_TYPE_MAX  0x0
-#define EEPROM_4965_RF_CFG_TYPE_MAX  0x1
-
-/*
- * Per-channel regulatory data.
- *
- * Each channel that *might* be supported by iwl 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.  HT40 (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_SKU_ID            (2*0x60)    /* 4  bytes */
-#define EEPROM_REGULATORY_BAND_1            (2*0x62)    /* 2  bytes */
-#define EEPROM_REGULATORY_BAND_1_CHANNELS   (2*0x63)    /* 28 bytes */
-
-/*
- * 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 */
-#define EEPROM_REGULATORY_BAND_2_CHANNELS   (2*0x72)    /* 26 bytes */
-
-/*
- * 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 */
-#define EEPROM_REGULATORY_BAND_3_CHANNELS   (2*0x80)    /* 24 bytes */
-
-/*
- * 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 */
-#define EEPROM_REGULATORY_BAND_4_CHANNELS   (2*0x8D)    /* 22 bytes */
-
-/*
- * 5.7 GHz channels 145, 149, 153, 157, 161, 165
- * (5725-5825MHz)
- */
-#define EEPROM_REGULATORY_BAND_5            (2*0x98)    /* 2  bytes */
-#define EEPROM_REGULATORY_BAND_5_CHANNELS   (2*0x99)    /* 12 bytes */
-
-/*
- * 2.4 GHz HT40 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 HT40 channel is centered 4 channels (20 MHz) away
- * from the lower half; e.g. the upper half of HT40 channel 1 is channel 5,
- * and the overall HT40 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 HT40 channel.
- *
- * NOTE:  4965 does not support HT40 channels on 2.4 GHz.
- */
-#define EEPROM_4965_REGULATORY_BAND_24_HT40_CHANNELS (2*0xA0)   /* 14 bytes */
-
-/*
- * 5.2 GHz HT40 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_4965_REGULATORY_BAND_52_HT40_CHANNELS (2*0xA8)   /* 22 bytes */
-
-#define EEPROM_REGULATORY_BAND_NO_HT40                  (0)
-
-struct iwl_eeprom_ops {
-        const u32 regulatory_bands[7];
-        int (*acquire_semaphore) (struct iwl_priv *priv);
-        void (*release_semaphore) (struct iwl_priv *priv);
-};
-
-
-int iwl_legacy_eeprom_init(struct iwl_priv *priv);
-void iwl_legacy_eeprom_free(struct iwl_priv *priv);
-const u8 *iwl_legacy_eeprom_query_addr(const struct iwl_priv *priv,
-                                        size_t offset);
-u16 iwl_legacy_eeprom_query16(const struct iwl_priv *priv, size_t offset);
-int iwl_legacy_init_channel_map(struct iwl_priv *priv);
-void iwl_legacy_free_channel_map(struct iwl_priv *priv);
-const struct iwl_channel_info *iwl_legacy_get_channel_info(
-                const struct iwl_priv *priv,
-                enum ieee80211_band band, u16 channel);
-
-#endif  /* __iwl_legacy_eeprom_h__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-fh.h b/drivers/net/wireless/iwlegacy/iwl-fh.h
deleted file mode 100644
index 6e6091816e36..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-fh.h
+++ /dev/null
@@ -1,513 +0,0 @@
-/******************************************************************************
- *
- * 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 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2011 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_legacy_fh_h__
-#define __iwl_legacy_fh_h__
-
-/****************************/
-/* Flow Handler Definitions */
-/****************************/
-
-/**
- * This I/O area is directly read/writable by driver (e.g. Linux uses writel())
- * Addresses are offsets from device's PCI hardware base address.
- */
-#define FH_MEM_LOWER_BOUND                   (0x1000)
-#define FH_MEM_UPPER_BOUND                   (0x2000)
-
-/**
- * Keep-Warm (KW) buffer base address.
- *
- * Driver must allocate a 4KByte buffer that is used by 4965 for keeping the
- * host DRAM powered on (via dummy accesses to DRAM) to maintain low-latency
- * DRAM access when 4965 is Txing or Rxing.  The dummy accesses prevent host
- * from going into a power-savings mode that would cause higher DRAM latency,
- * and possible data over/under-runs, before all Tx/Rx is complete.
- *
- * Driver loads FH_KW_MEM_ADDR_REG with the physical address (bits 35:4)
- * of the buffer, which must be 4K aligned.  Once this is set up, the 4965
- * automatically invokes keep-warm accesses when normal accesses might not
- * be sufficient to maintain fast DRAM response.
- *
- * Bit fields:
- *  31-0:  Keep-warm buffer physical base address [35:4], must be 4K aligned
- */
-#define FH_KW_MEM_ADDR_REG                   (FH_MEM_LOWER_BOUND + 0x97C)
-
-
-/**
- * TFD Circular Buffers Base (CBBC) addresses
- *
- * 4965 has 16 base pointer registers, one for each of 16 host-DRAM-resident
- * circular buffers (CBs/queues) containing Transmit Frame Descriptors (TFDs)
- * (see struct iwl_tfd_frame).  These 16 pointer registers are offset by 0x04
- * bytes from one another.  Each TFD circular buffer in DRAM must be 256-byte
- * aligned (address bits 0-7 must be 0).
- *
- * Bit fields in each pointer register:
- *  27-0: TFD CB physical base address [35:8], must be 256-byte aligned
- */
-#define FH_MEM_CBBC_LOWER_BOUND          (FH_MEM_LOWER_BOUND + 0x9D0)
-#define FH_MEM_CBBC_UPPER_BOUND          (FH_MEM_LOWER_BOUND + 0xA10)
-
-/* Find TFD CB base pointer for given queue (range 0-15). */
-#define FH_MEM_CBBC_QUEUE(x)  (FH_MEM_CBBC_LOWER_BOUND + (x) * 0x4)
-
-
-/**
- * Rx SRAM Control and Status Registers (RSCSR)
- *
- * These registers provide handshake between driver and 4965 for the Rx queue
- * (this queue handles *all* command responses, notifications, Rx data, etc.
- * sent from 4965 uCode to host driver).  Unlike Tx, there is only one Rx
- * queue, and only one Rx DMA/FIFO channel.  Also unlike Tx, which can
- * concatenate up to 20 DRAM buffers to form a Tx frame, each Receive Buffer
- * Descriptor (RBD) points to only one Rx Buffer (RB); there is a 1:1
- * mapping between RBDs and RBs.
- *
- * Driver must allocate host DRAM memory for the following, and set the
- * physical address of each into 4965 registers:
- *
- * 1)  Receive Buffer Descriptor (RBD) circular buffer (CB), typically with 256
- *     entries (although any power of 2, up to 4096, is selectable by driver).
- *     Each entry (1 dword) points to a receive buffer (RB) of consistent size
- *     (typically 4K, although 8K or 16K are also selectable by driver).
- *     Driver sets up RB size and number of RBDs in the CB via Rx config
- *     register FH_MEM_RCSR_CHNL0_CONFIG_REG.
- *
- *     Bit fields within one RBD:
- *     27-0:  Receive Buffer physical address bits [35:8], 256-byte aligned
- *
- *     Driver sets physical address [35:8] of base of RBD circular buffer
- *     into FH_RSCSR_CHNL0_RBDCB_BASE_REG [27:0].
- *
- * 2)  Rx status buffer, 8 bytes, in which 4965 indicates which Rx Buffers
- *     (RBs) have been filled, via a "write pointer", actually the index of
- *     the RB's corresponding RBD within the circular buffer.  Driver sets
- *     physical address [35:4] into FH_RSCSR_CHNL0_STTS_WPTR_REG [31:0].
- *
- *     Bit fields in lower dword of Rx status buffer (upper dword not used
- *     by driver; see struct iwl4965_shared, val0):
- *     31-12:  Not used by driver
- *     11- 0:  Index of last filled Rx buffer descriptor
- *             (4965 writes, driver reads this value)
- *
- * As the driver prepares Receive Buffers (RBs) for 4965 to fill, driver must
- * enter pointers to these RBs into contiguous RBD circular buffer entries,
- * and update the 4965's "write" index register,
- * FH_RSCSR_CHNL0_RBDCB_WPTR_REG.
- *
- * This "write" index corresponds to the *next* RBD that the driver will make
- * available, i.e. one RBD past the tail of the ready-to-fill RBDs within
- * the circular buffer.  This value should initially be 0 (before preparing any
- * RBs), should be 8 after preparing the first 8 RBs (for example), and must
- * wrap back to 0 at the end of the circular buffer (but don't wrap before
- * "read" index has advanced past 1!  See below).
- * NOTE:  4965 EXPECTS THE WRITE INDEX TO BE INCREMENTED IN MULTIPLES OF 8.
- *
- * As the 4965 fills RBs (referenced from contiguous RBDs within the circular
- * buffer), it updates the Rx status buffer in host DRAM, 2) described above,
- * to tell the driver the index of the latest filled RBD.  The driver must
- * read this "read" index from DRAM after receiving an Rx interrupt from 4965.
- *
- * The driver must also internally keep track of a third index, which is the
- * next RBD to process.  When receiving an Rx interrupt, driver should process
- * all filled but unprocessed RBs up to, but not including, the RB
- * corresponding to the "read" index.  For example, if "read" index becomes "1",
- * driver may process the RB pointed to by RBD 0.  Depending on volume of
- * traffic, there may be many RBs to process.
- *
- * If read index == write index, 4965 thinks there is no room to put new data.
- * Due to this, the maximum number of filled RBs is 255, instead of 256.  To
- * be safe, make sure that there is a gap of at least 2 RBDs between "write"
- * and "read" indexes; that is, make sure that there are no more than 254
- * buffers waiting to be filled.
- */
-#define FH_MEM_RSCSR_LOWER_BOUND        (FH_MEM_LOWER_BOUND + 0xBC0)
-#define FH_MEM_RSCSR_UPPER_BOUND        (FH_MEM_LOWER_BOUND + 0xC00)
-#define FH_MEM_RSCSR_CHNL0              (FH_MEM_RSCSR_LOWER_BOUND)
-
-/**
- * Physical base address of 8-byte Rx Status buffer.
- * Bit fields:
- *  31-0: Rx status buffer physical base address [35:4], must 16-byte aligned.
- */
-#define FH_RSCSR_CHNL0_STTS_WPTR_REG    (FH_MEM_RSCSR_CHNL0)
-
-/**
- * Physical base address of Rx Buffer Descriptor Circular Buffer.
- * Bit fields:
- *  27-0:  RBD CD physical base address [35:8], must be 256-byte aligned.
- */
-#define FH_RSCSR_CHNL0_RBDCB_BASE_REG   (FH_MEM_RSCSR_CHNL0 + 0x004)
-
-/**
- * Rx write pointer (index, really!).
- * Bit fields:
- *  11-0:  Index of driver's most recent prepared-to-be-filled RBD, + 1.
- *         NOTE:  For 256-entry circular buffer, use only bits [7:0].
- */
-#define FH_RSCSR_CHNL0_RBDCB_WPTR_REG   (FH_MEM_RSCSR_CHNL0 + 0x008)
-#define FH_RSCSR_CHNL0_WPTR        (FH_RSCSR_CHNL0_RBDCB_WPTR_REG)
-
-
-/**
- * Rx Config/Status Registers (RCSR)
- * Rx Config Reg for channel 0 (only channel used)
- *
- * Driver must initialize FH_MEM_RCSR_CHNL0_CONFIG_REG as follows for
- * normal operation (see bit fields).
- *
- * Clearing FH_MEM_RCSR_CHNL0_CONFIG_REG to 0 turns off Rx DMA.
- * Driver should poll FH_MEM_RSSR_RX_STATUS_REG for
- * FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE (bit 24) before continuing.
- *
- * Bit fields:
- * 31-30: Rx DMA channel enable: '00' off/pause, '01' pause at end of frame,
- *        '10' operate normally
- * 29-24: reserved
- * 23-20: # RBDs in circular buffer = 2^value; use "8" for 256 RBDs (normal),
- *        min "5" for 32 RBDs, max "12" for 4096 RBDs.
- * 19-18: reserved
- * 17-16: size of each receive buffer; '00' 4K (normal), '01' 8K,
- *        '10' 12K, '11' 16K.
- * 15-14: reserved
- * 13-12: IRQ destination; '00' none, '01' host driver (normal operation)
- * 11- 4: timeout for closing Rx buffer and interrupting host (units 32 usec)
- *        typical value 0x10 (about 1/2 msec)
- *  3- 0: reserved
- */
-#define FH_MEM_RCSR_LOWER_BOUND      (FH_MEM_LOWER_BOUND + 0xC00)
-#define FH_MEM_RCSR_UPPER_BOUND      (FH_MEM_LOWER_BOUND + 0xCC0)
-#define FH_MEM_RCSR_CHNL0            (FH_MEM_RCSR_LOWER_BOUND)
-
-#define FH_MEM_RCSR_CHNL0_CONFIG_REG    (FH_MEM_RCSR_CHNL0)
-
-#define FH_RCSR_CHNL0_RX_CONFIG_RB_TIMEOUT_MSK (0x00000FF0) /* bits 4-11 */
-#define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_MSK   (0x00001000) /* bits 12 */
-#define FH_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME_MSK (0x00008000) /* bit 15 */
-#define FH_RCSR_CHNL0_RX_CONFIG_RB_SIZE_MSK   (0x00030000) /* bits 16-17 */
-#define FH_RCSR_CHNL0_RX_CONFIG_RBDBC_SIZE_MSK (0x00F00000) /* bits 20-23 */
-#define FH_RCSR_CHNL0_RX_CONFIG_DMA_CHNL_EN_MSK (0xC0000000) /* bits 30-31*/
-
-#define FH_RCSR_RX_CONFIG_RBDCB_SIZE_POS        (20)
-#define FH_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS      (4)
-#define RX_RB_TIMEOUT   (0x10)
-
-#define FH_RCSR_RX_CONFIG_CHNL_EN_PAUSE_VAL         (0x00000000)
-#define FH_RCSR_RX_CONFIG_CHNL_EN_PAUSE_EOF_VAL     (0x40000000)
-#define FH_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL        (0x80000000)
-
-#define FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K    (0x00000000)
-#define FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_8K    (0x00010000)
-#define FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_12K   (0x00020000)
-#define FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_16K   (0x00030000)
-
-#define FH_RCSR_CHNL0_RX_IGNORE_RXF_EMPTY              (0x00000004)
-#define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_NO_INT_VAL    (0x00000000)
-#define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL  (0x00001000)
-
-#define FH_RSCSR_FRAME_SIZE_MSK (0x00003FFF)    /* bits 0-13 */
-
-/**
- * Rx Shared Status Registers (RSSR)
- *
- * After stopping Rx DMA channel (writing 0 to
- * FH_MEM_RCSR_CHNL0_CONFIG_REG), driver must poll
- * FH_MEM_RSSR_RX_STATUS_REG until Rx channel is idle.
- *
- * Bit fields:
- *  24:  1 = Channel 0 is idle
- *
- * FH_MEM_RSSR_SHARED_CTRL_REG and FH_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV
- * contain default values that should not be altered by the driver.
- */
-#define FH_MEM_RSSR_LOWER_BOUND           (FH_MEM_LOWER_BOUND + 0xC40)
-#define FH_MEM_RSSR_UPPER_BOUND           (FH_MEM_LOWER_BOUND + 0xD00)
-
-#define FH_MEM_RSSR_SHARED_CTRL_REG       (FH_MEM_RSSR_LOWER_BOUND)
-#define FH_MEM_RSSR_RX_STATUS_REG       (FH_MEM_RSSR_LOWER_BOUND + 0x004)
-#define FH_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV\
-                                        (FH_MEM_RSSR_LOWER_BOUND + 0x008)
-
-#define FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE       (0x01000000)
-
-#define FH_MEM_TFDIB_REG1_ADDR_BITSHIFT 28
-
-/* TFDB  Area - TFDs buffer table */
-#define FH_MEM_TFDIB_DRAM_ADDR_LSB_MSK      (0xFFFFFFFF)
-#define FH_TFDIB_LOWER_BOUND       (FH_MEM_LOWER_BOUND + 0x900)
-#define FH_TFDIB_UPPER_BOUND       (FH_MEM_LOWER_BOUND + 0x958)
-#define FH_TFDIB_CTRL0_REG(_chnl)  (FH_TFDIB_LOWER_BOUND + 0x8 * (_chnl))
-#define FH_TFDIB_CTRL1_REG(_chnl)  (FH_TFDIB_LOWER_BOUND + 0x8 * (_chnl) + 0x4)
-
-/**
- * Transmit DMA Channel Control/Status Registers (TCSR)
- *
- * 4965 has one configuration register for each of 8 Tx DMA/FIFO channels
- * supported in hardware (don't confuse these with the 16 Tx queues in DRAM,
- * which feed the DMA/FIFO channels); config regs are separated by 0x20 bytes.
- *
- * To use a Tx DMA channel, driver must initialize its
- * FH_TCSR_CHNL_TX_CONFIG_REG(chnl) with:
- *
- * FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE |
- * FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE_VAL
- *
- * All other bits should be 0.
- *
- * Bit fields:
- * 31-30: Tx DMA channel enable: '00' off/pause, '01' pause at end of frame,
- *        '10' operate normally
- * 29- 4: Reserved, set to "0"
- *     3: Enable internal DMA requests (1, normal operation), disable (0)
- *  2- 0: Reserved, set to "0"
- */
-#define FH_TCSR_LOWER_BOUND  (FH_MEM_LOWER_BOUND + 0xD00)
-#define FH_TCSR_UPPER_BOUND  (FH_MEM_LOWER_BOUND + 0xE60)
-
-/* Find Control/Status reg for given Tx DMA/FIFO channel */
-#define FH49_TCSR_CHNL_NUM                            (7)
-#define FH50_TCSR_CHNL_NUM                            (8)
-
-/* TCSR: tx_config register values */
-#define FH_TCSR_CHNL_TX_CONFIG_REG(_chnl)       \
-                (FH_TCSR_LOWER_BOUND + 0x20 * (_chnl))
-#define FH_TCSR_CHNL_TX_CREDIT_REG(_chnl)       \
-                (FH_TCSR_LOWER_BOUND + 0x20 * (_chnl) + 0x4)
-#define FH_TCSR_CHNL_TX_BUF_STS_REG(_chnl)      \
-                (FH_TCSR_LOWER_BOUND + 0x20 * (_chnl) + 0x8)
-
-#define FH_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_TXF          (0x00000000)
-#define FH_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_DRV          (0x00000001)
-
-#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE    (0x00000000)
-#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE     (0x00000008)
-
-#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_NOINT       (0x00000000)
-#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD      (0x00100000)
-#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_IFTFD       (0x00200000)
-
-#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_NOINT        (0x00000000)
-#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_ENDTFD       (0x00400000)
-#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_IFTFD        (0x00800000)
-
-#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE        (0x00000000)
-#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE_EOF    (0x40000000)
-#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE       (0x80000000)
-
-#define FH_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_EMPTY      (0x00000000)
-#define FH_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_WAIT       (0x00002000)
-#define FH_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_VALID      (0x00000003)
-
-#define FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM          (20)
-#define FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_IDX          (12)
-
-/**
- * Tx Shared Status Registers (TSSR)
- *
- * After stopping Tx DMA channel (writing 0 to
- * FH_TCSR_CHNL_TX_CONFIG_REG(chnl)), driver must poll
- * FH_TSSR_TX_STATUS_REG until selected Tx channel is idle
- * (channel's buffers empty | no pending requests).
- *
- * Bit fields:
- * 31-24:  1 = Channel buffers empty (channel 7:0)
- * 23-16:  1 = No pending requests (channel 7:0)
- */
-#define FH_TSSR_LOWER_BOUND             (FH_MEM_LOWER_BOUND + 0xEA0)
-#define FH_TSSR_UPPER_BOUND             (FH_MEM_LOWER_BOUND + 0xEC0)
-
-#define FH_TSSR_TX_STATUS_REG           (FH_TSSR_LOWER_BOUND + 0x010)
-
-/**
- * Bit fields for TSSR(Tx Shared Status & Control) error status register:
- * 31:  Indicates an address error when accessed to internal memory
- *      uCode/driver must write "1" in order to clear this flag
- * 30:  Indicates that Host did not send the expected number of dwords to FH
- *      uCode/driver must write "1" in order to clear this flag
- * 16-9:Each status bit is for one channel. Indicates that an (Error) ActDMA
- *      command was received from the scheduler while the TRB was already full
- *      with previous command
- *      uCode/driver must write "1" in order to clear this flag
- * 7-0: Each status bit indicates a channel's TxCredit error. When an error
- *      bit is set, it indicates that the FH has received a full indication
- *      from the RTC TxFIFO and the current value of the TxCredit counter was
- *      not equal to zero. This mean that the credit mechanism was not
- *      synchronized to the TxFIFO status
- *      uCode/driver must write "1" in order to clear this flag
- */
-#define FH_TSSR_TX_ERROR_REG            (FH_TSSR_LOWER_BOUND + 0x018)
-
-#define FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(_chnl) ((1 << (_chnl)) << 16)
-
-/* Tx service channels */
-#define FH_SRVC_CHNL            (9)
-#define FH_SRVC_LOWER_BOUND     (FH_MEM_LOWER_BOUND + 0x9C8)
-#define FH_SRVC_UPPER_BOUND     (FH_MEM_LOWER_BOUND + 0x9D0)
-#define FH_SRVC_CHNL_SRAM_ADDR_REG(_chnl) \
-                (FH_SRVC_LOWER_BOUND + ((_chnl) - 9) * 0x4)
-
-#define FH_TX_CHICKEN_BITS_REG  (FH_MEM_LOWER_BOUND + 0xE98)
-/* Instruct FH to increment the retry count of a packet when
- * it is brought from the memory to TX-FIFO
- */
-#define FH_TX_CHICKEN_BITS_SCD_AUTO_RETRY_EN    (0x00000002)
-
-#define RX_QUEUE_SIZE                         256
-#define RX_QUEUE_MASK                         255
-#define RX_QUEUE_SIZE_LOG                     8
-
-/*
- * RX related structures and functions
- */
-#define RX_FREE_BUFFERS 64
-#define RX_LOW_WATERMARK 8
-
-/* Size of one Rx buffer in host DRAM */
-#define IWL_RX_BUF_SIZE_3K (3 * 1000) /* 3945 only */
-#define IWL_RX_BUF_SIZE_4K (4 * 1024)
-#define IWL_RX_BUF_SIZE_8K (8 * 1024)
-
-/**
- * struct iwl_rb_status - reseve buffer status
- *      host memory mapped FH registers
- * @closed_rb_num [0:11] - Indicates the index of the RB which was closed
- * @closed_fr_num [0:11] - Indicates the index of the RX Frame which was closed
- * @finished_rb_num [0:11] - Indicates the index of the current RB
- *      in which the last frame was written to
- * @finished_fr_num [0:11] - Indicates the index of the RX Frame
- *      which was transferred
- */
-struct iwl_rb_status {
-        __le16 closed_rb_num;
-        __le16 closed_fr_num;
-        __le16 finished_rb_num;
-        __le16 finished_fr_nam;
-        __le32 __unused; /* 3945 only */
-} __packed;
-
-
-#define TFD_QUEUE_SIZE_MAX      (256)
-#define TFD_QUEUE_SIZE_BC_DUP   (64)
-#define TFD_QUEUE_BC_SIZE       (TFD_QUEUE_SIZE_MAX + TFD_QUEUE_SIZE_BC_DUP)
-#define IWL_TX_DMA_MASK        DMA_BIT_MASK(36)
-#define IWL_NUM_OF_TBS          20
-
-static inline u8 iwl_legacy_get_dma_hi_addr(dma_addr_t addr)
-{
-        return (sizeof(addr) > sizeof(u32) ? (addr >> 16) >> 16 : 0) & 0xF;
-}
-/**
- * struct iwl_tfd_tb transmit buffer descriptor within transmit frame descriptor
- *
- * This structure contains dma address and length of transmission address
- *
- * @lo: low [31:0] portion of the dma address of TX buffer
- *      every even is unaligned on 16 bit boundary
- * @hi_n_len 0-3 [35:32] portion of dma
- *           4-15 length of the tx buffer
- */
-struct iwl_tfd_tb {
-        __le32 lo;
-        __le16 hi_n_len;
-} __packed;
-
-/**
- * struct iwl_tfd
- *
- * Transmit Frame Descriptor (TFD)
- *
- * @ __reserved1[3] reserved
- * @ num_tbs 0-4 number of active tbs
- *           5   reserved
- *           6-7 padding (not used)
- * @ tbs[20]    transmit frame buffer descriptors
- * @ __pad      padding
- *
- * Each Tx queue uses a circular buffer of 256 TFDs stored in host DRAM.
- * Both driver and device share these circular buffers, each of which must be
- * contiguous 256 TFDs x 128 bytes-per-TFD = 32 KBytes
- *
- * Driver must indicate the physical address of the base of each
- * circular buffer via the FH_MEM_CBBC_QUEUE registers.
- *
- * Each TFD contains pointer/size information for up to 20 data buffers
- * in host DRAM.  These buffers collectively contain the (one) frame described
- * by the TFD.  Each buffer must be a single contiguous block of memory within
- * itself, but buffers may be scattered in host DRAM.  Each buffer has max size
- * of (4K - 4).  The concatenates all of a TFD's buffers into a single
- * Tx frame, up to 8 KBytes in size.
- *
- * A maximum of 255 (not 256!) TFDs may be on a queue waiting for Tx.
- */
-struct iwl_tfd {
-        u8 __reserved1[3];
-        u8 num_tbs;
-        struct iwl_tfd_tb tbs[IWL_NUM_OF_TBS];
-        __le32 __pad;
-} __packed;
-
-/* Keep Warm Size */
-#define IWL_KW_SIZE 0x1000      /* 4k */
-
-#endif /* !__iwl_legacy_fh_h__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-hcmd.c b/drivers/net/wireless/iwlegacy/iwl-hcmd.c
deleted file mode 100644
index ce1fc9feb61f..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-hcmd.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/******************************************************************************
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2011 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:
- *  Intel Linux Wireless <ilw@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/sched.h>
-#include <net/mac80211.h>
-
-#include "iwl-dev.h"
-#include "iwl-debug.h"
-#include "iwl-eeprom.h"
-#include "iwl-core.h"
-
-
-const char *iwl_legacy_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_WEPKEY);
-                IWL_CMD(REPLY_3945_RX);
-                IWL_CMD(REPLY_TX);
-                IWL_CMD(REPLY_RATE_SCALE);
-                IWL_CMD(REPLY_LEDS_CMD);
-                IWL_CMD(REPLY_TX_LINK_QUALITY_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(REPLY_TX_PWR_TABLE_CMD);
-                IWL_CMD(REPLY_BT_CONFIG);
-                IWL_CMD(REPLY_STATISTICS_CMD);
-                IWL_CMD(STATISTICS_NOTIFICATION);
-                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(iwl_legacy_get_cmd_string);
-
-#define HOST_COMPLETE_TIMEOUT (HZ / 2)
-
-static void iwl_legacy_generic_cmd_callback(struct iwl_priv *priv,
-                                     struct iwl_device_cmd *cmd,
-                                     struct iwl_rx_packet *pkt)
-{
-        if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) {
-                IWL_ERR(priv, "Bad return from %s (0x%08X)\n",
-                iwl_legacy_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
-                return;
-        }
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        switch (cmd->hdr.cmd) {
-        case REPLY_TX_LINK_QUALITY_CMD:
-        case SENSITIVITY_CMD:
-                IWL_DEBUG_HC_DUMP(priv, "back from %s (0x%08X)\n",
-                iwl_legacy_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
-                break;
-        default:
-                IWL_DEBUG_HC(priv, "back from %s (0x%08X)\n",
-                iwl_legacy_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
-        }
-#endif
-}
-
-static int
-iwl_legacy_send_cmd_async(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
-{
-        int ret;
-
-        BUG_ON(!(cmd->flags & CMD_ASYNC));
-
-        /* An asynchronous command can not expect an SKB to be set. */
-        BUG_ON(cmd->flags & CMD_WANT_SKB);
-
-        /* Assign a generic callback if one is not provided */
-        if (!cmd->callback)
-                cmd->callback = iwl_legacy_generic_cmd_callback;
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return -EBUSY;
-
-        ret = iwl_legacy_enqueue_hcmd(priv, cmd);
-        if (ret < 0) {
-                IWL_ERR(priv, "Error sending %s: enqueue_hcmd failed: %d\n",
-                          iwl_legacy_get_cmd_string(cmd->id), ret);
-                return ret;
-        }
-        return 0;
-}
-
-int iwl_legacy_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
-{
-        int cmd_idx;
-        int ret;
-
-        lockdep_assert_held(&priv->mutex);
-
-        BUG_ON(cmd->flags & CMD_ASYNC);
-
-         /* A synchronous command can not have a callback set. */
-        BUG_ON(cmd->callback);
-
-        IWL_DEBUG_INFO(priv, "Attempting to send sync command %s\n",
-                        iwl_legacy_get_cmd_string(cmd->id));
-
-        set_bit(STATUS_HCMD_ACTIVE, &priv->status);
-        IWL_DEBUG_INFO(priv, "Setting HCMD_ACTIVE for command %s\n",
-                        iwl_legacy_get_cmd_string(cmd->id));
-
-        cmd_idx = iwl_legacy_enqueue_hcmd(priv, cmd);
-        if (cmd_idx < 0) {
-                ret = cmd_idx;
-                IWL_ERR(priv, "Error sending %s: enqueue_hcmd failed: %d\n",
-                          iwl_legacy_get_cmd_string(cmd->id), ret);
-                goto out;
-        }
-
-        ret = wait_event_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_ERR(priv,
-                                "Error sending %s: time out after %dms.\n",
-                                iwl_legacy_get_cmd_string(cmd->id),
-                                jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
-
-                        clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
-                        IWL_DEBUG_INFO(priv,
-                                "Clearing HCMD_ACTIVE for command %s\n",
-                                       iwl_legacy_get_cmd_string(cmd->id));
-                        ret = -ETIMEDOUT;
-                        goto cancel;
-                }
-        }
-
-        if (test_bit(STATUS_RF_KILL_HW, &priv->status)) {
-                IWL_ERR(priv, "Command %s aborted: RF KILL Switch\n",
-                               iwl_legacy_get_cmd_string(cmd->id));
-                ret = -ECANCELED;
-                goto fail;
-        }
-        if (test_bit(STATUS_FW_ERROR, &priv->status)) {
-                IWL_ERR(priv, "Command %s failed: FW Error\n",
-                               iwl_legacy_get_cmd_string(cmd->id));
-                ret = -EIO;
-                goto fail;
-        }
-        if ((cmd->flags & CMD_WANT_SKB) && !cmd->reply_page) {
-                IWL_ERR(priv, "Error: Response NULL in '%s'\n",
-                          iwl_legacy_get_cmd_string(cmd->id));
-                ret = -EIO;
-                goto cancel;
-        }
-
-        ret = 0;
-        goto out;
-
-cancel:
-        if (cmd->flags & CMD_WANT_SKB) {
-                /*
-                 * 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).
-                 */
-                priv->txq[priv->cmd_queue].meta[cmd_idx].flags &=
-                                                        ~CMD_WANT_SKB;
-        }
-fail:
-        if (cmd->reply_page) {
-                iwl_legacy_free_pages(priv, cmd->reply_page);
-                cmd->reply_page = 0;
-        }
-out:
-        return ret;
-}
-EXPORT_SYMBOL(iwl_legacy_send_cmd_sync);
-
-int iwl_legacy_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
-{
-        if (cmd->flags & CMD_ASYNC)
-                return iwl_legacy_send_cmd_async(priv, cmd);
-
-        return iwl_legacy_send_cmd_sync(priv, cmd);
-}
-EXPORT_SYMBOL(iwl_legacy_send_cmd);
-
-int
-iwl_legacy_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_legacy_send_cmd_sync(priv, &cmd);
-}
-EXPORT_SYMBOL(iwl_legacy_send_cmd_pdu);
-
-int iwl_legacy_send_cmd_pdu_async(struct iwl_priv *priv,
-                           u8 id, u16 len, const void *data,
-                           void (*callback)(struct iwl_priv *priv,
-                                            struct iwl_device_cmd *cmd,
-                                            struct iwl_rx_packet *pkt))
-{
-        struct iwl_host_cmd cmd = {
-                .id = id,
-                .len = len,
-                .data = data,
-        };
-
-        cmd.flags |= CMD_ASYNC;
-        cmd.callback = callback;
-
-        return iwl_legacy_send_cmd_async(priv, &cmd);
-}
-EXPORT_SYMBOL(iwl_legacy_send_cmd_pdu_async);
diff --git a/drivers/net/wireless/iwlegacy/iwl-helpers.h b/drivers/net/wireless/iwlegacy/iwl-helpers.h
deleted file mode 100644
index 5cf23eaecbbb..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-helpers.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-
-#ifndef __iwl_legacy_helpers_h__
-#define __iwl_legacy_helpers_h__
-
-#include <linux/ctype.h>
-#include <net/mac80211.h>
-
-#include "iwl-io.h"
-
-#define IWL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo))))
-
-
-static inline struct ieee80211_conf *iwl_legacy_ieee80211_get_hw_conf(
-        struct ieee80211_hw *hw)
-{
-        return &hw->conf;
-}
-
-/**
- * iwl_legacy_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_legacy_queue_inc_wrap(int index, int n_bd)
-{
-        return ++index & (n_bd - 1);
-}
-
-/**
- * iwl_legacy_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_legacy_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_legacy_free_fw_desc(struct pci_dev *pci_dev,
-                                    struct fw_desc *desc)
-{
-        if (desc->v_addr)
-                dma_free_coherent(&pci_dev->dev, desc->len,
-                                  desc->v_addr, desc->p_addr);
-        desc->v_addr = NULL;
-        desc->len = 0;
-}
-
-static inline int iwl_legacy_alloc_fw_desc(struct pci_dev *pci_dev,
-                                    struct fw_desc *desc)
-{
-        if (!desc->len) {
-                desc->v_addr = NULL;
-                return -EINVAL;
-        }
-
-        desc->v_addr = dma_alloc_coherent(&pci_dev->dev, desc->len,
-                                          &desc->p_addr, GFP_KERNEL);
-        return (desc->v_addr != NULL) ? 0 : -ENOMEM;
-}
-
-/*
- * we have 8 bits used like this:
- *
- * 7 6 5 4 3 2 1 0
- * | | | | | | | |
- * | | | | | | +-+-------- AC queue (0-3)
- * | | | | | |
- * | +-+-+-+-+------------ HW queue ID
- * |
- * +---------------------- unused
- */
-static inline void
-iwl_legacy_set_swq_id(struct iwl_tx_queue *txq, u8 ac, u8 hwq)
-{
-        BUG_ON(ac > 3);   /* only have 2 bits */
-        BUG_ON(hwq > 31); /* only use 5 bits */
-
-        txq->swq_id = (hwq << 2) | ac;
-}
-
-static inline void iwl_legacy_wake_queue(struct iwl_priv *priv,
-                                  struct iwl_tx_queue *txq)
-{
-        u8 queue = txq->swq_id;
-        u8 ac = queue & 3;
-        u8 hwq = (queue >> 2) & 0x1f;
-
-        if (test_and_clear_bit(hwq, priv->queue_stopped))
-                if (atomic_dec_return(&priv->queue_stop_count[ac]) <= 0)
-                        ieee80211_wake_queue(priv->hw, ac);
-}
-
-static inline void iwl_legacy_stop_queue(struct iwl_priv *priv,
-                                  struct iwl_tx_queue *txq)
-{
-        u8 queue = txq->swq_id;
-        u8 ac = queue & 3;
-        u8 hwq = (queue >> 2) & 0x1f;
-
-        if (!test_and_set_bit(hwq, priv->queue_stopped))
-                if (atomic_inc_return(&priv->queue_stop_count[ac]) > 0)
-                        ieee80211_stop_queue(priv->hw, ac);
-}
-
-#ifdef ieee80211_stop_queue
-#undef ieee80211_stop_queue
-#endif
-
-#define ieee80211_stop_queue DO_NOT_USE_ieee80211_stop_queue
-
-#ifdef ieee80211_wake_queue
-#undef ieee80211_wake_queue
-#endif
-
-#define ieee80211_wake_queue DO_NOT_USE_ieee80211_wake_queue
-
-static inline void iwl_legacy_disable_interrupts(struct iwl_priv *priv)
-{
-        clear_bit(STATUS_INT_ENABLED, &priv->status);
-
-        /* disable interrupts from uCode/NIC to host */
-        iwl_write32(priv, CSR_INT_MASK, 0x00000000);
-
-        /* acknowledge/clear/reset any interrupts still pending
-         * from uCode or flow handler (Rx/Tx DMA) */
-        iwl_write32(priv, CSR_INT, 0xffffffff);
-        iwl_write32(priv, CSR_FH_INT_STATUS, 0xffffffff);
-        IWL_DEBUG_ISR(priv, "Disabled interrupts\n");
-}
-
-static inline void iwl_legacy_enable_rfkill_int(struct iwl_priv *priv)
-{
-        IWL_DEBUG_ISR(priv, "Enabling rfkill interrupt\n");
-        iwl_write32(priv, CSR_INT_MASK, CSR_INT_BIT_RF_KILL);
-}
-
-static inline void iwl_legacy_enable_interrupts(struct iwl_priv *priv)
-{
-        IWL_DEBUG_ISR(priv, "Enabling interrupts\n");
-        set_bit(STATUS_INT_ENABLED, &priv->status);
-        iwl_write32(priv, CSR_INT_MASK, priv->inta_mask);
-}
-
-/**
- * iwl_legacy_beacon_time_mask_low - mask of lower 32 bit of beacon time
- * @priv -- pointer to iwl_priv data structure
- * @tsf_bits -- number of bits need to shift for masking)
- */
-static inline u32 iwl_legacy_beacon_time_mask_low(struct iwl_priv *priv,
-                                           u16 tsf_bits)
-{
-        return (1 << tsf_bits) - 1;
-}
-
-/**
- * iwl_legacy_beacon_time_mask_high - mask of higher 32 bit of beacon time
- * @priv -- pointer to iwl_priv data structure
- * @tsf_bits -- number of bits need to shift for masking)
- */
-static inline u32 iwl_legacy_beacon_time_mask_high(struct iwl_priv *priv,
-                                            u16 tsf_bits)
-{
-        return ((1 << (32 - tsf_bits)) - 1) << tsf_bits;
-}
-
-#endif                          /* __iwl_legacy_helpers_h__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-io.h b/drivers/net/wireless/iwlegacy/iwl-io.h
deleted file mode 100644
index 5cc5d342914f..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-io.h
+++ /dev/null
@@ -1,545 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-
-#ifndef __iwl_legacy_io_h__
-#define __iwl_legacy_io_h__
-
-#include <linux/io.h>
-
-#include "iwl-dev.h"
-#include "iwl-debug.h"
-#include "iwl-devtrace.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_legacy_read_direct32 calls the non-check version of
- * _iwl_legacy_read32.)
- *
- * These declarations are *extremely* useful in quickly isolating code deltas
- * which result in misconfiguration 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.
- *
- */
-
-static inline void _iwl_legacy_write8(struct iwl_priv *priv, u32 ofs, u8 val)
-{
-        trace_iwlwifi_legacy_dev_iowrite8(priv, ofs, val);
-        iowrite8(val, priv->hw_base + ofs);
-}
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-static inline void
-__iwl_legacy_write8(const char *f, u32 l, struct iwl_priv *priv,
-                                 u32 ofs, u8 val)
-{
-        IWL_DEBUG_IO(priv, "write8(0x%08X, 0x%02X) - %s %d\n", ofs, val, f, l);
-        _iwl_legacy_write8(priv, ofs, val);
-}
-#define iwl_write8(priv, ofs, val) \
-        __iwl_legacy_write8(__FILE__, __LINE__, priv, ofs, val)
-#else
-#define iwl_write8(priv, ofs, val) _iwl_legacy_write8(priv, ofs, val)
-#endif
-
-
-static inline void _iwl_legacy_write32(struct iwl_priv *priv, u32 ofs, u32 val)
-{
-        trace_iwlwifi_legacy_dev_iowrite32(priv, ofs, val);
-        iowrite32(val, priv->hw_base + ofs);
-}
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-static inline void
-__iwl_legacy_write32(const char *f, u32 l, struct iwl_priv *priv,
-                                 u32 ofs, u32 val)
-{
-        IWL_DEBUG_IO(priv, "write32(0x%08X, 0x%08X) - %s %d\n", ofs, val, f, l);
-        _iwl_legacy_write32(priv, ofs, val);
-}
-#define iwl_write32(priv, ofs, val) \
-        __iwl_legacy_write32(__FILE__, __LINE__, priv, ofs, val)
-#else
-#define iwl_write32(priv, ofs, val) _iwl_legacy_write32(priv, ofs, val)
-#endif
-
-static inline u32 _iwl_legacy_read32(struct iwl_priv *priv, u32 ofs)
-{
-        u32 val = ioread32(priv->hw_base + ofs);
-        trace_iwlwifi_legacy_dev_ioread32(priv, ofs, val);
-        return val;
-}
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-static inline u32
-__iwl_legacy_read32(char *f, u32 l, struct iwl_priv *priv, u32 ofs)
-{
-        IWL_DEBUG_IO(priv, "read_direct32(0x%08X) - %s %d\n", ofs, f, l);
-        return _iwl_legacy_read32(priv, ofs);
-}
-#define iwl_read32(priv, ofs) __iwl_legacy_read32(__FILE__, __LINE__, priv, ofs)
-#else
-#define iwl_read32(p, o) _iwl_legacy_read32(p, o)
-#endif
-
-#define IWL_POLL_INTERVAL 10    /* microseconds */
-static inline int
-_iwl_legacy_poll_bit(struct iwl_priv *priv, u32 addr,
-                                u32 bits, u32 mask, int timeout)
-{
-        int t = 0;
-
-        do {
-                if ((_iwl_legacy_read32(priv, addr) & mask) == (bits & mask))
-                        return t;
-                udelay(IWL_POLL_INTERVAL);
-                t += IWL_POLL_INTERVAL;
-        } while (t < timeout);
-
-        return -ETIMEDOUT;
-}
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-static inline int __iwl_legacy_poll_bit(const char *f, u32 l,
-                                 struct iwl_priv *priv, u32 addr,
-                                 u32 bits, u32 mask, int timeout)
-{
-        int ret = _iwl_legacy_poll_bit(priv, addr, bits, mask, timeout);
-        IWL_DEBUG_IO(priv, "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_legacy_poll_bit(__FILE__, __LINE__, priv, addr, \
-        bits, mask, timeout)
-#else
-#define iwl_poll_bit(p, a, b, m, t) _iwl_legacy_poll_bit(p, a, b, m, t)
-#endif
-
-static inline void _iwl_legacy_set_bit(struct iwl_priv *priv, u32 reg, u32 mask)
-{
-        _iwl_legacy_write32(priv, reg, _iwl_legacy_read32(priv, reg) | mask);
-}
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-static inline void __iwl_legacy_set_bit(const char *f, u32 l,
-                                 struct iwl_priv *priv, u32 reg, u32 mask)
-{
-        u32 val = _iwl_legacy_read32(priv, reg) | mask;
-        IWL_DEBUG_IO(priv, "set_bit(0x%08X, 0x%08X) = 0x%08X\n", reg,
-                                                        mask, val);
-        _iwl_legacy_write32(priv, reg, val);
-}
-static inline void iwl_legacy_set_bit(struct iwl_priv *p, u32 r, u32 m)
-{
-        unsigned long reg_flags;
-
-        spin_lock_irqsave(&p->reg_lock, reg_flags);
-        __iwl_legacy_set_bit(__FILE__, __LINE__, p, r, m);
-        spin_unlock_irqrestore(&p->reg_lock, reg_flags);
-}
-#else
-static inline void iwl_legacy_set_bit(struct iwl_priv *p, u32 r, u32 m)
-{
-        unsigned long reg_flags;
-
-        spin_lock_irqsave(&p->reg_lock, reg_flags);
-        _iwl_legacy_set_bit(p, r, m);
-        spin_unlock_irqrestore(&p->reg_lock, reg_flags);
-}
-#endif
-
-static inline void
-_iwl_legacy_clear_bit(struct iwl_priv *priv, u32 reg, u32 mask)
-{
-        _iwl_legacy_write32(priv, reg, _iwl_legacy_read32(priv, reg) & ~mask);
-}
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-static inline void
-__iwl_legacy_clear_bit(const char *f, u32 l,
-                                   struct iwl_priv *priv, u32 reg, u32 mask)
-{
-        u32 val = _iwl_legacy_read32(priv, reg) & ~mask;
-        IWL_DEBUG_IO(priv, "clear_bit(0x%08X, 0x%08X) = 0x%08X\n", reg, mask, val);
-        _iwl_legacy_write32(priv, reg, val);
-}
-static inline void iwl_legacy_clear_bit(struct iwl_priv *p, u32 r, u32 m)
-{
-        unsigned long reg_flags;
-
-        spin_lock_irqsave(&p->reg_lock, reg_flags);
-        __iwl_legacy_clear_bit(__FILE__, __LINE__, p, r, m);
-        spin_unlock_irqrestore(&p->reg_lock, reg_flags);
-}
-#else
-static inline void iwl_legacy_clear_bit(struct iwl_priv *p, u32 r, u32 m)
-{
-        unsigned long reg_flags;
-
-        spin_lock_irqsave(&p->reg_lock, reg_flags);
-        _iwl_legacy_clear_bit(p, r, m);
-        spin_unlock_irqrestore(&p->reg_lock, reg_flags);
-}
-#endif
-
-static inline int _iwl_legacy_grab_nic_access(struct iwl_priv *priv)
-{
-        int ret;
-        u32 val;
-
-        /* this bit wakes up the NIC */
-        _iwl_legacy_set_bit(priv, CSR_GP_CNTRL,
-                                CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-
-        /*
-         * These bits say the device is running, and should keep running for
-         * at least a short while (at least as long as MAC_ACCESS_REQ stays 1),
-         * but they do not indicate that embedded SRAM is restored yet;
-         * 3945 and 4965 have volatile SRAM, and must save/restore contents
-         * to/from host DRAM when sleeping/waking for power-saving.
-         * Each direction takes approximately 1/4 millisecond; with this
-         * overhead, it's a good idea to grab and hold MAC_ACCESS_REQUEST if a
-         * series of register accesses are expected (e.g. reading Event Log),
-         * to keep device from sleeping.
-         *
-         * CSR_UCODE_DRV_GP1 register bit MAC_SLEEP == 0 indicates that
-         * SRAM is okay/restored.  We don't check that here because this call
-         * is just for hardware register access; but GP1 MAC_SLEEP check is a
-         * good idea before accessing 3945/4965 SRAM (e.g. reading Event Log).
-         *
-         */
-        ret = _iwl_legacy_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), 15000);
-        if (ret < 0) {
-                val = _iwl_legacy_read32(priv, CSR_GP_CNTRL);
-                IWL_ERR(priv,
-                        "MAC is in deep sleep!.  CSR_GP_CNTRL = 0x%08X\n", val);
-                _iwl_legacy_write32(priv, CSR_RESET,
-                                CSR_RESET_REG_FLAG_FORCE_NMI);
-                return -EIO;
-        }
-
-        return 0;
-}
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-static inline int __iwl_legacy_grab_nic_access(const char *f, u32 l,
-                                               struct iwl_priv *priv)
-{
-        IWL_DEBUG_IO(priv, "grabbing nic access - %s %d\n", f, l);
-        return _iwl_legacy_grab_nic_access(priv);
-}
-#define iwl_grab_nic_access(priv) \
-        __iwl_legacy_grab_nic_access(__FILE__, __LINE__, priv)
-#else
-#define iwl_grab_nic_access(priv) \
-        _iwl_legacy_grab_nic_access(priv)
-#endif
-
-static inline void _iwl_legacy_release_nic_access(struct iwl_priv *priv)
-{
-        _iwl_legacy_clear_bit(priv, CSR_GP_CNTRL,
-                        CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-}
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-static inline void __iwl_legacy_release_nic_access(const char *f, u32 l,
-                                            struct iwl_priv *priv)
-{
-
-        IWL_DEBUG_IO(priv, "releasing nic access - %s %d\n", f, l);
-        _iwl_legacy_release_nic_access(priv);
-}
-#define iwl_release_nic_access(priv) \
-        __iwl_legacy_release_nic_access(__FILE__, __LINE__, priv)
-#else
-#define iwl_release_nic_access(priv) \
-        _iwl_legacy_release_nic_access(priv)
-#endif
-
-static inline u32 _iwl_legacy_read_direct32(struct iwl_priv *priv, u32 reg)
-{
-        return _iwl_legacy_read32(priv, reg);
-}
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-static inline u32 __iwl_legacy_read_direct32(const char *f, u32 l,
-                                        struct iwl_priv *priv, u32 reg)
-{
-        u32 value = _iwl_legacy_read_direct32(priv, reg);
-        IWL_DEBUG_IO(priv,
-                        "read_direct32(0x%4X) = 0x%08x - %s %d\n", reg, value,
-                     f, l);
-        return value;
-}
-static inline u32 iwl_legacy_read_direct32(struct iwl_priv *priv, u32 reg)
-{
-        u32 value;
-        unsigned long reg_flags;
-
-        spin_lock_irqsave(&priv->reg_lock, reg_flags);
-        iwl_grab_nic_access(priv);
-        value = __iwl_legacy_read_direct32(__FILE__, __LINE__, priv, reg);
-        iwl_release_nic_access(priv);
-        spin_unlock_irqrestore(&priv->reg_lock, reg_flags);
-        return value;
-}
-
-#else
-static inline u32 iwl_legacy_read_direct32(struct iwl_priv *priv, u32 reg)
-{
-        u32 value;
-        unsigned long reg_flags;
-
-        spin_lock_irqsave(&priv->reg_lock, reg_flags);
-        iwl_grab_nic_access(priv);
-        value = _iwl_legacy_read_direct32(priv, reg);
-        iwl_release_nic_access(priv);
-        spin_unlock_irqrestore(&priv->reg_lock, reg_flags);
-        return value;
-
-}
-#endif
-
-static inline void _iwl_legacy_write_direct32(struct iwl_priv *priv,
-                                         u32 reg, u32 value)
-{
-        _iwl_legacy_write32(priv, reg, value);
-}
-static inline void
-iwl_legacy_write_direct32(struct iwl_priv *priv, u32 reg, u32 value)
-{
-        unsigned long reg_flags;
-
-        spin_lock_irqsave(&priv->reg_lock, reg_flags);
-        if (!iwl_grab_nic_access(priv)) {
-                _iwl_legacy_write_direct32(priv, reg, value);
-                iwl_release_nic_access(priv);
-        }
-        spin_unlock_irqrestore(&priv->reg_lock, reg_flags);
-}
-
-static inline void iwl_legacy_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_legacy_write_direct32(priv, reg, *values);
-        }
-}
-
-static inline int _iwl_legacy_poll_direct_bit(struct iwl_priv *priv, u32 addr,
-                                       u32 mask, int timeout)
-{
-        int t = 0;
-
-        do {
-                if ((iwl_legacy_read_direct32(priv, addr) & mask) == mask)
-                        return t;
-                udelay(IWL_POLL_INTERVAL);
-                t += IWL_POLL_INTERVAL;
-        } while (t < timeout);
-
-        return -ETIMEDOUT;
-}
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-static inline int __iwl_legacy_poll_direct_bit(const char *f, u32 l,
-                                            struct iwl_priv *priv,
-                                            u32 addr, u32 mask, int timeout)
-{
-        int ret  = _iwl_legacy_poll_direct_bit(priv, addr, mask, timeout);
-
-        if (unlikely(ret == -ETIMEDOUT))
-                IWL_DEBUG_IO(priv, "poll_direct_bit(0x%08X, 0x%08X) - "
-                             "timedout - %s %d\n", addr, mask, f, l);
-        else
-                IWL_DEBUG_IO(priv, "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_legacy_poll_direct_bit(__FILE__, __LINE__, priv, addr, mask, timeout)
-#else
-#define iwl_poll_direct_bit _iwl_legacy_poll_direct_bit
-#endif
-
-static inline u32 _iwl_legacy_read_prph(struct iwl_priv *priv, u32 reg)
-{
-        _iwl_legacy_write_direct32(priv, HBUS_TARG_PRPH_RADDR, reg | (3 << 24));
-        rmb();
-        return _iwl_legacy_read_direct32(priv, HBUS_TARG_PRPH_RDAT);
-}
-static inline u32 iwl_legacy_read_prph(struct iwl_priv *priv, u32 reg)
-{
-        unsigned long reg_flags;
-        u32 val;
-
-        spin_lock_irqsave(&priv->reg_lock, reg_flags);
-        iwl_grab_nic_access(priv);
-        val = _iwl_legacy_read_prph(priv, reg);
-        iwl_release_nic_access(priv);
-        spin_unlock_irqrestore(&priv->reg_lock, reg_flags);
-        return val;
-}
-
-static inline void _iwl_legacy_write_prph(struct iwl_priv *priv,
-                                             u32 addr, u32 val)
-{
-        _iwl_legacy_write_direct32(priv, HBUS_TARG_PRPH_WADDR,
-                              ((addr & 0x0000FFFF) | (3 << 24)));
-        wmb();
-        _iwl_legacy_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val);
-}
-
-static inline void
-iwl_legacy_write_prph(struct iwl_priv *priv, u32 addr, u32 val)
-{
-        unsigned long reg_flags;
-
-        spin_lock_irqsave(&priv->reg_lock, reg_flags);
-        if (!iwl_grab_nic_access(priv)) {
-                _iwl_legacy_write_prph(priv, addr, val);
-                iwl_release_nic_access(priv);
-        }
-        spin_unlock_irqrestore(&priv->reg_lock, reg_flags);
-}
-
-#define _iwl_legacy_set_bits_prph(priv, reg, mask) \
-_iwl_legacy_write_prph(priv, reg, (_iwl_legacy_read_prph(priv, reg) | mask))
-
-static inline void
-iwl_legacy_set_bits_prph(struct iwl_priv *priv, u32 reg, u32 mask)
-{
-        unsigned long reg_flags;
-
-        spin_lock_irqsave(&priv->reg_lock, reg_flags);
-        iwl_grab_nic_access(priv);
-        _iwl_legacy_set_bits_prph(priv, reg, mask);
-        iwl_release_nic_access(priv);
-        spin_unlock_irqrestore(&priv->reg_lock, reg_flags);
-}
-
-#define _iwl_legacy_set_bits_mask_prph(priv, reg, bits, mask) \
-_iwl_legacy_write_prph(priv, reg,                               \
-                 ((_iwl_legacy_read_prph(priv, reg) & mask) | bits))
-
-static inline void iwl_legacy_set_bits_mask_prph(struct iwl_priv *priv, u32 reg,
-                                u32 bits, u32 mask)
-{
-        unsigned long reg_flags;
-
-        spin_lock_irqsave(&priv->reg_lock, reg_flags);
-        iwl_grab_nic_access(priv);
-        _iwl_legacy_set_bits_mask_prph(priv, reg, bits, mask);
-        iwl_release_nic_access(priv);
-        spin_unlock_irqrestore(&priv->reg_lock, reg_flags);
-}
-
-static inline void iwl_legacy_clear_bits_prph(struct iwl_priv
-                                                 *priv, u32 reg, u32 mask)
-{
-        unsigned long reg_flags;
-        u32 val;
-
-        spin_lock_irqsave(&priv->reg_lock, reg_flags);
-        iwl_grab_nic_access(priv);
-        val = _iwl_legacy_read_prph(priv, reg);
-        _iwl_legacy_write_prph(priv, reg, (val & ~mask));
-        iwl_release_nic_access(priv);
-        spin_unlock_irqrestore(&priv->reg_lock, reg_flags);
-}
-
-static inline u32 iwl_legacy_read_targ_mem(struct iwl_priv *priv, u32 addr)
-{
-        unsigned long reg_flags;
-        u32 value;
-
-        spin_lock_irqsave(&priv->reg_lock, reg_flags);
-        iwl_grab_nic_access(priv);
-
-        _iwl_legacy_write_direct32(priv, HBUS_TARG_MEM_RADDR, addr);
-        rmb();
-        value = _iwl_legacy_read_direct32(priv, HBUS_TARG_MEM_RDAT);
-
-        iwl_release_nic_access(priv);
-        spin_unlock_irqrestore(&priv->reg_lock, reg_flags);
-        return value;
-}
-
-static inline void
-iwl_legacy_write_targ_mem(struct iwl_priv *priv, u32 addr, u32 val)
-{
-        unsigned long reg_flags;
-
-        spin_lock_irqsave(&priv->reg_lock, reg_flags);
-        if (!iwl_grab_nic_access(priv)) {
-                _iwl_legacy_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);
-                wmb();
-                _iwl_legacy_write_direct32(priv, HBUS_TARG_MEM_WDAT, val);
-                iwl_release_nic_access(priv);
-        }
-        spin_unlock_irqrestore(&priv->reg_lock, reg_flags);
-}
-
-static inline void
-iwl_legacy_write_targ_mem_buf(struct iwl_priv *priv, u32 addr,
-                                          u32 len, u32 *values)
-{
-        unsigned long reg_flags;
-
-        spin_lock_irqsave(&priv->reg_lock, reg_flags);
-        if (!iwl_grab_nic_access(priv)) {
-                _iwl_legacy_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);
-                wmb();
-                for (; 0 < len; len -= sizeof(u32), values++)
-                        _iwl_legacy_write_direct32(priv,
-                                        HBUS_TARG_MEM_WDAT, *values);
-
-                iwl_release_nic_access(priv);
-        }
-        spin_unlock_irqrestore(&priv->reg_lock, reg_flags);
-}
-#endif
diff --git a/drivers/net/wireless/iwlegacy/iwl-led.c b/drivers/net/wireless/iwlegacy/iwl-led.c
deleted file mode 100644
index dc568a474c5d..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-led.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@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/init.h>
-#include <linux/pci.h>
-#include <linux/dma-mapping.h>
-#include <linux/delay.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <net/mac80211.h>
-#include <linux/etherdevice.h>
-#include <asm/unaligned.h>
-
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-io.h"
-
-/* default: IWL_LED_BLINK(0) using blinking index table */
-static int led_mode;
-module_param(led_mode, int, S_IRUGO);
-MODULE_PARM_DESC(led_mode, "0=system default, "
-                "1=On(RF On)/Off(RF Off), 2=blinking");
-
-/* Throughput           OFF time(ms)    ON time (ms)
- *      >300                    25              25
- *      >200 to 300             40              40
- *      >100 to 200             55              55
- *      >70 to 100              65              65
- *      >50 to 70               75              75
- *      >20 to 50               85              85
- *      >10 to 20               95              95
- *      >5 to 10                110             110
- *      >1 to 5                 130             130
- *      >0 to 1                 167             167
- *      <=0                                     SOLID ON
- */
-static const struct ieee80211_tpt_blink iwl_blink[] = {
-        { .throughput = 0, .blink_time = 334 },
-        { .throughput = 1 * 1024 - 1, .blink_time = 260 },
-        { .throughput = 5 * 1024 - 1, .blink_time = 220 },
-        { .throughput = 10 * 1024 - 1, .blink_time = 190 },
-        { .throughput = 20 * 1024 - 1, .blink_time = 170 },
-        { .throughput = 50 * 1024 - 1, .blink_time = 150 },
-        { .throughput = 70 * 1024 - 1, .blink_time = 130 },
-        { .throughput = 100 * 1024 - 1, .blink_time = 110 },
-        { .throughput = 200 * 1024 - 1, .blink_time = 80 },
-        { .throughput = 300 * 1024 - 1, .blink_time = 50 },
-};
-
-/*
- * Adjust led blink rate to compensate on a MAC Clock difference on every HW
- * Led blink rate analysis showed an average deviation of 0% on 3945,
- * 5% on 4965 HW.
- * Need to compensate on the led on/off time per HW according to the deviation
- * to achieve the desired led frequency
- * The calculation is: (100-averageDeviation)/100 * blinkTime
- * For code efficiency the calculation will be:
- *     compensation = (100 - averageDeviation) * 64 / 100
- *     NewBlinkTime = (compensation * BlinkTime) / 64
- */
-static inline u8 iwl_legacy_blink_compensation(struct iwl_priv *priv,
-                                    u8 time, u16 compensation)
-{
-        if (!compensation) {
-                IWL_ERR(priv, "undefined blink compensation: "
-                        "use pre-defined blinking time\n");
-                return time;
-        }
-
-        return (u8)((time * compensation) >> 6);
-}
-
-/* Set led pattern command */
-static int iwl_legacy_led_cmd(struct iwl_priv *priv,
-                       unsigned long on,
-                       unsigned long off)
-{
-        struct iwl_led_cmd led_cmd = {
-                .id = IWL_LED_LINK,
-                .interval = IWL_DEF_LED_INTRVL
-        };
-        int ret;
-
-        if (!test_bit(STATUS_READY, &priv->status))
-                return -EBUSY;
-
-        if (priv->blink_on == on && priv->blink_off == off)
-                return 0;
-
-        if (off == 0) {
-                /* led is SOLID_ON */
-                on = IWL_LED_SOLID;
-        }
-
-        IWL_DEBUG_LED(priv, "Led blink time compensation=%u\n",
-                        priv->cfg->base_params->led_compensation);
-        led_cmd.on = iwl_legacy_blink_compensation(priv, on,
-                                priv->cfg->base_params->led_compensation);
-        led_cmd.off = iwl_legacy_blink_compensation(priv, off,
-                                priv->cfg->base_params->led_compensation);
-
-        ret = priv->cfg->ops->led->cmd(priv, &led_cmd);
-        if (!ret) {
-                priv->blink_on = on;
-                priv->blink_off = off;
-        }
-        return ret;
-}
-
-static void iwl_legacy_led_brightness_set(struct led_classdev *led_cdev,
-                                   enum led_brightness brightness)
-{
-        struct iwl_priv *priv = container_of(led_cdev, struct iwl_priv, led);
-        unsigned long on = 0;
-
-        if (brightness > 0)
-                on = IWL_LED_SOLID;
-
-        iwl_legacy_led_cmd(priv, on, 0);
-}
-
-static int iwl_legacy_led_blink_set(struct led_classdev *led_cdev,
-                             unsigned long *delay_on,
-                             unsigned long *delay_off)
-{
-        struct iwl_priv *priv = container_of(led_cdev, struct iwl_priv, led);
-
-        return iwl_legacy_led_cmd(priv, *delay_on, *delay_off);
-}
-
-void iwl_legacy_leds_init(struct iwl_priv *priv)
-{
-        int mode = led_mode;
-        int ret;
-
-        if (mode == IWL_LED_DEFAULT)
-                mode = priv->cfg->led_mode;
-
-        priv->led.name = kasprintf(GFP_KERNEL, "%s-led",
-                                   wiphy_name(priv->hw->wiphy));
-        priv->led.brightness_set = iwl_legacy_led_brightness_set;
-        priv->led.blink_set = iwl_legacy_led_blink_set;
-        priv->led.max_brightness = 1;
-
-        switch (mode) {
-        case IWL_LED_DEFAULT:
-                WARN_ON(1);
-                break;
-        case IWL_LED_BLINK:
-                priv->led.default_trigger =
-                        ieee80211_create_tpt_led_trigger(priv->hw,
-                                        IEEE80211_TPT_LEDTRIG_FL_CONNECTED,
-                                        iwl_blink, ARRAY_SIZE(iwl_blink));
-                break;
-        case IWL_LED_RF_STATE:
-                priv->led.default_trigger =
-                        ieee80211_get_radio_led_name(priv->hw);
-                break;
-        }
-
-        ret = led_classdev_register(&priv->pci_dev->dev, &priv->led);
-        if (ret) {
-                kfree(priv->led.name);
-                return;
-        }
-
-        priv->led_registered = true;
-}
-EXPORT_SYMBOL(iwl_legacy_leds_init);
-
-void iwl_legacy_leds_exit(struct iwl_priv *priv)
-{
-        if (!priv->led_registered)
-                return;
-
-        led_classdev_unregister(&priv->led);
-        kfree(priv->led.name);
-}
-EXPORT_SYMBOL(iwl_legacy_leds_exit);
diff --git a/drivers/net/wireless/iwlegacy/iwl-led.h b/drivers/net/wireless/iwlegacy/iwl-led.h
deleted file mode 100644
index f0791f70f79d..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-led.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-
-#ifndef __iwl_legacy_leds_h__
-#define __iwl_legacy_leds_h__
-
-
-struct iwl_priv;
-
-#define IWL_LED_SOLID 11
-#define IWL_DEF_LED_INTRVL cpu_to_le32(1000)
-
-#define IWL_LED_ACTIVITY       (0<<1)
-#define IWL_LED_LINK           (1<<1)
-
-/*
- * LED mode
- *    IWL_LED_DEFAULT:  use device default
- *    IWL_LED_RF_STATE: turn LED on/off based on RF state
- *                      LED ON  = RF ON
- *                      LED OFF = RF OFF
- *    IWL_LED_BLINK:    adjust led blink rate based on blink table
- */
-enum iwl_led_mode {
-        IWL_LED_DEFAULT,
-        IWL_LED_RF_STATE,
-        IWL_LED_BLINK,
-};
-
-void iwl_legacy_leds_init(struct iwl_priv *priv);
-void iwl_legacy_leds_exit(struct iwl_priv *priv);
-
-#endif /* __iwl_legacy_leds_h__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-legacy-rs.h b/drivers/net/wireless/iwlegacy/iwl-legacy-rs.h
deleted file mode 100644
index 38647e481eb0..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-legacy-rs.h
+++ /dev/null
@@ -1,456 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-
-#ifndef __iwl_legacy_rs_h__
-#define __iwl_legacy_rs_h__
-
-struct iwl_rate_info {
-        u8 plcp;        /* uCode API:  IWL_RATE_6M_PLCP, etc. */
-        u8 plcp_siso;   /* uCode API:  IWL_RATE_SISO_6M_PLCP, etc. */
-        u8 plcp_mimo2;  /* uCode API:  IWL_RATE_MIMO2_6M_PLCP, etc. */
-        u8 ieee;        /* MAC header:  IWL_RATE_6M_IEEE, etc. */
-        u8 prev_ieee;    /* previous rate in IEEE speeds */
-        u8 next_ieee;    /* next rate in IEEE speeds */
-        u8 prev_rs;      /* previous rate used in rs algo */
-        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 */
-};
-
-struct iwl3945_rate_info {
-        u8 plcp;                /* uCode API:  IWL_RATE_6M_PLCP, etc. */
-        u8 ieee;                /* MAC header:  IWL_RATE_6M_IEEE, etc. */
-        u8 prev_ieee;           /* previous rate in IEEE speeds */
-        u8 next_ieee;           /* next rate in IEEE speeds */
-        u8 prev_rs;             /* previous rate used in rs algo */
-        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 */
-};
-
-
-/*
- * These serve as indexes into
- * struct iwl_rate_info iwlegacy_rates[IWL_RATE_COUNT];
- */
-enum {
-        IWL_RATE_1M_INDEX = 0,
-        IWL_RATE_2M_INDEX,
-        IWL_RATE_5M_INDEX,
-        IWL_RATE_11M_INDEX,
-        IWL_RATE_6M_INDEX,
-        IWL_RATE_9M_INDEX,
-        IWL_RATE_12M_INDEX,
-        IWL_RATE_18M_INDEX,
-        IWL_RATE_24M_INDEX,
-        IWL_RATE_36M_INDEX,
-        IWL_RATE_48M_INDEX,
-        IWL_RATE_54M_INDEX,
-        IWL_RATE_60M_INDEX,
-        IWL_RATE_COUNT,
-        IWL_RATE_COUNT_LEGACY = IWL_RATE_COUNT - 1,     /* Excluding 60M */
-        IWL_RATE_COUNT_3945 = IWL_RATE_COUNT - 1,
-        IWL_RATE_INVM_INDEX = IWL_RATE_COUNT,
-        IWL_RATE_INVALID = IWL_RATE_COUNT,
-};
-
-enum {
-        IWL_RATE_6M_INDEX_TABLE = 0,
-        IWL_RATE_9M_INDEX_TABLE,
-        IWL_RATE_12M_INDEX_TABLE,
-        IWL_RATE_18M_INDEX_TABLE,
-        IWL_RATE_24M_INDEX_TABLE,
-        IWL_RATE_36M_INDEX_TABLE,
-        IWL_RATE_48M_INDEX_TABLE,
-        IWL_RATE_54M_INDEX_TABLE,
-        IWL_RATE_1M_INDEX_TABLE,
-        IWL_RATE_2M_INDEX_TABLE,
-        IWL_RATE_5M_INDEX_TABLE,
-        IWL_RATE_11M_INDEX_TABLE,
-        IWL_RATE_INVM_INDEX_TABLE = IWL_RATE_INVM_INDEX - 1,
-};
-
-enum {
-        IWL_FIRST_OFDM_RATE = IWL_RATE_6M_INDEX,
-        IWL39_LAST_OFDM_RATE = IWL_RATE_54M_INDEX,
-        IWL_LAST_OFDM_RATE = IWL_RATE_60M_INDEX,
-        IWL_FIRST_CCK_RATE = IWL_RATE_1M_INDEX,
-        IWL_LAST_CCK_RATE = IWL_RATE_11M_INDEX,
-};
-
-/* #define vs. enum to keep from defaulting to 'large integer' */
-#define IWL_RATE_6M_MASK   (1 << IWL_RATE_6M_INDEX)
-#define IWL_RATE_9M_MASK   (1 << IWL_RATE_9M_INDEX)
-#define IWL_RATE_12M_MASK  (1 << IWL_RATE_12M_INDEX)
-#define IWL_RATE_18M_MASK  (1 << IWL_RATE_18M_INDEX)
-#define IWL_RATE_24M_MASK  (1 << IWL_RATE_24M_INDEX)
-#define IWL_RATE_36M_MASK  (1 << IWL_RATE_36M_INDEX)
-#define IWL_RATE_48M_MASK  (1 << IWL_RATE_48M_INDEX)
-#define IWL_RATE_54M_MASK  (1 << IWL_RATE_54M_INDEX)
-#define IWL_RATE_60M_MASK  (1 << IWL_RATE_60M_INDEX)
-#define IWL_RATE_1M_MASK   (1 << IWL_RATE_1M_INDEX)
-#define IWL_RATE_2M_MASK   (1 << IWL_RATE_2M_INDEX)
-#define IWL_RATE_5M_MASK   (1 << IWL_RATE_5M_INDEX)
-#define IWL_RATE_11M_MASK  (1 << IWL_RATE_11M_INDEX)
-
-/* uCode API values for legacy bit rates, both OFDM and CCK */
-enum {
-        IWL_RATE_6M_PLCP  = 13,
-        IWL_RATE_9M_PLCP  = 15,
-        IWL_RATE_12M_PLCP = 5,
-        IWL_RATE_18M_PLCP = 7,
-        IWL_RATE_24M_PLCP = 9,
-        IWL_RATE_36M_PLCP = 11,
-        IWL_RATE_48M_PLCP = 1,
-        IWL_RATE_54M_PLCP = 3,
-        IWL_RATE_60M_PLCP = 3,/*FIXME:RS:should be removed*/
-        IWL_RATE_1M_PLCP  = 10,
-        IWL_RATE_2M_PLCP  = 20,
-        IWL_RATE_5M_PLCP  = 55,
-        IWL_RATE_11M_PLCP = 110,
-        /*FIXME:RS:add IWL_RATE_LEGACY_INVM_PLCP = 0,*/
-};
-
-/* uCode API values for OFDM high-throughput (HT) bit rates */
-enum {
-        IWL_RATE_SISO_6M_PLCP = 0,
-        IWL_RATE_SISO_12M_PLCP = 1,
-        IWL_RATE_SISO_18M_PLCP = 2,
-        IWL_RATE_SISO_24M_PLCP = 3,
-        IWL_RATE_SISO_36M_PLCP = 4,
-        IWL_RATE_SISO_48M_PLCP = 5,
-        IWL_RATE_SISO_54M_PLCP = 6,
-        IWL_RATE_SISO_60M_PLCP = 7,
-        IWL_RATE_MIMO2_6M_PLCP  = 0x8,
-        IWL_RATE_MIMO2_12M_PLCP = 0x9,
-        IWL_RATE_MIMO2_18M_PLCP = 0xa,
-        IWL_RATE_MIMO2_24M_PLCP = 0xb,
-        IWL_RATE_MIMO2_36M_PLCP = 0xc,
-        IWL_RATE_MIMO2_48M_PLCP = 0xd,
-        IWL_RATE_MIMO2_54M_PLCP = 0xe,
-        IWL_RATE_MIMO2_60M_PLCP = 0xf,
-        IWL_RATE_SISO_INVM_PLCP,
-        IWL_RATE_MIMO2_INVM_PLCP = IWL_RATE_SISO_INVM_PLCP,
-};
-
-/* MAC header values for bit rates */
-enum {
-        IWL_RATE_6M_IEEE  = 12,
-        IWL_RATE_9M_IEEE  = 18,
-        IWL_RATE_12M_IEEE = 24,
-        IWL_RATE_18M_IEEE = 36,
-        IWL_RATE_24M_IEEE = 48,
-        IWL_RATE_36M_IEEE = 72,
-        IWL_RATE_48M_IEEE = 96,
-        IWL_RATE_54M_IEEE = 108,
-        IWL_RATE_60M_IEEE = 120,
-        IWL_RATE_1M_IEEE  = 2,
-        IWL_RATE_2M_IEEE  = 4,
-        IWL_RATE_5M_IEEE  = 11,
-        IWL_RATE_11M_IEEE = 22,
-};
-
-#define IWL_CCK_BASIC_RATES_MASK    \
-        (IWL_RATE_1M_MASK          | \
-        IWL_RATE_2M_MASK)
-
-#define IWL_CCK_RATES_MASK          \
-        (IWL_CCK_BASIC_RATES_MASK  | \
-        IWL_RATE_5M_MASK          | \
-        IWL_RATE_11M_MASK)
-
-#define IWL_OFDM_BASIC_RATES_MASK   \
-        (IWL_RATE_6M_MASK         | \
-        IWL_RATE_12M_MASK         | \
-        IWL_RATE_24M_MASK)
-
-#define IWL_OFDM_RATES_MASK         \
-        (IWL_OFDM_BASIC_RATES_MASK | \
-        IWL_RATE_9M_MASK          | \
-        IWL_RATE_18M_MASK         | \
-        IWL_RATE_36M_MASK         | \
-        IWL_RATE_48M_MASK         | \
-        IWL_RATE_54M_MASK)
-
-#define IWL_BASIC_RATES_MASK         \
-        (IWL_OFDM_BASIC_RATES_MASK | \
-         IWL_CCK_BASIC_RATES_MASK)
-
-#define IWL_RATES_MASK ((1 << IWL_RATE_COUNT) - 1)
-#define IWL_RATES_MASK_3945 ((1 << IWL_RATE_COUNT_3945) - 1)
-
-#define IWL_INVALID_VALUE    -1
-
-#define IWL_MIN_RSSI_VAL                 -100
-#define IWL_MAX_RSSI_VAL                    0
-
-/* These values specify how many Tx frame attempts before
- * searching for a new modulation mode */
-#define IWL_LEGACY_FAILURE_LIMIT        160
-#define IWL_LEGACY_SUCCESS_LIMIT        480
-#define IWL_LEGACY_TABLE_COUNT          160
-
-#define IWL_NONE_LEGACY_FAILURE_LIMIT   400
-#define IWL_NONE_LEGACY_SUCCESS_LIMIT   4500
-#define IWL_NONE_LEGACY_TABLE_COUNT     1500
-
-/* Success ratio (ACKed / attempted tx frames) values (perfect is 128 * 100) */
-#define IWL_RS_GOOD_RATIO               12800   /* 100% */
-#define IWL_RATE_SCALE_SWITCH           10880   /*  85% */
-#define IWL_RATE_HIGH_TH                10880   /*  85% */
-#define IWL_RATE_INCREASE_TH            6400    /*  50% */
-#define IWL_RATE_DECREASE_TH            1920    /*  15% */
-
-/* possible actions when in legacy mode */
-#define IWL_LEGACY_SWITCH_ANTENNA1      0
-#define IWL_LEGACY_SWITCH_ANTENNA2      1
-#define IWL_LEGACY_SWITCH_SISO          2
-#define IWL_LEGACY_SWITCH_MIMO2_AB      3
-#define IWL_LEGACY_SWITCH_MIMO2_AC      4
-#define IWL_LEGACY_SWITCH_MIMO2_BC      5
-
-/* possible actions when in siso mode */
-#define IWL_SISO_SWITCH_ANTENNA1        0
-#define IWL_SISO_SWITCH_ANTENNA2        1
-#define IWL_SISO_SWITCH_MIMO2_AB        2
-#define IWL_SISO_SWITCH_MIMO2_AC        3
-#define IWL_SISO_SWITCH_MIMO2_BC        4
-#define IWL_SISO_SWITCH_GI              5
-
-/* possible actions when in mimo mode */
-#define IWL_MIMO2_SWITCH_ANTENNA1       0
-#define IWL_MIMO2_SWITCH_ANTENNA2       1
-#define IWL_MIMO2_SWITCH_SISO_A         2
-#define IWL_MIMO2_SWITCH_SISO_B         3
-#define IWL_MIMO2_SWITCH_SISO_C         4
-#define IWL_MIMO2_SWITCH_GI             5
-
-#define IWL_MAX_SEARCH IWL_MIMO2_SWITCH_GI
-
-#define IWL_ACTION_LIMIT                3       /* # possible actions */
-
-#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 iwl_rate_info iwlegacy_rates[IWL_RATE_COUNT];
-
-enum iwl_table_type {
-        LQ_NONE,
-        LQ_G,           /* legacy types */
-        LQ_A,
-        LQ_SISO,        /* high-throughput types */
-        LQ_MIMO2,
-        LQ_MAX,
-};
-
-#define is_legacy(tbl) (((tbl) == LQ_G) || ((tbl) == LQ_A))
-#define is_siso(tbl) ((tbl) == LQ_SISO)
-#define is_mimo2(tbl) ((tbl) == LQ_MIMO2)
-#define is_mimo(tbl) (is_mimo2(tbl))
-#define is_Ht(tbl) (is_siso(tbl) || is_mimo(tbl))
-#define is_a_band(tbl) ((tbl) == LQ_A)
-#define is_g_and(tbl) ((tbl) == LQ_G)
-
-#define ANT_NONE        0x0
-#define ANT_A           BIT(0)
-#define ANT_B           BIT(1)
-#define ANT_AB          (ANT_A | ANT_B)
-#define ANT_C           BIT(2)
-#define ANT_AC          (ANT_A | ANT_C)
-#define ANT_BC          (ANT_B | ANT_C)
-#define ANT_ABC         (ANT_AB | ANT_C)
-
-#define IWL_MAX_MCS_DISPLAY_SIZE        12
-
-struct iwl_rate_mcs_info {
-        char    mbps[IWL_MAX_MCS_DISPLAY_SIZE];
-        char    mcs[IWL_MAX_MCS_DISPLAY_SIZE];
-};
-
-/**
- * struct iwl_rate_scale_data -- tx success history for one rate
- */
-struct iwl_rate_scale_data {
-        u64 data;               /* bitmap of successful frames */
-        s32 success_counter;    /* number of frames successful */
-        s32 success_ratio;      /* per-cent * 128  */
-        s32 counter;            /* number of frames attempted */
-        s32 average_tpt;        /* success ratio * expected throughput */
-        unsigned long stamp;
-};
-
-/**
- * struct iwl_scale_tbl_info -- tx params and success history for all rates
- *
- * There are two of these in struct iwl_lq_sta,
- * one for "active", and one for "search".
- */
-struct iwl_scale_tbl_info {
-        enum iwl_table_type lq_type;
-        u8 ant_type;
-        u8 is_SGI;      /* 1 = short guard interval */
-        u8 is_ht40;     /* 1 = 40 MHz channel width */
-        u8 is_dup;      /* 1 = duplicated data streams */
-        u8 action;      /* change modulation; IWL_[LEGACY/SISO/MIMO]_SWITCH_* */
-        u8 max_search;  /* maximun number of tables we can search */
-        s32 *expected_tpt;      /* throughput metrics; expected_tpt_G, etc. */
-        u32 current_rate;  /* rate_n_flags, uCode API format */
-        struct iwl_rate_scale_data win[IWL_RATE_COUNT]; /* rate histories */
-};
-
-struct iwl_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 */
-};
-
-/**
- * struct iwl_lq_sta -- driver's rate scaling private structure
- *
- * Pointer to this gets passed back and forth between driver and mac80211.
- */
-struct iwl_lq_sta {
-        u8 active_tbl;          /* index of active table, range 0-1 */
-        u8 enable_counter;      /* indicates HT mode */
-        u8 stay_in_tbl;         /* 1: disallow, 0: allow search for new mode */
-        u8 search_better_tbl;   /* 1: currently trying alternate mode */
-        s32 last_tpt;
-
-        /* The following determine when to search for a new mode */
-        u32 table_count_limit;
-        u32 max_failure_limit;  /* # failed frames before new search */
-        u32 max_success_limit;  /* # successful frames before new search */
-        u32 table_count;
-        u32 total_failed;       /* total failed frames, any/all rates */
-        u32 total_success;      /* total successful frames, any/all rates */
-        u64 flush_timer;        /* time staying in mode before new search */
-
-        u8 action_counter;      /* # mode-switch actions tried */
-        u8 is_green;
-        u8 is_dup;
-        enum ieee80211_band band;
-
-        /* The following are bitmaps of rates; IWL_RATE_6M_MASK, etc. */
-        u32 supp_rates;
-        u16 active_legacy_rate;
-        u16 active_siso_rate;
-        u16 active_mimo2_rate;
-        s8 max_rate_idx;     /* Max rate set by user */
-        u8 missed_rate_counter;
-
-        struct iwl_link_quality_cmd lq;
-        struct iwl_scale_tbl_info lq_info[LQ_SIZE]; /* "active", "search" */
-        struct iwl_traffic_load load[TID_MAX_LOAD_COUNT];
-        u8 tx_agg_tid_en;
-#ifdef CONFIG_MAC80211_DEBUGFS
-        struct dentry *rs_sta_dbgfs_scale_table_file;
-        struct dentry *rs_sta_dbgfs_stats_table_file;
-        struct dentry *rs_sta_dbgfs_rate_scale_data_file;
-        struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;
-        u32 dbg_fixed_rate;
-#endif
-        struct iwl_priv *drv;
-
-        /* used to be in sta_info */
-        int last_txrate_idx;
-        /* last tx rate_n_flags */
-        u32 last_rate_n_flags;
-        /* packets destined for this STA are aggregated */
-        u8 is_agg;
-};
-
-static inline u8 iwl4965_num_of_ant(u8 mask)
-{
-        return  !!((mask) & ANT_A) +
-                !!((mask) & ANT_B) +
-                !!((mask) & ANT_C);
-}
-
-static inline u8 iwl4965_first_antenna(u8 mask)
-{
-        if (mask & ANT_A)
-                return ANT_A;
-        if (mask & ANT_B)
-                return ANT_B;
-        return ANT_C;
-}
-
-
-/**
- * iwl3945_rate_scale_init - Initialize the rate scale table based on assoc info
- *
- * The specific throughput table used is based on the type of network
- * the associated with, including A, B, G, and G w/ TGG protection
- */
-extern void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id);
-
-/* Initialize station's rate scaling information after adding station */
-extern void iwl4965_rs_rate_init(struct iwl_priv *priv,
-                             struct ieee80211_sta *sta, u8 sta_id);
-extern void iwl3945_rs_rate_init(struct iwl_priv *priv,
-                                 struct ieee80211_sta *sta, u8 sta_id);
-
-/**
- * iwl_rate_control_register - Register the rate control algorithm callbacks
- *
- * Since the rate control algorithm is hardware specific, there is no need
- * or reason to place it as a stand alone module.  The driver can call
- * iwl_rate_control_register in order to register the rate control callbacks
- * with the mac80211 subsystem.  This should be performed prior to calling
- * ieee80211_register_hw
- *
- */
-extern int iwl4965_rate_control_register(void);
-extern int iwl3945_rate_control_register(void);
-
-/**
- * iwl_rate_control_unregister - Unregister the rate control callbacks
- *
- * This should be called after calling ieee80211_unregister_hw, but before
- * the driver is unloaded.
- */
-extern void iwl4965_rate_control_unregister(void);
-extern void iwl3945_rate_control_unregister(void);
-
-#endif /* __iwl_legacy_rs__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-power.c b/drivers/net/wireless/iwlegacy/iwl-power.c
deleted file mode 100644
index 903ef0d6d6cb..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-power.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2011 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:
- *  Intel Linux Wireless <ilw@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/slab.h>
-#include <linux/init.h>
-
-#include <net/mac80211.h>
-
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-io.h"
-#include "iwl-commands.h"
-#include "iwl-debug.h"
-#include "iwl-power.h"
-
-/*
- * Setting power level allows the card to go to sleep when not busy.
- *
- * We calculate a sleep command based on the required latency, which
- * we get from mac80211. In order to handle thermal throttling, we can
- * also use pre-defined power levels.
- */
-
-/*
- * This defines the old power levels. They are still used by default
- * (level 1) and for thermal throttle (levels 3 through 5)
- */
-
-struct iwl_power_vec_entry {
-        struct iwl_powertable_cmd cmd;
-        u8 no_dtim;     /* number of skip dtim */
-};
-
-static void iwl_legacy_power_sleep_cam_cmd(struct iwl_priv *priv,
-                                    struct iwl_powertable_cmd *cmd)
-{
-        memset(cmd, 0, sizeof(*cmd));
-
-        if (priv->power_data.pci_pm)
-                cmd->flags |= IWL_POWER_PCI_PM_MSK;
-
-        IWL_DEBUG_POWER(priv, "Sleep command for CAM\n");
-}
-
-static int
-iwl_legacy_set_power(struct iwl_priv *priv, struct iwl_powertable_cmd *cmd)
-{
-        IWL_DEBUG_POWER(priv, "Sending power/sleep command\n");
-        IWL_DEBUG_POWER(priv, "Flags value = 0x%08X\n", cmd->flags);
-        IWL_DEBUG_POWER(priv, "Tx timeout = %u\n",
-                                        le32_to_cpu(cmd->tx_data_timeout));
-        IWL_DEBUG_POWER(priv, "Rx timeout = %u\n",
-                                        le32_to_cpu(cmd->rx_data_timeout));
-        IWL_DEBUG_POWER(priv,
-                        "Sleep interval vector = { %d , %d , %d , %d , %d }\n",
-                        le32_to_cpu(cmd->sleep_interval[0]),
-                        le32_to_cpu(cmd->sleep_interval[1]),
-                        le32_to_cpu(cmd->sleep_interval[2]),
-                        le32_to_cpu(cmd->sleep_interval[3]),
-                        le32_to_cpu(cmd->sleep_interval[4]));
-
-        return iwl_legacy_send_cmd_pdu(priv, POWER_TABLE_CMD,
-                                sizeof(struct iwl_powertable_cmd), cmd);
-}
-
-int
-iwl_legacy_power_set_mode(struct iwl_priv *priv, struct iwl_powertable_cmd *cmd,
-                       bool force)
-{
-        int ret;
-        bool update_chains;
-
-        lockdep_assert_held(&priv->mutex);
-
-        /* Don't update the RX chain when chain noise calibration is running */
-        update_chains = priv->chain_noise_data.state == IWL_CHAIN_NOISE_DONE ||
-                        priv->chain_noise_data.state == IWL_CHAIN_NOISE_ALIVE;
-
-        if (!memcmp(&priv->power_data.sleep_cmd, cmd, sizeof(*cmd)) && !force)
-                return 0;
-
-        if (!iwl_legacy_is_ready_rf(priv))
-                return -EIO;
-
-        /* scan complete use sleep_power_next, need to be updated */
-        memcpy(&priv->power_data.sleep_cmd_next, cmd, sizeof(*cmd));
-        if (test_bit(STATUS_SCANNING, &priv->status) && !force) {
-                IWL_DEBUG_INFO(priv, "Defer power set mode while scanning\n");
-                return 0;
-        }
-
-        if (cmd->flags & IWL_POWER_DRIVER_ALLOW_SLEEP_MSK)
-                set_bit(STATUS_POWER_PMI, &priv->status);
-
-        ret = iwl_legacy_set_power(priv, cmd);
-        if (!ret) {
-                if (!(cmd->flags & IWL_POWER_DRIVER_ALLOW_SLEEP_MSK))
-                        clear_bit(STATUS_POWER_PMI, &priv->status);
-
-                if (priv->cfg->ops->lib->update_chain_flags && update_chains)
-                        priv->cfg->ops->lib->update_chain_flags(priv);
-                else if (priv->cfg->ops->lib->update_chain_flags)
-                        IWL_DEBUG_POWER(priv,
-                                        "Cannot update the power, chain noise "
-                                        "calibration running: %d\n",
-                                        priv->chain_noise_data.state);
-
-                memcpy(&priv->power_data.sleep_cmd, cmd, sizeof(*cmd));
-        } else
-                IWL_ERR(priv, "set power fail, ret = %d", ret);
-
-        return ret;
-}
-
-int iwl_legacy_power_update_mode(struct iwl_priv *priv, bool force)
-{
-        struct iwl_powertable_cmd cmd;
-
-        iwl_legacy_power_sleep_cam_cmd(priv, &cmd);
-        return iwl_legacy_power_set_mode(priv, &cmd, force);
-}
-EXPORT_SYMBOL(iwl_legacy_power_update_mode);
-
-/* initialize to default */
-void iwl_legacy_power_initialize(struct iwl_priv *priv)
-{
-        u16 lctl = iwl_legacy_pcie_link_ctl(priv);
-
-        priv->power_data.pci_pm = !(lctl & PCI_CFG_LINK_CTRL_VAL_L0S_EN);
-
-        priv->power_data.debug_sleep_level_override = -1;
-
-        memset(&priv->power_data.sleep_cmd, 0,
-                sizeof(priv->power_data.sleep_cmd));
-}
-EXPORT_SYMBOL(iwl_legacy_power_initialize);
diff --git a/drivers/net/wireless/iwlegacy/iwl-power.h b/drivers/net/wireless/iwlegacy/iwl-power.h
deleted file mode 100644
index d30b36acdc4a..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-power.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *****************************************************************************/
-#ifndef __iwl_legacy_power_setting_h__
-#define __iwl_legacy_power_setting_h__
-
-#include "iwl-commands.h"
-
-enum iwl_power_level {
-        IWL_POWER_INDEX_1,
-        IWL_POWER_INDEX_2,
-        IWL_POWER_INDEX_3,
-        IWL_POWER_INDEX_4,
-        IWL_POWER_INDEX_5,
-        IWL_POWER_NUM
-};
-
-struct iwl_power_mgr {
-        struct iwl_powertable_cmd sleep_cmd;
-        struct iwl_powertable_cmd sleep_cmd_next;
-        int debug_sleep_level_override;
-        bool pci_pm;
-};
-
-int
-iwl_legacy_power_set_mode(struct iwl_priv *priv, struct iwl_powertable_cmd *cmd,
-                       bool force);
-int iwl_legacy_power_update_mode(struct iwl_priv *priv, bool force);
-void iwl_legacy_power_initialize(struct iwl_priv *priv);
-
-#endif  /* __iwl_legacy_power_setting_h__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-rx.c b/drivers/net/wireless/iwlegacy/iwl-rx.c
deleted file mode 100644
index 9b5d0abe8be9..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-rx.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-
-#include <linux/etherdevice.h>
-#include <linux/slab.h>
-#include <net/mac80211.h>
-#include <asm/unaligned.h>
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-sta.h"
-#include "iwl-io.h"
-#include "iwl-helpers.h"
-/************************** RX-FUNCTIONS ****************************/
-/*
- * Rx theory of operation
- *
- * Driver allocates a circular buffer of Receive Buffer Descriptors (RBDs),
- * each of which point to Receive Buffers to be filled by the NIC.  These get
- * used not only for Rx frames, but for any command response or notification
- * from the NIC.  The driver and NIC manage the Rx buffers by means
- * of indexes into the circular buffer.
- *
- * Rx Queue Indexes
- * The host/firmware share two index registers for managing the Rx buffers.
- *
- * The READ index maps to the first position that the firmware may be writing
- * to -- the driver can read up to (but not including) this position and get
- * good data.
- * The READ index is managed by the firmware once the card is enabled.
- *
- * The WRITE index maps to the last position the driver has read from -- the
- * position preceding WRITE is the last slot the firmware can place a packet.
- *
- * The queue is empty (no good data) if WRITE = READ - 1, and is full if
- * WRITE = READ.
- *
- * During initialization, the host sets up the READ queue position to the first
- * INDEX position, and WRITE to the last (READ - 1 wrapped)
- *
- * When the firmware places a packet in a buffer, it will advance the READ index
- * and fire the RX interrupt.  The driver can then query the READ index and
- * process as many packets as possible, moving the WRITE index forward as it
- * resets the Rx queue buffers with new memory.
- *
- * The management in the driver is as follows:
- * + A list of pre-allocated SKBs is stored in iwl->rxq->rx_free.  When
- *   iwl->rxq->free_count drops to or below RX_LOW_WATERMARK, work is scheduled
- *   to replenish the iwl->rxq->rx_free.
- * + In iwl_rx_replenish (scheduled) if 'processed' != 'read' then the
- *   iwl->rxq is replenished and the READ INDEX is updated (updating the
- *   'processed' and 'read' driver indexes as well)
- * + A received packet is processed and handed to the kernel network stack,
- *   detached from the iwl->rxq.  The driver 'processed' index is updated.
- * + The Host/Firmware iwl->rxq is replenished at tasklet time from the rx_free
- *   list. If there are no allocated buffers in iwl->rxq->rx_free, the READ
- *   INDEX is not incremented and iwl->status(RX_STALLED) is set.  If there
- *   were enough free buffers and RX_STALLED is set it is cleared.
- *
- *
- * Driver sequence:
- *
- * iwl_legacy_rx_queue_alloc()   Allocates rx_free
- * iwl_rx_replenish()     Replenishes rx_free list from rx_used, and calls
- *                            iwl_rx_queue_restock
- * iwl_rx_queue_restock() Moves available buffers from rx_free into Rx
- *                            queue, updates firmware pointers, and updates
- *                            the WRITE index.  If insufficient rx_free buffers
- *                            are available, schedules iwl_rx_replenish
- *
- * -- enable interrupts --
- * ISR - iwl_rx()         Detach iwl_rx_mem_buffers from pool up to the
- *                            READ INDEX, detaching the SKB from the pool.
- *                            Moves the packet buffer from queue to rx_used.
- *                            Calls iwl_rx_queue_restock to refill any empty
- *                            slots.
- * ...
- *
- */
-
-/**
- * iwl_legacy_rx_queue_space - Return number of free slots available in queue.
- */
-int iwl_legacy_rx_queue_space(const struct iwl_rx_queue *q)
-{
-        int s = q->read - q->write;
-        if (s <= 0)
-                s += RX_QUEUE_SIZE;
-        /* keep some buffer to not confuse full and empty queue */
-        s -= 2;
-        if (s < 0)
-                s = 0;
-        return s;
-}
-EXPORT_SYMBOL(iwl_legacy_rx_queue_space);
-
-/**
- * iwl_legacy_rx_queue_update_write_ptr - Update the write pointer for the RX queue
- */
-void
-iwl_legacy_rx_queue_update_write_ptr(struct iwl_priv *priv,
-                                        struct iwl_rx_queue *q)
-{
-        unsigned long flags;
-        u32 rx_wrt_ptr_reg = priv->hw_params.rx_wrt_ptr_reg;
-        u32 reg;
-
-        spin_lock_irqsave(&q->lock, flags);
-
-        if (q->need_update == 0)
-                goto exit_unlock;
-
-        /* If power-saving is in use, make sure device is awake */
-        if (test_bit(STATUS_POWER_PMI, &priv->status)) {
-                reg = iwl_read32(priv, CSR_UCODE_DRV_GP1);
-
-                if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {
-                        IWL_DEBUG_INFO(priv,
-                                "Rx queue requesting wakeup,"
-                                " GP1 = 0x%x\n", reg);
-                        iwl_legacy_set_bit(priv, CSR_GP_CNTRL,
-                                CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-                        goto exit_unlock;
-                }
-
-                q->write_actual = (q->write & ~0x7);
-                iwl_legacy_write_direct32(priv, rx_wrt_ptr_reg,
-                                q->write_actual);
-
-        /* Else device is assumed to be awake */
-        } else {
-                /* Device expects a multiple of 8 */
-                q->write_actual = (q->write & ~0x7);
-                iwl_legacy_write_direct32(priv, rx_wrt_ptr_reg,
-                        q->write_actual);
-        }
-
-        q->need_update = 0;
-
- exit_unlock:
-        spin_unlock_irqrestore(&q->lock, flags);
-}
-EXPORT_SYMBOL(iwl_legacy_rx_queue_update_write_ptr);
-
-int iwl_legacy_rx_queue_alloc(struct iwl_priv *priv)
-{
-        struct iwl_rx_queue *rxq = &priv->rxq;
-        struct device *dev = &priv->pci_dev->dev;
-        int i;
-
-        spin_lock_init(&rxq->lock);
-        INIT_LIST_HEAD(&rxq->rx_free);
-        INIT_LIST_HEAD(&rxq->rx_used);
-
-        /* Alloc the circular buffer of Read Buffer Descriptors (RBDs) */
-        rxq->bd = dma_alloc_coherent(dev, 4 * RX_QUEUE_SIZE, &rxq->bd_dma,
-                                     GFP_KERNEL);
-        if (!rxq->bd)
-                goto err_bd;
-
-        rxq->rb_stts = dma_alloc_coherent(dev, sizeof(struct iwl_rb_status),
-                                          &rxq->rb_stts_dma, GFP_KERNEL);
-        if (!rxq->rb_stts)
-                goto err_rb;
-
-        /* Fill the rx_used queue with _all_ of the Rx buffers */
-        for (i = 0; i < RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++)
-                list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
-
-        /* Set us so that we have processed and used all buffers, but have
-         * not restocked the Rx queue with fresh buffers */
-        rxq->read = rxq->write = 0;
-        rxq->write_actual = 0;
-        rxq->free_count = 0;
-        rxq->need_update = 0;
-        return 0;
-
-err_rb:
-        dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,
-                          rxq->bd_dma);
-err_bd:
-        return -ENOMEM;
-}
-EXPORT_SYMBOL(iwl_legacy_rx_queue_alloc);
-
-
-void iwl_legacy_rx_spectrum_measure_notif(struct iwl_priv *priv,
-                                          struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_spectrum_notification *report = &(pkt->u.spectrum_notif);
-
-        if (!report->state) {
-                IWL_DEBUG_11H(priv,
-                        "Spectrum Measure Notification: Start\n");
-                return;
-        }
-
-        memcpy(&priv->measure_report, report, sizeof(*report));
-        priv->measurement_status |= MEASUREMENT_READY;
-}
-EXPORT_SYMBOL(iwl_legacy_rx_spectrum_measure_notif);
-
-/*
- * returns non-zero if packet should be dropped
- */
-int iwl_legacy_set_decrypted_flag(struct iwl_priv *priv,
-                           struct ieee80211_hdr *hdr,
-                           u32 decrypt_res,
-                           struct ieee80211_rx_status *stats)
-{
-        u16 fc = le16_to_cpu(hdr->frame_control);
-
-        /*
-         * All contexts have the same setting here due to it being
-         * a module parameter, so OK to check any context.
-         */
-        if (priv->contexts[IWL_RXON_CTX_BSS].active.filter_flags &
-                                                RXON_FILTER_DIS_DECRYPT_MSK)
-                return 0;
-
-        if (!(fc & IEEE80211_FCTL_PROTECTED))
-                return 0;
-
-        IWL_DEBUG_RX(priv, "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;
-
-        case RX_RES_STATUS_SEC_TYPE_WEP:
-                if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==
-                    RX_RES_STATUS_BAD_ICV_MIC) {
-                        /* bad ICV, the packet is destroyed since the
-                         * decryption is inplace, drop it */
-                        IWL_DEBUG_RX(priv, "Packet destroyed\n");
-                        return -1;
-                }
-        case RX_RES_STATUS_SEC_TYPE_CCMP:
-                if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==
-                    RX_RES_STATUS_DECRYPT_OK) {
-                        IWL_DEBUG_RX(priv, "hw decrypt successfully!!!\n");
-                        stats->flag |= RX_FLAG_DECRYPTED;
-                }
-                break;
-
-        default:
-                break;
-        }
-        return 0;
-}
-EXPORT_SYMBOL(iwl_legacy_set_decrypted_flag);
diff --git a/drivers/net/wireless/iwlegacy/iwl-scan.c b/drivers/net/wireless/iwlegacy/iwl-scan.c
deleted file mode 100644
index a6b5222fc59e..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-scan.c
+++ /dev/null
@@ -1,549 +0,0 @@
-/******************************************************************************
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *****************************************************************************/
-#include <linux/slab.h>
-#include <linux/types.h>
-#include <linux/etherdevice.h>
-#include <net/mac80211.h>
-
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-sta.h"
-#include "iwl-io.h"
-#include "iwl-helpers.h"
-
-/* 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.  */
-#define IWL_ACTIVE_DWELL_TIME_24    (30)       /* all times in msec */
-#define IWL_ACTIVE_DWELL_TIME_52    (20)
-
-#define IWL_ACTIVE_DWELL_FACTOR_24GHZ (3)
-#define IWL_ACTIVE_DWELL_FACTOR_52GHZ (2)
-
-/* For passive scan, listen PASSIVE_DWELL_TIME (msec) on each channel.
- * Must be set longer than active dwell time.
- * For the most reliable scan, set > AP beacon interval (typically 100msec). */
-#define IWL_PASSIVE_DWELL_TIME_24   (20)       /* all times in msec */
-#define IWL_PASSIVE_DWELL_TIME_52   (10)
-#define IWL_PASSIVE_DWELL_BASE      (100)
-#define IWL_CHANNEL_TUNE_TIME       5
-
-static int iwl_legacy_send_scan_abort(struct iwl_priv *priv)
-{
-        int ret;
-        struct iwl_rx_packet *pkt;
-        struct iwl_host_cmd cmd = {
-                .id = REPLY_SCAN_ABORT_CMD,
-                .flags = CMD_WANT_SKB,
-        };
-
-        /* Exit instantly with error when device is not ready
-         * to receive scan abort command or it does not perform
-         * hardware scan currently */
-        if (!test_bit(STATUS_READY, &priv->status) ||
-            !test_bit(STATUS_GEO_CONFIGURED, &priv->status) ||
-            !test_bit(STATUS_SCAN_HW, &priv->status) ||
-            test_bit(STATUS_FW_ERROR, &priv->status) ||
-            test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return -EIO;
-
-        ret = iwl_legacy_send_cmd_sync(priv, &cmd);
-        if (ret)
-                return ret;
-
-        pkt = (struct iwl_rx_packet *)cmd.reply_page;
-        if (pkt->u.status != CAN_ABORT_STATUS) {
-                /* The scan abort will return 1 for success or
-                 * 2 for "failure".  A failure condition can be
-                 * due to simply not being in an active scan which
-                 * can occur if we send the scan abort before we
-                 * the microcode has notified us that a scan is
-                 * completed. */
-                IWL_DEBUG_SCAN(priv, "SCAN_ABORT ret %d.\n", pkt->u.status);
-                ret = -EIO;
-        }
-
-        iwl_legacy_free_pages(priv, cmd.reply_page);
-        return ret;
-}
-
-static void iwl_legacy_complete_scan(struct iwl_priv *priv, bool aborted)
-{
-        /* check if scan was requested from mac80211 */
-        if (priv->scan_request) {
-                IWL_DEBUG_SCAN(priv, "Complete scan in mac80211\n");
-                ieee80211_scan_completed(priv->hw, aborted);
-        }
-
-        priv->scan_vif = NULL;
-        priv->scan_request = NULL;
-}
-
-void iwl_legacy_force_scan_end(struct iwl_priv *priv)
-{
-        lockdep_assert_held(&priv->mutex);
-
-        if (!test_bit(STATUS_SCANNING, &priv->status)) {
-                IWL_DEBUG_SCAN(priv, "Forcing scan end while not scanning\n");
-                return;
-        }
-
-        IWL_DEBUG_SCAN(priv, "Forcing scan end\n");
-        clear_bit(STATUS_SCANNING, &priv->status);
-        clear_bit(STATUS_SCAN_HW, &priv->status);
-        clear_bit(STATUS_SCAN_ABORTING, &priv->status);
-        iwl_legacy_complete_scan(priv, true);
-}
-
-static void iwl_legacy_do_scan_abort(struct iwl_priv *priv)
-{
-        int ret;
-
-        lockdep_assert_held(&priv->mutex);
-
-        if (!test_bit(STATUS_SCANNING, &priv->status)) {
-                IWL_DEBUG_SCAN(priv, "Not performing scan to abort\n");
-                return;
-        }
-
-        if (test_and_set_bit(STATUS_SCAN_ABORTING, &priv->status)) {
-                IWL_DEBUG_SCAN(priv, "Scan abort in progress\n");
-                return;
-        }
-
-        ret = iwl_legacy_send_scan_abort(priv);
-        if (ret) {
-                IWL_DEBUG_SCAN(priv, "Send scan abort failed %d\n", ret);
-                iwl_legacy_force_scan_end(priv);
-        } else
-                IWL_DEBUG_SCAN(priv, "Successfully send scan abort\n");
-}
-
-/**
- * iwl_scan_cancel - Cancel any currently executing HW scan
- */
-int iwl_legacy_scan_cancel(struct iwl_priv *priv)
-{
-        IWL_DEBUG_SCAN(priv, "Queuing abort scan\n");
-        queue_work(priv->workqueue, &priv->abort_scan);
-        return 0;
-}
-EXPORT_SYMBOL(iwl_legacy_scan_cancel);
-
-/**
- * iwl_legacy_scan_cancel_timeout - Cancel any currently executing HW scan
- * @ms: amount of time to wait (in milliseconds) for scan to abort
- *
- */
-int iwl_legacy_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms)
-{
-        unsigned long timeout = jiffies + msecs_to_jiffies(ms);
-
-        lockdep_assert_held(&priv->mutex);
-
-        IWL_DEBUG_SCAN(priv, "Scan cancel timeout\n");
-
-        iwl_legacy_do_scan_abort(priv);
-
-        while (time_before_eq(jiffies, timeout)) {
-                if (!test_bit(STATUS_SCAN_HW, &priv->status))
-                        break;
-                msleep(20);
-        }
-
-        return test_bit(STATUS_SCAN_HW, &priv->status);
-}
-EXPORT_SYMBOL(iwl_legacy_scan_cancel_timeout);
-
-/* Service response to REPLY_SCAN_CMD (0x80) */
-static void iwl_legacy_rx_reply_scan(struct iwl_priv *priv,
-                              struct iwl_rx_mem_buffer *rxb)
-{
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_scanreq_notification *notif =
-            (struct iwl_scanreq_notification *)pkt->u.raw;
-
-        IWL_DEBUG_SCAN(priv, "Scan request status = 0x%x\n", notif->status);
-#endif
-}
-
-/* Service SCAN_START_NOTIFICATION (0x82) */
-static void iwl_legacy_rx_scan_start_notif(struct iwl_priv *priv,
-                                    struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_scanstart_notification *notif =
-            (struct iwl_scanstart_notification *)pkt->u.raw;
-        priv->scan_start_tsf = le32_to_cpu(notif->tsf_low);
-        IWL_DEBUG_SCAN(priv, "Scan start: "
-                       "%d [802.11%s] "
-                       "(TSF: 0x%08X:%08X) - %d (beacon timer %u)\n",
-                       notif->channel,
-                       notif->band ? "bg" : "a",
-                       le32_to_cpu(notif->tsf_high),
-                       le32_to_cpu(notif->tsf_low),
-                       notif->status, notif->beacon_timer);
-}
-
-/* Service SCAN_RESULTS_NOTIFICATION (0x83) */
-static void iwl_legacy_rx_scan_results_notif(struct iwl_priv *priv,
-                                      struct iwl_rx_mem_buffer *rxb)
-{
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_scanresults_notification *notif =
-            (struct iwl_scanresults_notification *)pkt->u.raw;
-
-        IWL_DEBUG_SCAN(priv, "Scan ch.res: "
-                       "%d [802.11%s] "
-                       "(TSF: 0x%08X:%08X) - %d "
-                       "elapsed=%lu usec\n",
-                       notif->channel,
-                       notif->band ? "bg" : "a",
-                       le32_to_cpu(notif->tsf_high),
-                       le32_to_cpu(notif->tsf_low),
-                       le32_to_cpu(notif->statistics[0]),
-                       le32_to_cpu(notif->tsf_low) - priv->scan_start_tsf);
-#endif
-}
-
-/* Service SCAN_COMPLETE_NOTIFICATION (0x84) */
-static void iwl_legacy_rx_scan_complete_notif(struct iwl_priv *priv,
-                                       struct iwl_rx_mem_buffer *rxb)
-{
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_scancomplete_notification *scan_notif = (void *)pkt->u.raw;
-#endif
-
-        IWL_DEBUG_SCAN(priv,
-                        "Scan complete: %d channels (TSF 0x%08X:%08X) - %d\n",
-                       scan_notif->scanned_channels,
-                       scan_notif->tsf_low,
-                       scan_notif->tsf_high, scan_notif->status);
-
-        /* The HW is no longer scanning */
-        clear_bit(STATUS_SCAN_HW, &priv->status);
-
-        IWL_DEBUG_SCAN(priv, "Scan on %sGHz took %dms\n",
-                       (priv->scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2",
-                       jiffies_to_msecs(jiffies - priv->scan_start));
-
-        queue_work(priv->workqueue, &priv->scan_completed);
-}
-
-void iwl_legacy_setup_rx_scan_handlers(struct iwl_priv *priv)
-{
-        /* scan handlers */
-        priv->rx_handlers[REPLY_SCAN_CMD] = iwl_legacy_rx_reply_scan;
-        priv->rx_handlers[SCAN_START_NOTIFICATION] =
-                                        iwl_legacy_rx_scan_start_notif;
-        priv->rx_handlers[SCAN_RESULTS_NOTIFICATION] =
-                                        iwl_legacy_rx_scan_results_notif;
-        priv->rx_handlers[SCAN_COMPLETE_NOTIFICATION] =
-                                        iwl_legacy_rx_scan_complete_notif;
-}
-EXPORT_SYMBOL(iwl_legacy_setup_rx_scan_handlers);
-
-inline u16 iwl_legacy_get_active_dwell_time(struct iwl_priv *priv,
-                                     enum ieee80211_band band,
-                                     u8 n_probes)
-{
-        if (band == IEEE80211_BAND_5GHZ)
-                return IWL_ACTIVE_DWELL_TIME_52 +
-                        IWL_ACTIVE_DWELL_FACTOR_52GHZ * (n_probes + 1);
-        else
-                return IWL_ACTIVE_DWELL_TIME_24 +
-                        IWL_ACTIVE_DWELL_FACTOR_24GHZ * (n_probes + 1);
-}
-EXPORT_SYMBOL(iwl_legacy_get_active_dwell_time);
-
-u16 iwl_legacy_get_passive_dwell_time(struct iwl_priv *priv,
-                               enum ieee80211_band band,
-                               struct ieee80211_vif *vif)
-{
-        struct iwl_rxon_context *ctx;
-        u16 passive = (band == IEEE80211_BAND_2GHZ) ?
-            IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_24 :
-            IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_52;
-
-        if (iwl_legacy_is_any_associated(priv)) {
-                /*
-                 * If we're associated, we clamp the maximum passive
-                 * dwell time to be 98% of the smallest beacon interval
-                 * (minus 2 * channel tune time)
-                 */
-                for_each_context(priv, ctx) {
-                        u16 value;
-
-                        if (!iwl_legacy_is_associated_ctx(ctx))
-                                continue;
-                        value = ctx->vif ? ctx->vif->bss_conf.beacon_int : 0;
-                        if ((value > IWL_PASSIVE_DWELL_BASE) || !value)
-                                value = IWL_PASSIVE_DWELL_BASE;
-                        value = (value * 98) / 100 - IWL_CHANNEL_TUNE_TIME * 2;
-                        passive = min(value, passive);
-                }
-        }
-
-        return passive;
-}
-EXPORT_SYMBOL(iwl_legacy_get_passive_dwell_time);
-
-void iwl_legacy_init_scan_params(struct iwl_priv *priv)
-{
-        u8 ant_idx = fls(priv->hw_params.valid_tx_ant) - 1;
-        if (!priv->scan_tx_ant[IEEE80211_BAND_5GHZ])
-                priv->scan_tx_ant[IEEE80211_BAND_5GHZ] = ant_idx;
-        if (!priv->scan_tx_ant[IEEE80211_BAND_2GHZ])
-                priv->scan_tx_ant[IEEE80211_BAND_2GHZ] = ant_idx;
-}
-EXPORT_SYMBOL(iwl_legacy_init_scan_params);
-
-static int iwl_legacy_scan_initiate(struct iwl_priv *priv,
-                                    struct ieee80211_vif *vif)
-{
-        int ret;
-
-        lockdep_assert_held(&priv->mutex);
-
-        if (WARN_ON(!priv->cfg->ops->utils->request_scan))
-                return -EOPNOTSUPP;
-
-        cancel_delayed_work(&priv->scan_check);
-
-        if (!iwl_legacy_is_ready_rf(priv)) {
-                IWL_WARN(priv, "Request scan called when driver not ready.\n");
-                return -EIO;
-        }
-
-        if (test_bit(STATUS_SCAN_HW, &priv->status)) {
-                IWL_DEBUG_SCAN(priv,
-                        "Multiple concurrent scan requests in parallel.\n");
-                return -EBUSY;
-        }
-
-        if (test_bit(STATUS_SCAN_ABORTING, &priv->status)) {
-                IWL_DEBUG_SCAN(priv, "Scan request while abort pending.\n");
-                return -EBUSY;
-        }
-
-        IWL_DEBUG_SCAN(priv, "Starting scan...\n");
-
-        set_bit(STATUS_SCANNING, &priv->status);
-        priv->scan_start = jiffies;
-
-        ret = priv->cfg->ops->utils->request_scan(priv, vif);
-        if (ret) {
-                clear_bit(STATUS_SCANNING, &priv->status);
-                return ret;
-        }
-
-        queue_delayed_work(priv->workqueue, &priv->scan_check,
-                           IWL_SCAN_CHECK_WATCHDOG);
-
-        return 0;
-}
-
-int iwl_legacy_mac_hw_scan(struct ieee80211_hw *hw,
-                    struct ieee80211_vif *vif,
-                    struct cfg80211_scan_request *req)
-{
-        struct iwl_priv *priv = hw->priv;
-        int ret;
-
-        IWL_DEBUG_MAC80211(priv, "enter\n");
-
-        if (req->n_channels == 0)
-                return -EINVAL;
-
-        mutex_lock(&priv->mutex);
-
-        if (test_bit(STATUS_SCANNING, &priv->status)) {
-                IWL_DEBUG_SCAN(priv, "Scan already in progress.\n");
-                ret = -EAGAIN;
-                goto out_unlock;
-        }
-
-        /* mac80211 will only ask for one band at a time */
-        priv->scan_request = req;
-        priv->scan_vif = vif;
-        priv->scan_band = req->channels[0]->band;
-
-        ret = iwl_legacy_scan_initiate(priv, vif);
-
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-
-out_unlock:
-        mutex_unlock(&priv->mutex);
-
-        return ret;
-}
-EXPORT_SYMBOL(iwl_legacy_mac_hw_scan);
-
-static void iwl_legacy_bg_scan_check(struct work_struct *data)
-{
-        struct iwl_priv *priv =
-            container_of(data, struct iwl_priv, scan_check.work);
-
-        IWL_DEBUG_SCAN(priv, "Scan check work\n");
-
-        /* Since we are here firmware does not finish scan and
-         * most likely is in bad shape, so we don't bother to
-         * send abort command, just force scan complete to mac80211 */
-        mutex_lock(&priv->mutex);
-        iwl_legacy_force_scan_end(priv);
-        mutex_unlock(&priv->mutex);
-}
-
-/**
- * iwl_legacy_fill_probe_req - fill in all required fields and IE for probe request
- */
-
-u16
-iwl_legacy_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame,
-                       const u8 *ta, const u8 *ies, int ie_len, int left)
-{
-        int len = 0;
-        u8 *pos = NULL;
-
-        /* Make sure there is enough space for the probe request,
-         * two mandatory IEs and the data */
-        left -= 24;
-        if (left < 0)
-                return 0;
-
-        frame->frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);
-        memcpy(frame->da, iwlegacy_bcast_addr, ETH_ALEN);
-        memcpy(frame->sa, ta, ETH_ALEN);
-        memcpy(frame->bssid, iwlegacy_bcast_addr, ETH_ALEN);
-        frame->seq_ctrl = 0;
-
-        len += 24;
-
-        /* ...next IE... */
-        pos = &frame->u.probe_req.variable[0];
-
-        /* fill in our indirect SSID IE */
-        left -= 2;
-        if (left < 0)
-                return 0;
-        *pos++ = WLAN_EID_SSID;
-        *pos++ = 0;
-
-        len += 2;
-
-        if (WARN_ON(left < ie_len))
-                return len;
-
-        if (ies && ie_len) {
-                memcpy(pos, ies, ie_len);
-                len += ie_len;
-        }
-
-        return (u16)len;
-}
-EXPORT_SYMBOL(iwl_legacy_fill_probe_req);
-
-static void iwl_legacy_bg_abort_scan(struct work_struct *work)
-{
-        struct iwl_priv *priv = container_of(work, struct iwl_priv, abort_scan);
-
-        IWL_DEBUG_SCAN(priv, "Abort scan work\n");
-
-        /* We keep scan_check work queued in case when firmware will not
-         * report back scan completed notification */
-        mutex_lock(&priv->mutex);
-        iwl_legacy_scan_cancel_timeout(priv, 200);
-        mutex_unlock(&priv->mutex);
-}
-
-static void iwl_legacy_bg_scan_completed(struct work_struct *work)
-{
-        struct iwl_priv *priv =
-            container_of(work, struct iwl_priv, scan_completed);
-        bool aborted;
-
-        IWL_DEBUG_SCAN(priv, "Completed scan.\n");
-
-        cancel_delayed_work(&priv->scan_check);
-
-        mutex_lock(&priv->mutex);
-
-        aborted = test_and_clear_bit(STATUS_SCAN_ABORTING, &priv->status);
-        if (aborted)
-                IWL_DEBUG_SCAN(priv, "Aborted scan completed.\n");
-
-        if (!test_and_clear_bit(STATUS_SCANNING, &priv->status)) {
-                IWL_DEBUG_SCAN(priv, "Scan already completed.\n");
-                goto out_settings;
-        }
-
-        iwl_legacy_complete_scan(priv, aborted);
-
-out_settings:
-        /* Can we still talk to firmware ? */
-        if (!iwl_legacy_is_ready_rf(priv))
-                goto out;
-
-        /*
-         * We do not commit power settings while scan is pending,
-         * do it now if the settings changed.
-         */
-        iwl_legacy_power_set_mode(priv, &priv->power_data.sleep_cmd_next, false);
-        iwl_legacy_set_tx_power(priv, priv->tx_power_next, false);
-
-        priv->cfg->ops->utils->post_scan(priv);
-
-out:
-        mutex_unlock(&priv->mutex);
-}
-
-void iwl_legacy_setup_scan_deferred_work(struct iwl_priv *priv)
-{
-        INIT_WORK(&priv->scan_completed, iwl_legacy_bg_scan_completed);
-        INIT_WORK(&priv->abort_scan, iwl_legacy_bg_abort_scan);
-        INIT_DELAYED_WORK(&priv->scan_check, iwl_legacy_bg_scan_check);
-}
-EXPORT_SYMBOL(iwl_legacy_setup_scan_deferred_work);
-
-void iwl_legacy_cancel_scan_deferred_work(struct iwl_priv *priv)
-{
-        cancel_work_sync(&priv->abort_scan);
-        cancel_work_sync(&priv->scan_completed);
-
-        if (cancel_delayed_work_sync(&priv->scan_check)) {
-                mutex_lock(&priv->mutex);
-                iwl_legacy_force_scan_end(priv);
-                mutex_unlock(&priv->mutex);
-        }
-}
-EXPORT_SYMBOL(iwl_legacy_cancel_scan_deferred_work);
diff --git a/drivers/net/wireless/iwlegacy/iwl-spectrum.h b/drivers/net/wireless/iwlegacy/iwl-spectrum.h
index 9f70a4723103..85fe48e520f9 100644
--- a/drivers/net/wireless/iwlegacy/iwl-spectrum.h
+++ b/drivers/net/wireless/iwlegacy/iwl-spectrum.h
@@ -26,8 +26,8 @@
  *
  *****************************************************************************/
 
-#ifndef __iwl_legacy_spectrum_h__
-#define __iwl_legacy_spectrum_h__
+#ifndef __il_spectrum_h__
+#define __il_spectrum_h__
 enum {                          /* ieee80211_basic_report.map */
         IEEE80211_BASIC_MAP_BSS = (1 << 0),
         IEEE80211_BASIC_MAP_OFDM = (1 << 1),
diff --git a/drivers/net/wireless/iwlegacy/iwl-sta.c b/drivers/net/wireless/iwlegacy/iwl-sta.c
index 66f0fb2bbe00..75fe315f66b4 100644
--- a/drivers/net/wireless/iwlegacy/iwl-sta.c
+++ b/drivers/net/wireless/iwlegacy/iwl-sta.c
@@ -31,81 +31,82 @@
 #include <linux/etherdevice.h>
 #include <linux/sched.h>
 #include <linux/lockdep.h>
+#include <linux/export.h>
 
 #include "iwl-dev.h"
 #include "iwl-core.h"
 #include "iwl-sta.h"
 
-/* priv->sta_lock must be held */
-static void iwl_legacy_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
+/* il->sta_lock must be held */
+static void il_sta_ucode_activate(struct il_priv *il, u8 sta_id)
 {
 
-        if (!(priv->stations[sta_id].used & IWL_STA_DRIVER_ACTIVE))
-                IWL_ERR(priv,
+        if (!(il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE))
+                IL_ERR(
                         "ACTIVATE a non DRIVER active station id %u addr %pM\n",
-                        sta_id, priv->stations[sta_id].sta.sta.addr);
+                        sta_id, il->stations[sta_id].sta.sta.addr);
 
-        if (priv->stations[sta_id].used & IWL_STA_UCODE_ACTIVE) {
-                IWL_DEBUG_ASSOC(priv,
+        if (il->stations[sta_id].used & IL_STA_UCODE_ACTIVE) {
+                D_ASSOC(
                         "STA id %u addr %pM already present"
                         " in uCode (according to driver)\n",
-                        sta_id, priv->stations[sta_id].sta.sta.addr);
+                        sta_id, il->stations[sta_id].sta.sta.addr);
         } else {
-                priv->stations[sta_id].used |= IWL_STA_UCODE_ACTIVE;
-                IWL_DEBUG_ASSOC(priv, "Added STA id %u addr %pM to uCode\n",
-                                sta_id, priv->stations[sta_id].sta.sta.addr);
+                il->stations[sta_id].used |= IL_STA_UCODE_ACTIVE;
+                D_ASSOC("Added STA id %u addr %pM to uCode\n",
+                                sta_id, il->stations[sta_id].sta.sta.addr);
         }
 }
 
-static int iwl_legacy_process_add_sta_resp(struct iwl_priv *priv,
-                                    struct iwl_legacy_addsta_cmd *addsta,
-                                    struct iwl_rx_packet *pkt,
+static int il_process_add_sta_resp(struct il_priv *il,
+                                    struct il_addsta_cmd *addsta,
+                                    struct il_rx_pkt *pkt,
                                     bool sync)
 {
         u8 sta_id = addsta->sta.sta_id;
         unsigned long flags;
         int ret = -EIO;
 
-        if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) {
-                IWL_ERR(priv, "Bad return from REPLY_ADD_STA (0x%08X)\n",
+        if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {
+                IL_ERR("Bad return from C_ADD_STA (0x%08X)\n",
                         pkt->hdr.flags);
                 return ret;
         }
 
-        IWL_DEBUG_INFO(priv, "Processing response for adding station %u\n",
+        D_INFO("Processing response for adding station %u\n",
                        sta_id);
 
-        spin_lock_irqsave(&priv->sta_lock, flags);
+        spin_lock_irqsave(&il->sta_lock, flags);
 
         switch (pkt->u.add_sta.status) {
         case ADD_STA_SUCCESS_MSK:
-                IWL_DEBUG_INFO(priv, "REPLY_ADD_STA PASSED\n");
-                iwl_legacy_sta_ucode_activate(priv, sta_id);
+                D_INFO("C_ADD_STA PASSED\n");
+                il_sta_ucode_activate(il, sta_id);
                 ret = 0;
                 break;
-        case ADD_STA_NO_ROOM_IN_TABLE:
-                IWL_ERR(priv, "Adding station %d failed, no room in table.\n",
+        case ADD_STA_NO_ROOM_IN_TBL:
+                IL_ERR("Adding station %d failed, no room in table.\n",
                         sta_id);
                 break;
         case ADD_STA_NO_BLOCK_ACK_RESOURCE:
-                IWL_ERR(priv,
+                IL_ERR(
                         "Adding station %d failed, no block ack resource.\n",
                         sta_id);
                 break;
         case ADD_STA_MODIFY_NON_EXIST_STA:
-                IWL_ERR(priv, "Attempting to modify non-existing station %d\n",
+                IL_ERR("Attempting to modify non-existing station %d\n",
                         sta_id);
                 break;
         default:
-                IWL_DEBUG_ASSOC(priv, "Received REPLY_ADD_STA:(0x%08X)\n",
+                D_ASSOC("Received C_ADD_STA:(0x%08X)\n",
                                 pkt->u.add_sta.status);
                 break;
         }
 
-        IWL_DEBUG_INFO(priv, "%s station id %u addr %pM\n",
-                       priv->stations[sta_id].sta.mode ==
+        D_INFO("%s station id %u addr %pM\n",
+                       il->stations[sta_id].sta.mode ==
                        STA_CONTROL_MODIFY_MSK ?  "Modified" : "Added",
-                       sta_id, priv->stations[sta_id].sta.sta.addr);
+                       sta_id, il->stations[sta_id].sta.sta.addr);
 
         /*
          * XXX: The MAC address in the command buffer is often changed from
@@ -115,68 +116,68 @@ static int iwl_legacy_process_add_sta_resp(struct iwl_priv *priv,
          * issue has not yet been resolved and this debugging is left to
          * observe the problem.
          */
-        IWL_DEBUG_INFO(priv, "%s station according to cmd buffer %pM\n",
-                       priv->stations[sta_id].sta.mode ==
+        D_INFO("%s station according to cmd buffer %pM\n",
+                       il->stations[sta_id].sta.mode ==
                        STA_CONTROL_MODIFY_MSK ? "Modified" : "Added",
                        addsta->sta.addr);
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
+        spin_unlock_irqrestore(&il->sta_lock, flags);
 
         return ret;
 }
 
-static void iwl_legacy_add_sta_callback(struct iwl_priv *priv,
-                                 struct iwl_device_cmd *cmd,
-                                 struct iwl_rx_packet *pkt)
+static void il_add_sta_callback(struct il_priv *il,
+                                 struct il_device_cmd *cmd,
+                                 struct il_rx_pkt *pkt)
 {
-        struct iwl_legacy_addsta_cmd *addsta =
-                (struct iwl_legacy_addsta_cmd *)cmd->cmd.payload;
+        struct il_addsta_cmd *addsta =
+                (struct il_addsta_cmd *)cmd->cmd.payload;
 
-        iwl_legacy_process_add_sta_resp(priv, addsta, pkt, false);
+        il_process_add_sta_resp(il, addsta, pkt, false);
 
 }
 
-int iwl_legacy_send_add_sta(struct iwl_priv *priv,
-                     struct iwl_legacy_addsta_cmd *sta, u8 flags)
+int il_send_add_sta(struct il_priv *il,
+                     struct il_addsta_cmd *sta, u8 flags)
 {
-        struct iwl_rx_packet *pkt = NULL;
+        struct il_rx_pkt *pkt = NULL;
         int ret = 0;
         u8 data[sizeof(*sta)];
-        struct iwl_host_cmd cmd = {
-                .id = REPLY_ADD_STA,
+        struct il_host_cmd cmd = {
+                .id = C_ADD_STA,
                 .flags = flags,
                 .data = data,
         };
         u8 sta_id __maybe_unused = sta->sta.sta_id;
 
-        IWL_DEBUG_INFO(priv, "Adding sta %u (%pM) %ssynchronously\n",
+        D_INFO("Adding sta %u (%pM) %ssynchronously\n",
                        sta_id, sta->sta.addr, flags & CMD_ASYNC ?  "a" : "");
 
         if (flags & CMD_ASYNC)
-                cmd.callback = iwl_legacy_add_sta_callback;
+                cmd.callback = il_add_sta_callback;
         else {
                 cmd.flags |= CMD_WANT_SKB;
                 might_sleep();
         }
 
-        cmd.len = priv->cfg->ops->utils->build_addsta_hcmd(sta, data);
-        ret = iwl_legacy_send_cmd(priv, &cmd);
+        cmd.len = il->cfg->ops->utils->build_addsta_hcmd(sta, data);
+        ret = il_send_cmd(il, &cmd);
 
         if (ret || (flags & CMD_ASYNC))
                 return ret;
 
         if (ret == 0) {
-                pkt = (struct iwl_rx_packet *)cmd.reply_page;
-                ret = iwl_legacy_process_add_sta_resp(priv, sta, pkt, true);
+                pkt = (struct il_rx_pkt *)cmd.reply_page;
+                ret = il_process_add_sta_resp(il, sta, pkt, true);
         }
-        iwl_legacy_free_pages(priv, cmd.reply_page);
+        il_free_pages(il, cmd.reply_page);
 
         return ret;
 }
-EXPORT_SYMBOL(iwl_legacy_send_add_sta);
+EXPORT_SYMBOL(il_send_add_sta);
 
-static void iwl_legacy_set_ht_add_station(struct iwl_priv *priv, u8 index,
+static void il_set_ht_add_station(struct il_priv *il, u8 idx,
                                    struct ieee80211_sta *sta,
-                                   struct iwl_rxon_context *ctx)
+                                   struct il_rxon_context *ctx)
 {
         struct ieee80211_sta_ht_cap *sta_ht_inf = &sta->ht_cap;
         __le32 sta_flags;
@@ -186,13 +187,13 @@ static void iwl_legacy_set_ht_add_station(struct iwl_priv *priv, u8 index,
                 goto done;
 
         mimo_ps_mode = (sta_ht_inf->cap & IEEE80211_HT_CAP_SM_PS) >> 2;
-        IWL_DEBUG_ASSOC(priv, "spatial multiplexing power save mode: %s\n",
+        D_ASSOC("spatial multiplexing power save mode: %s\n",
                         (mimo_ps_mode == WLAN_HT_CAP_SM_PS_STATIC) ?
                         "static" :
                         (mimo_ps_mode == WLAN_HT_CAP_SM_PS_DYNAMIC) ?
                         "dynamic" : "disabled");
 
-        sta_flags = priv->stations[index].sta.station_flags;
+        sta_flags = il->stations[idx].sta.station_flags;
 
         sta_flags &= ~(STA_FLG_RTS_MIMO_PROT_MSK | STA_FLG_MIMO_DIS_MSK);
 
@@ -206,7 +207,7 @@ static void iwl_legacy_set_ht_add_station(struct iwl_priv *priv, u8 index,
         case WLAN_HT_CAP_SM_PS_DISABLED:
                 break;
         default:
-                IWL_WARN(priv, "Invalid MIMO PS mode %d\n", mimo_ps_mode);
+                IL_WARN("Invalid MIMO PS mode %d\n", mimo_ps_mode);
                 break;
         }
 
@@ -216,27 +217,27 @@ static void iwl_legacy_set_ht_add_station(struct iwl_priv *priv, u8 index,
         sta_flags |= cpu_to_le32(
               (u32)sta_ht_inf->ampdu_density << STA_FLG_AGG_MPDU_DENSITY_POS);
 
-        if (iwl_legacy_is_ht40_tx_allowed(priv, ctx, &sta->ht_cap))
+        if (il_is_ht40_tx_allowed(il, ctx, &sta->ht_cap))
                 sta_flags |= STA_FLG_HT40_EN_MSK;
         else
                 sta_flags &= ~STA_FLG_HT40_EN_MSK;
 
-        priv->stations[index].sta.station_flags = sta_flags;
+        il->stations[idx].sta.station_flags = sta_flags;
  done:
         return;
 }
 
 /**
- * iwl_legacy_prep_station - Prepare station information for addition
+ * il_prep_station - Prepare station information for addition
  *
  * should be called with sta_lock held
  */
-u8 iwl_legacy_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
+u8 il_prep_station(struct il_priv *il, struct il_rxon_context *ctx,
                     const u8 *addr, bool is_ap, struct ieee80211_sta *sta)
 {
-        struct iwl_station_entry *station;
+        struct il_station_entry *station;
         int i;
-        u8 sta_id = IWL_INVALID_STATION;
+        u8 sta_id = IL_INVALID_STATION;
         u16 rate;
 
         if (is_ap)
@@ -244,15 +245,15 @@ u8 iwl_legacy_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
         else if (is_broadcast_ether_addr(addr))
                 sta_id = ctx->bcast_sta_id;
         else
-                for (i = IWL_STA_ID; i < priv->hw_params.max_stations; i++) {
-                        if (!compare_ether_addr(priv->stations[i].sta.sta.addr,
+                for (i = IL_STA_ID; i < il->hw_params.max_stations; i++) {
+                        if (!compare_ether_addr(il->stations[i].sta.sta.addr,
                                                 addr)) {
                                 sta_id = i;
                                 break;
                         }
 
-                        if (!priv->stations[i].used &&
-                            sta_id == IWL_INVALID_STATION)
+                        if (!il->stations[i].used &&
+                            sta_id == IL_INVALID_STATION)
                                 sta_id = i;
                 }
 
@@ -260,7 +261,7 @@ u8 iwl_legacy_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
          * These two conditions have the same outcome, but keep them
          * separate
          */
-        if (unlikely(sta_id == IWL_INVALID_STATION))
+        if (unlikely(sta_id == IL_INVALID_STATION))
                 return sta_id;
 
         /*
@@ -268,30 +269,30 @@ u8 iwl_legacy_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
          * station. Keep track if one is in progress so that we do not send
          * another.
          */
-        if (priv->stations[sta_id].used & IWL_STA_UCODE_INPROGRESS) {
-                IWL_DEBUG_INFO(priv,
+        if (il->stations[sta_id].used & IL_STA_UCODE_INPROGRESS) {
+                D_INFO(
                                 "STA %d already in process of being added.\n",
                                 sta_id);
                 return sta_id;
         }
 
-        if ((priv->stations[sta_id].used & IWL_STA_DRIVER_ACTIVE) &&
-            (priv->stations[sta_id].used & IWL_STA_UCODE_ACTIVE) &&
-            !compare_ether_addr(priv->stations[sta_id].sta.sta.addr, addr)) {
-                IWL_DEBUG_ASSOC(priv,
+        if ((il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE) &&
+            (il->stations[sta_id].used & IL_STA_UCODE_ACTIVE) &&
+            !compare_ether_addr(il->stations[sta_id].sta.sta.addr, addr)) {
+                D_ASSOC(
                                 "STA %d (%pM) already added, not adding again.\n",
                                 sta_id, addr);
                 return sta_id;
         }
 
-        station = &priv->stations[sta_id];
-        station->used = IWL_STA_DRIVER_ACTIVE;
-        IWL_DEBUG_ASSOC(priv, "Add STA to driver ID %d: %pM\n",
+        station = &il->stations[sta_id];
+        station->used = IL_STA_DRIVER_ACTIVE;
+        D_ASSOC("Add STA to driver ID %d: %pM\n",
                         sta_id, addr);
-        priv->num_stations++;
+        il->num_stations++;
 
-        /* Set up the REPLY_ADD_STA command to send to device */
-        memset(&station->sta, 0, sizeof(struct iwl_legacy_addsta_cmd));
+        /* Set up the C_ADD_STA command to send to device */
+        memset(&station->sta, 0, sizeof(struct il_addsta_cmd));
         memcpy(station->sta.sta.addr, addr, ETH_ALEN);
         station->sta.mode = 0;
         station->sta.sta.sta_id = sta_id;
@@ -299,7 +300,7 @@ u8 iwl_legacy_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
         station->ctxid = ctx->ctxid;
 
         if (sta) {
-                struct iwl_station_priv_common *sta_priv;
+                struct il_station_priv_common *sta_priv;
 
                 sta_priv = (void *)sta->drv_priv;
                 sta_priv->ctx = ctx;
@@ -310,42 +311,42 @@ u8 iwl_legacy_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
          * STA and broadcast STA) pass in a NULL sta, and mac80211
          * doesn't allow HT IBSS.
          */
-        iwl_legacy_set_ht_add_station(priv, sta_id, sta, ctx);
+        il_set_ht_add_station(il, sta_id, sta, ctx);
 
         /* 3945 only */
-        rate = (priv->band == IEEE80211_BAND_5GHZ) ?
-                IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP;
+        rate = (il->band == IEEE80211_BAND_5GHZ) ?
+                RATE_6M_PLCP : RATE_1M_PLCP;
         /* Turn on both antennas for the station... */
         station->sta.rate_n_flags = cpu_to_le16(rate | RATE_MCS_ANT_AB_MSK);
 
         return sta_id;
 
 }
-EXPORT_SYMBOL_GPL(iwl_legacy_prep_station);
+EXPORT_SYMBOL_GPL(il_prep_station);
 
 #define STA_WAIT_TIMEOUT (HZ/2)
 
 /**
- * iwl_legacy_add_station_common -
+ * il_add_station_common -
  */
 int
-iwl_legacy_add_station_common(struct iwl_priv *priv,
-                        struct iwl_rxon_context *ctx,
+il_add_station_common(struct il_priv *il,
+                        struct il_rxon_context *ctx,
                            const u8 *addr, bool is_ap,
                            struct ieee80211_sta *sta, u8 *sta_id_r)
 {
         unsigned long flags_spin;
         int ret = 0;
         u8 sta_id;
-        struct iwl_legacy_addsta_cmd sta_cmd;
+        struct il_addsta_cmd sta_cmd;
 
         *sta_id_r = 0;
-        spin_lock_irqsave(&priv->sta_lock, flags_spin);
-        sta_id = iwl_legacy_prep_station(priv, ctx, addr, is_ap, sta);
-        if (sta_id == IWL_INVALID_STATION) {
-                IWL_ERR(priv, "Unable to prepare station %pM for addition\n",
+        spin_lock_irqsave(&il->sta_lock, flags_spin);
+        sta_id = il_prep_station(il, ctx, addr, is_ap, sta);
+        if (sta_id == IL_INVALID_STATION) {
+                IL_ERR("Unable to prepare station %pM for addition\n",
                         addr);
-                spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
+                spin_unlock_irqrestore(&il->sta_lock, flags_spin);
                 return -EINVAL;
         }
 
@@ -354,75 +355,75 @@ iwl_legacy_add_station_common(struct iwl_priv *priv,
          * station. Keep track if one is in progress so that we do not send
          * another.
          */
-        if (priv->stations[sta_id].used & IWL_STA_UCODE_INPROGRESS) {
-                IWL_DEBUG_INFO(priv,
+        if (il->stations[sta_id].used & IL_STA_UCODE_INPROGRESS) {
+                D_INFO(
                         "STA %d already in process of being added.\n",
                        sta_id);
-                spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
+                spin_unlock_irqrestore(&il->sta_lock, flags_spin);
                 return -EEXIST;
         }
 
-        if ((priv->stations[sta_id].used & IWL_STA_DRIVER_ACTIVE) &&
-            (priv->stations[sta_id].used & IWL_STA_UCODE_ACTIVE)) {
-                IWL_DEBUG_ASSOC(priv,
+        if ((il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE) &&
+            (il->stations[sta_id].used & IL_STA_UCODE_ACTIVE)) {
+                D_ASSOC(
                         "STA %d (%pM) already added, not adding again.\n",
                         sta_id, addr);
-                spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
+                spin_unlock_irqrestore(&il->sta_lock, flags_spin);
                 return -EEXIST;
         }
 
-        priv->stations[sta_id].used |= IWL_STA_UCODE_INPROGRESS;
-        memcpy(&sta_cmd, &priv->stations[sta_id].sta,
-                                sizeof(struct iwl_legacy_addsta_cmd));
-        spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
+        il->stations[sta_id].used |= IL_STA_UCODE_INPROGRESS;
+        memcpy(&sta_cmd, &il->stations[sta_id].sta,
+                                sizeof(struct il_addsta_cmd));
+        spin_unlock_irqrestore(&il->sta_lock, flags_spin);
 
         /* Add station to device's station table */
-        ret = iwl_legacy_send_add_sta(priv, &sta_cmd, CMD_SYNC);
+        ret = il_send_add_sta(il, &sta_cmd, CMD_SYNC);
         if (ret) {
-                spin_lock_irqsave(&priv->sta_lock, flags_spin);
-                IWL_ERR(priv, "Adding station %pM failed.\n",
-                        priv->stations[sta_id].sta.sta.addr);
-                priv->stations[sta_id].used &= ~IWL_STA_DRIVER_ACTIVE;
-                priv->stations[sta_id].used &= ~IWL_STA_UCODE_INPROGRESS;
-                spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
+                spin_lock_irqsave(&il->sta_lock, flags_spin);
+                IL_ERR("Adding station %pM failed.\n",
+                        il->stations[sta_id].sta.sta.addr);
+                il->stations[sta_id].used &= ~IL_STA_DRIVER_ACTIVE;
+                il->stations[sta_id].used &= ~IL_STA_UCODE_INPROGRESS;
+                spin_unlock_irqrestore(&il->sta_lock, flags_spin);
         }
         *sta_id_r = sta_id;
         return ret;
 }
-EXPORT_SYMBOL(iwl_legacy_add_station_common);
+EXPORT_SYMBOL(il_add_station_common);
 
 /**
- * iwl_legacy_sta_ucode_deactivate - deactivate ucode status for a station
+ * il_sta_ucode_deactivate - deactivate ucode status for a station
  *
- * priv->sta_lock must be held
+ * il->sta_lock must be held
  */
-static void iwl_legacy_sta_ucode_deactivate(struct iwl_priv *priv, u8 sta_id)
+static void il_sta_ucode_deactivate(struct il_priv *il, u8 sta_id)
 {
         /* Ucode must be active and driver must be non active */
-        if ((priv->stations[sta_id].used &
-             (IWL_STA_UCODE_ACTIVE | IWL_STA_DRIVER_ACTIVE)) !=
-                                                IWL_STA_UCODE_ACTIVE)
-                IWL_ERR(priv, "removed non active STA %u\n", sta_id);
+        if ((il->stations[sta_id].used &
+             (IL_STA_UCODE_ACTIVE | IL_STA_DRIVER_ACTIVE)) !=
+                                                IL_STA_UCODE_ACTIVE)
+                IL_ERR("removed non active STA %u\n", sta_id);
 
-        priv->stations[sta_id].used &= ~IWL_STA_UCODE_ACTIVE;
+        il->stations[sta_id].used &= ~IL_STA_UCODE_ACTIVE;
 
-        memset(&priv->stations[sta_id], 0, sizeof(struct iwl_station_entry));
-        IWL_DEBUG_ASSOC(priv, "Removed STA %u\n", sta_id);
+        memset(&il->stations[sta_id], 0, sizeof(struct il_station_entry));
+        D_ASSOC("Removed STA %u\n", sta_id);
 }
 
-static int iwl_legacy_send_remove_station(struct iwl_priv *priv,
+static int il_send_remove_station(struct il_priv *il,
                                    const u8 *addr, int sta_id,
                                    bool temporary)
 {
-        struct iwl_rx_packet *pkt;
+        struct il_rx_pkt *pkt;
         int ret;
 
         unsigned long flags_spin;
-        struct iwl_rem_sta_cmd rm_sta_cmd;
+        struct il_rem_sta_cmd rm_sta_cmd;
 
-        struct iwl_host_cmd cmd = {
-                .id = REPLY_REMOVE_STA,
-                .len = sizeof(struct iwl_rem_sta_cmd),
+        struct il_host_cmd cmd = {
+                .id = C_REM_STA,
+                .len = sizeof(struct il_rem_sta_cmd),
                 .flags = CMD_SYNC,
                 .data = &rm_sta_cmd,
         };
@@ -433,14 +434,14 @@ static int iwl_legacy_send_remove_station(struct iwl_priv *priv,
 
         cmd.flags |= CMD_WANT_SKB;
 
-        ret = iwl_legacy_send_cmd(priv, &cmd);
+        ret = il_send_cmd(il, &cmd);
 
         if (ret)
                 return ret;
 
-        pkt = (struct iwl_rx_packet *)cmd.reply_page;
-        if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) {
-                IWL_ERR(priv, "Bad return from REPLY_REMOVE_STA (0x%08X)\n",
+        pkt = (struct il_rx_pkt *)cmd.reply_page;
+        if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {
+                IL_ERR("Bad return from C_REM_STA (0x%08X)\n",
                           pkt->hdr.flags);
                 ret = -EIO;
         }
@@ -449,34 +450,34 @@ static int iwl_legacy_send_remove_station(struct iwl_priv *priv,
                 switch (pkt->u.rem_sta.status) {
                 case REM_STA_SUCCESS_MSK:
                         if (!temporary) {
-                                spin_lock_irqsave(&priv->sta_lock, flags_spin);
-                                iwl_legacy_sta_ucode_deactivate(priv, sta_id);
-                                spin_unlock_irqrestore(&priv->sta_lock,
+                                spin_lock_irqsave(&il->sta_lock, flags_spin);
+                                il_sta_ucode_deactivate(il, sta_id);
+                                spin_unlock_irqrestore(&il->sta_lock,
                                                                 flags_spin);
                         }
-                        IWL_DEBUG_ASSOC(priv, "REPLY_REMOVE_STA PASSED\n");
+                        D_ASSOC("C_REM_STA PASSED\n");
                         break;
                 default:
                         ret = -EIO;
-                        IWL_ERR(priv, "REPLY_REMOVE_STA failed\n");
+                        IL_ERR("C_REM_STA failed\n");
                         break;
                 }
         }
-        iwl_legacy_free_pages(priv, cmd.reply_page);
+        il_free_pages(il, cmd.reply_page);
 
         return ret;
 }
 
 /**
- * iwl_legacy_remove_station - Remove driver's knowledge of station.
+ * il_remove_station - Remove driver's knowledge of station.
  */
-int iwl_legacy_remove_station(struct iwl_priv *priv, const u8 sta_id,
+int il_remove_station(struct il_priv *il, const u8 sta_id,
                        const u8 *addr)
 {
         unsigned long flags;
 
-        if (!iwl_legacy_is_ready(priv)) {
-                IWL_DEBUG_INFO(priv,
+        if (!il_is_ready(il)) {
+                D_INFO(
                         "Unable to remove station %pM, device not ready.\n",
                         addr);
                 /*
@@ -487,85 +488,85 @@ int iwl_legacy_remove_station(struct iwl_priv *priv, const u8 sta_id,
                 return 0;
         }
 
-        IWL_DEBUG_ASSOC(priv, "Removing STA from driver:%d  %pM\n",
+        D_ASSOC("Removing STA from driver:%d  %pM\n",
                         sta_id, addr);
 
-        if (WARN_ON(sta_id == IWL_INVALID_STATION))
+        if (WARN_ON(sta_id == IL_INVALID_STATION))
                 return -EINVAL;
 
-        spin_lock_irqsave(&priv->sta_lock, flags);
+        spin_lock_irqsave(&il->sta_lock, flags);
 
-        if (!(priv->stations[sta_id].used & IWL_STA_DRIVER_ACTIVE)) {
-                IWL_DEBUG_INFO(priv, "Removing %pM but non DRIVER active\n",
+        if (!(il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE)) {
+                D_INFO("Removing %pM but non DRIVER active\n",
                                 addr);
                 goto out_err;
         }
 
-        if (!(priv->stations[sta_id].used & IWL_STA_UCODE_ACTIVE)) {
-                IWL_DEBUG_INFO(priv, "Removing %pM but non UCODE active\n",
+        if (!(il->stations[sta_id].used & IL_STA_UCODE_ACTIVE)) {
+                D_INFO("Removing %pM but non UCODE active\n",
                                 addr);
                 goto out_err;
         }
 
-        if (priv->stations[sta_id].used & IWL_STA_LOCAL) {
-                kfree(priv->stations[sta_id].lq);
-                priv->stations[sta_id].lq = NULL;
+        if (il->stations[sta_id].used & IL_STA_LOCAL) {
+                kfree(il->stations[sta_id].lq);
+                il->stations[sta_id].lq = NULL;
         }
 
-        priv->stations[sta_id].used &= ~IWL_STA_DRIVER_ACTIVE;
+        il->stations[sta_id].used &= ~IL_STA_DRIVER_ACTIVE;
 
-        priv->num_stations--;
+        il->num_stations--;
 
-        BUG_ON(priv->num_stations < 0);
+        BUG_ON(il->num_stations < 0);
 
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
+        spin_unlock_irqrestore(&il->sta_lock, flags);
 
-        return iwl_legacy_send_remove_station(priv, addr, sta_id, false);
+        return il_send_remove_station(il, addr, sta_id, false);
 out_err:
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
+        spin_unlock_irqrestore(&il->sta_lock, flags);
         return -EINVAL;
 }
-EXPORT_SYMBOL_GPL(iwl_legacy_remove_station);
+EXPORT_SYMBOL_GPL(il_remove_station);
 
 /**
- * iwl_legacy_clear_ucode_stations - clear ucode station table bits
+ * il_clear_ucode_stations - clear ucode station table bits
  *
  * This function clears all the bits in the driver indicating
  * which stations are active in the ucode. Call when something
  * other than explicit station management would cause this in
  * the ucode, e.g. unassociated RXON.
  */
-void iwl_legacy_clear_ucode_stations(struct iwl_priv *priv,
-                              struct iwl_rxon_context *ctx)
+void il_clear_ucode_stations(struct il_priv *il,
+                              struct il_rxon_context *ctx)
 {
         int i;
         unsigned long flags_spin;
         bool cleared = false;
 
-        IWL_DEBUG_INFO(priv, "Clearing ucode stations in driver\n");
+        D_INFO("Clearing ucode stations in driver\n");
 
-        spin_lock_irqsave(&priv->sta_lock, flags_spin);
-        for (i = 0; i < priv->hw_params.max_stations; i++) {
-                if (ctx && ctx->ctxid != priv->stations[i].ctxid)
+        spin_lock_irqsave(&il->sta_lock, flags_spin);
+        for (i = 0; i < il->hw_params.max_stations; i++) {
+                if (ctx && ctx->ctxid != il->stations[i].ctxid)
                         continue;
 
-                if (priv->stations[i].used & IWL_STA_UCODE_ACTIVE) {
-                        IWL_DEBUG_INFO(priv,
+                if (il->stations[i].used & IL_STA_UCODE_ACTIVE) {
+                        D_INFO(
                                 "Clearing ucode active for station %d\n", i);
-                        priv->stations[i].used &= ~IWL_STA_UCODE_ACTIVE;
+                        il->stations[i].used &= ~IL_STA_UCODE_ACTIVE;
                         cleared = true;
                 }
         }
-        spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
+        spin_unlock_irqrestore(&il->sta_lock, flags_spin);
 
         if (!cleared)
-                IWL_DEBUG_INFO(priv,
+                D_INFO(
                         "No active stations found to be cleared\n");
 }
-EXPORT_SYMBOL(iwl_legacy_clear_ucode_stations);
+EXPORT_SYMBOL(il_clear_ucode_stations);
 
 /**
- * iwl_legacy_restore_stations() - Restore driver known stations to device
+ * il_restore_stations() - Restore driver known stations to device
  *
  * All stations considered active by driver, but not present in ucode, is
  * restored.
@@ -573,58 +574,58 @@ EXPORT_SYMBOL(iwl_legacy_clear_ucode_stations);
  * Function sleeps.
  */
 void
-iwl_legacy_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
+il_restore_stations(struct il_priv *il, struct il_rxon_context *ctx)
 {
-        struct iwl_legacy_addsta_cmd sta_cmd;
-        struct iwl_link_quality_cmd lq;
+        struct il_addsta_cmd sta_cmd;
+        struct il_link_quality_cmd lq;
         unsigned long flags_spin;
         int i;
         bool found = false;
         int ret;
         bool send_lq;
 
-        if (!iwl_legacy_is_ready(priv)) {
-                IWL_DEBUG_INFO(priv,
+        if (!il_is_ready(il)) {
+                D_INFO(
                         "Not ready yet, not restoring any stations.\n");
                 return;
         }
 
-        IWL_DEBUG_ASSOC(priv, "Restoring all known stations ... start.\n");
-        spin_lock_irqsave(&priv->sta_lock, flags_spin);
-        for (i = 0; i < priv->hw_params.max_stations; i++) {
-                if (ctx->ctxid != priv->stations[i].ctxid)
+        D_ASSOC("Restoring all known stations ... start.\n");
+        spin_lock_irqsave(&il->sta_lock, flags_spin);
+        for (i = 0; i < il->hw_params.max_stations; i++) {
+                if (ctx->ctxid != il->stations[i].ctxid)
                         continue;
-                if ((priv->stations[i].used & IWL_STA_DRIVER_ACTIVE) &&
-                            !(priv->stations[i].used & IWL_STA_UCODE_ACTIVE)) {
-                        IWL_DEBUG_ASSOC(priv, "Restoring sta %pM\n",
-                                        priv->stations[i].sta.sta.addr);
-                        priv->stations[i].sta.mode = 0;
-                        priv->stations[i].used |= IWL_STA_UCODE_INPROGRESS;
+                if ((il->stations[i].used & IL_STA_DRIVER_ACTIVE) &&
+                    !(il->stations[i].used & IL_STA_UCODE_ACTIVE)) {
+                        D_ASSOC("Restoring sta %pM\n",
+                                        il->stations[i].sta.sta.addr);
+                        il->stations[i].sta.mode = 0;
+                        il->stations[i].used |= IL_STA_UCODE_INPROGRESS;
                         found = true;
                 }
         }
 
-        for (i = 0; i < priv->hw_params.max_stations; i++) {
-                if ((priv->stations[i].used & IWL_STA_UCODE_INPROGRESS)) {
-                        memcpy(&sta_cmd, &priv->stations[i].sta,
-                               sizeof(struct iwl_legacy_addsta_cmd));
+        for (i = 0; i < il->hw_params.max_stations; i++) {
+                if ((il->stations[i].used & IL_STA_UCODE_INPROGRESS)) {
+                        memcpy(&sta_cmd, &il->stations[i].sta,
+                               sizeof(struct il_addsta_cmd));
                         send_lq = false;
-                        if (priv->stations[i].lq) {
-                                memcpy(&lq, priv->stations[i].lq,
-                                       sizeof(struct iwl_link_quality_cmd));
+                        if (il->stations[i].lq) {
+                                memcpy(&lq, il->stations[i].lq,
+                                       sizeof(struct il_link_quality_cmd));
                                 send_lq = true;
                         }
-                        spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
-                        ret = iwl_legacy_send_add_sta(priv, &sta_cmd, CMD_SYNC);
+                        spin_unlock_irqrestore(&il->sta_lock, flags_spin);
+                        ret = il_send_add_sta(il, &sta_cmd, CMD_SYNC);
                         if (ret) {
-                                spin_lock_irqsave(&priv->sta_lock, flags_spin);
-                                IWL_ERR(priv, "Adding station %pM failed.\n",
-                                        priv->stations[i].sta.sta.addr);
-                                priv->stations[i].used &=
-                                                ~IWL_STA_DRIVER_ACTIVE;
-                                priv->stations[i].used &=
-                                                ~IWL_STA_UCODE_INPROGRESS;
-                                spin_unlock_irqrestore(&priv->sta_lock,
+                                spin_lock_irqsave(&il->sta_lock, flags_spin);
+                                IL_ERR("Adding station %pM failed.\n",
+                                        il->stations[i].sta.sta.addr);
+                                il->stations[i].used &=
+                                                ~IL_STA_DRIVER_ACTIVE;
+                                il->stations[i].used &=
+                                                ~IL_STA_UCODE_INPROGRESS;
+                                spin_unlock_irqrestore(&il->sta_lock,
                                                                 flags_spin);
                         }
                         /*
@@ -632,78 +633,78 @@ iwl_legacy_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
                          * current LQ command
                          */
                         if (send_lq)
-                                iwl_legacy_send_lq_cmd(priv, ctx, &lq,
+                                il_send_lq_cmd(il, ctx, &lq,
                                                                 CMD_SYNC, true);
-                        spin_lock_irqsave(&priv->sta_lock, flags_spin);
-                        priv->stations[i].used &= ~IWL_STA_UCODE_INPROGRESS;
+                        spin_lock_irqsave(&il->sta_lock, flags_spin);
+                        il->stations[i].used &= ~IL_STA_UCODE_INPROGRESS;
                 }
         }
 
-        spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
+        spin_unlock_irqrestore(&il->sta_lock, flags_spin);
         if (!found)
-                IWL_DEBUG_INFO(priv, "Restoring all known stations"
+                D_INFO("Restoring all known stations"
                                 " .... no stations to be restored.\n");
         else
-                IWL_DEBUG_INFO(priv, "Restoring all known stations"
+                D_INFO("Restoring all known stations"
                                 " .... complete.\n");
 }
-EXPORT_SYMBOL(iwl_legacy_restore_stations);
+EXPORT_SYMBOL(il_restore_stations);
 
-int iwl_legacy_get_free_ucode_key_index(struct iwl_priv *priv)
+int il_get_free_ucode_key_idx(struct il_priv *il)
 {
         int i;
 
-        for (i = 0; i < priv->sta_key_max_num; i++)
-                if (!test_and_set_bit(i, &priv->ucode_key_table))
+        for (i = 0; i < il->sta_key_max_num; i++)
+                if (!test_and_set_bit(i, &il->ucode_key_table))
                         return i;
 
         return WEP_INVALID_OFFSET;
 }
-EXPORT_SYMBOL(iwl_legacy_get_free_ucode_key_index);
+EXPORT_SYMBOL(il_get_free_ucode_key_idx);
 
-void iwl_legacy_dealloc_bcast_stations(struct iwl_priv *priv)
+void il_dealloc_bcast_stations(struct il_priv *il)
 {
         unsigned long flags;
         int i;
 
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        for (i = 0; i < priv->hw_params.max_stations; i++) {
-                if (!(priv->stations[i].used & IWL_STA_BCAST))
+        spin_lock_irqsave(&il->sta_lock, flags);
+        for (i = 0; i < il->hw_params.max_stations; i++) {
+                if (!(il->stations[i].used & IL_STA_BCAST))
                         continue;
 
-                priv->stations[i].used &= ~IWL_STA_UCODE_ACTIVE;
-                priv->num_stations--;
-                BUG_ON(priv->num_stations < 0);
-                kfree(priv->stations[i].lq);
-                priv->stations[i].lq = NULL;
+                il->stations[i].used &= ~IL_STA_UCODE_ACTIVE;
+                il->num_stations--;
+                BUG_ON(il->num_stations < 0);
+                kfree(il->stations[i].lq);
+                il->stations[i].lq = NULL;
         }
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
+        spin_unlock_irqrestore(&il->sta_lock, flags);
 }
-EXPORT_SYMBOL_GPL(iwl_legacy_dealloc_bcast_stations);
+EXPORT_SYMBOL_GPL(il_dealloc_bcast_stations);
 
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-static void iwl_legacy_dump_lq_cmd(struct iwl_priv *priv,
-                           struct iwl_link_quality_cmd *lq)
+#ifdef CONFIG_IWLEGACY_DEBUG
+static void il_dump_lq_cmd(struct il_priv *il,
+                           struct il_link_quality_cmd *lq)
 {
         int i;
-        IWL_DEBUG_RATE(priv, "lq station id 0x%x\n", lq->sta_id);
-        IWL_DEBUG_RATE(priv, "lq ant 0x%X 0x%X\n",
+        D_RATE("lq station id 0x%x\n", lq->sta_id);
+        D_RATE("lq ant 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(priv, "lq index %d 0x%X\n",
+                D_RATE("lq idx %d 0x%X\n",
                                i, lq->rs_table[i].rate_n_flags);
 }
 #else
-static inline void iwl_legacy_dump_lq_cmd(struct iwl_priv *priv,
-                                   struct iwl_link_quality_cmd *lq)
+static inline void il_dump_lq_cmd(struct il_priv *il,
+                                   struct il_link_quality_cmd *lq)
 {
 }
 #endif
 
 /**
- * iwl_legacy_is_lq_table_valid() - Test one aspect of LQ cmd for validity
+ * il_is_lq_table_valid() - Test one aspect of LQ cmd for validity
  *
  * It sometimes happens when a HT rate has been in use and we
  * loose connectivity with AP then mac80211 will first tell us that the
@@ -713,22 +714,22 @@ static inline void iwl_legacy_dump_lq_cmd(struct iwl_priv *priv,
  * Test for this to prevent driver from sending LQ command between the time
  * RXON flags are updated and when LQ command is updated.
  */
-static bool iwl_legacy_is_lq_table_valid(struct iwl_priv *priv,
-                              struct iwl_rxon_context *ctx,
-                              struct iwl_link_quality_cmd *lq)
+static bool il_is_lq_table_valid(struct il_priv *il,
+                              struct il_rxon_context *ctx,
+                              struct il_link_quality_cmd *lq)
 {
         int i;
 
         if (ctx->ht.enabled)
                 return true;
 
-        IWL_DEBUG_INFO(priv, "Channel %u is not an HT channel\n",
+        D_INFO("Channel %u is not an HT channel\n",
                        ctx->active.channel);
         for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++) {
                 if (le32_to_cpu(lq->rs_table[i].rate_n_flags) &
                                                 RATE_MCS_HT_MSK) {
-                        IWL_DEBUG_INFO(priv,
-                                       "index %d of LQ expects HT channel\n",
+                        D_INFO(
+                                       "idx %d of LQ expects HT channel\n",
                                        i);
                         return false;
                 }
@@ -737,7 +738,7 @@ static bool iwl_legacy_is_lq_table_valid(struct iwl_priv *priv,
 }
 
 /**
- * iwl_legacy_send_lq_cmd() - Send link quality command
+ * il_send_lq_cmd() - Send link quality command
  * @init: This command is sent as part of station initialization right
  *        after station has been added.
  *
@@ -746,35 +747,35 @@ static bool iwl_legacy_is_lq_table_valid(struct iwl_priv *priv,
  * this case to clear the state indicating that station creation is in
  * progress.
  */
-int iwl_legacy_send_lq_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
-                    struct iwl_link_quality_cmd *lq, u8 flags, bool init)
+int il_send_lq_cmd(struct il_priv *il, struct il_rxon_context *ctx,
+                    struct il_link_quality_cmd *lq, u8 flags, bool init)
 {
         int ret = 0;
         unsigned long flags_spin;
 
-        struct iwl_host_cmd cmd = {
-                .id = REPLY_TX_LINK_QUALITY_CMD,
-                .len = sizeof(struct iwl_link_quality_cmd),
+        struct il_host_cmd cmd = {
+                .id = C_TX_LINK_QUALITY_CMD,
+                .len = sizeof(struct il_link_quality_cmd),
                 .flags = flags,
                 .data = lq,
         };
 
-        if (WARN_ON(lq->sta_id == IWL_INVALID_STATION))
+        if (WARN_ON(lq->sta_id == IL_INVALID_STATION))
                 return -EINVAL;
 
 
-        spin_lock_irqsave(&priv->sta_lock, flags_spin);
-        if (!(priv->stations[lq->sta_id].used & IWL_STA_DRIVER_ACTIVE)) {
-                spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
+        spin_lock_irqsave(&il->sta_lock, flags_spin);
+        if (!(il->stations[lq->sta_id].used & IL_STA_DRIVER_ACTIVE)) {
+                spin_unlock_irqrestore(&il->sta_lock, flags_spin);
                 return -EINVAL;
         }
-        spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
+        spin_unlock_irqrestore(&il->sta_lock, flags_spin);
 
-        iwl_legacy_dump_lq_cmd(priv, lq);
+        il_dump_lq_cmd(il, lq);
         BUG_ON(init && (cmd.flags & CMD_ASYNC));
 
-        if (iwl_legacy_is_lq_table_valid(priv, ctx, lq))
-                ret = iwl_legacy_send_cmd(priv, &cmd);
+        if (il_is_lq_table_valid(il, ctx, lq))
+                ret = il_send_cmd(il, &cmd);
         else
                 ret = -EINVAL;
 
@@ -782,35 +783,35 @@ int iwl_legacy_send_lq_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
                 return ret;
 
         if (init) {
-                IWL_DEBUG_INFO(priv, "init LQ command complete,"
+                D_INFO("init LQ command complete,"
                                 " clearing sta addition status for sta %d\n",
                                lq->sta_id);
-                spin_lock_irqsave(&priv->sta_lock, flags_spin);
-                priv->stations[lq->sta_id].used &= ~IWL_STA_UCODE_INPROGRESS;
-                spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
+                spin_lock_irqsave(&il->sta_lock, flags_spin);
+                il->stations[lq->sta_id].used &= ~IL_STA_UCODE_INPROGRESS;
+                spin_unlock_irqrestore(&il->sta_lock, flags_spin);
         }
         return ret;
 }
-EXPORT_SYMBOL(iwl_legacy_send_lq_cmd);
+EXPORT_SYMBOL(il_send_lq_cmd);
 
-int iwl_legacy_mac_sta_remove(struct ieee80211_hw *hw,
+int il_mac_sta_remove(struct ieee80211_hw *hw,
                        struct ieee80211_vif *vif,
                        struct ieee80211_sta *sta)
 {
-        struct iwl_priv *priv = hw->priv;
-        struct iwl_station_priv_common *sta_common = (void *)sta->drv_priv;
+        struct il_priv *il = hw->priv;
+        struct il_station_priv_common *sta_common = (void *)sta->drv_priv;
         int ret;
 
-        IWL_DEBUG_INFO(priv, "received request to remove station %pM\n",
+        D_INFO("received request to remove station %pM\n",
                         sta->addr);
-        mutex_lock(&priv->mutex);
-        IWL_DEBUG_INFO(priv, "proceeding to remove station %pM\n",
+        mutex_lock(&il->mutex);
+        D_INFO("proceeding to remove station %pM\n",
                         sta->addr);
-        ret = iwl_legacy_remove_station(priv, sta_common->sta_id, sta->addr);
+        ret = il_remove_station(il, sta_common->sta_id, sta->addr);
         if (ret)
-                IWL_ERR(priv, "Error removing station %pM\n",
+                IL_ERR("Error removing station %pM\n",
                         sta->addr);
-        mutex_unlock(&priv->mutex);
+        mutex_unlock(&il->mutex);
         return ret;
 }
-EXPORT_SYMBOL(iwl_legacy_mac_sta_remove);
+EXPORT_SYMBOL(il_mac_sta_remove);
diff --git a/drivers/net/wireless/iwlegacy/iwl-sta.h b/drivers/net/wireless/iwlegacy/iwl-sta.h
deleted file mode 100644
index 67bd75fe01a1..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-sta.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-#ifndef __iwl_legacy_sta_h__
-#define __iwl_legacy_sta_h__
-
-#include "iwl-dev.h"
-
-#define HW_KEY_DYNAMIC 0
-#define HW_KEY_DEFAULT 1
-
-#define IWL_STA_DRIVER_ACTIVE BIT(0) /* driver entry is active */
-#define IWL_STA_UCODE_ACTIVE  BIT(1) /* ucode entry is active */
-#define IWL_STA_UCODE_INPROGRESS  BIT(2) /* ucode entry is in process of
-                                            being activated */
-#define IWL_STA_LOCAL BIT(3) /* station state not directed by mac80211;
-                                (this is for the IBSS BSSID stations) */
-#define IWL_STA_BCAST BIT(4) /* this station is the special bcast station */
-
-
-void iwl_legacy_restore_stations(struct iwl_priv *priv,
-                                struct iwl_rxon_context *ctx);
-void iwl_legacy_clear_ucode_stations(struct iwl_priv *priv,
-                              struct iwl_rxon_context *ctx);
-void iwl_legacy_dealloc_bcast_stations(struct iwl_priv *priv);
-int iwl_legacy_get_free_ucode_key_index(struct iwl_priv *priv);
-int iwl_legacy_send_add_sta(struct iwl_priv *priv,
-                        struct iwl_legacy_addsta_cmd *sta, u8 flags);
-int iwl_legacy_add_station_common(struct iwl_priv *priv,
-                        struct iwl_rxon_context *ctx,
-                        const u8 *addr, bool is_ap,
-                        struct ieee80211_sta *sta, u8 *sta_id_r);
-int iwl_legacy_remove_station(struct iwl_priv *priv,
-                        const u8 sta_id,
-                        const u8 *addr);
-int iwl_legacy_mac_sta_remove(struct ieee80211_hw *hw,
-                        struct ieee80211_vif *vif,
-                        struct ieee80211_sta *sta);
-
-u8 iwl_legacy_prep_station(struct iwl_priv *priv,
-                        struct iwl_rxon_context *ctx,
-                        const u8 *addr, bool is_ap,
-                        struct ieee80211_sta *sta);
-
-int iwl_legacy_send_lq_cmd(struct iwl_priv *priv,
-                        struct iwl_rxon_context *ctx,
-                        struct iwl_link_quality_cmd *lq,
-                        u8 flags, bool init);
-
-/**
- * iwl_legacy_clear_driver_stations - clear knowledge of all stations from driver
- * @priv: iwl priv struct
- *
- * This is called during iwl_down() to make sure that in the case
- * we're coming there from a hardware restart mac80211 will be
- * able to reconfigure stations -- if we're getting there in the
- * normal down flow then the stations will already be cleared.
- */
-static inline void iwl_legacy_clear_driver_stations(struct iwl_priv *priv)
-{
-        unsigned long flags;
-        struct iwl_rxon_context *ctx;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        memset(priv->stations, 0, sizeof(priv->stations));
-        priv->num_stations = 0;
-
-        priv->ucode_key_table = 0;
-
-        for_each_context(priv, ctx) {
-                /*
-                 * Remove all key information that is not stored as part
-                 * of station information since mac80211 may not have had
-                 * a chance to remove all the keys. When device is
-                 * reconfigured by mac80211 after an error all keys will
-                 * be reconfigured.
-                 */
-                memset(ctx->wep_keys, 0, sizeof(ctx->wep_keys));
-                ctx->key_mapping_keys = 0;
-        }
-
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-}
-
-static inline int iwl_legacy_sta_id(struct ieee80211_sta *sta)
-{
-        if (WARN_ON(!sta))
-                return IWL_INVALID_STATION;
-
-        return ((struct iwl_station_priv_common *)sta->drv_priv)->sta_id;
-}
-
-/**
- * iwl_legacy_sta_id_or_broadcast - return sta_id or broadcast sta
- * @priv: iwl priv
- * @context: the current context
- * @sta: mac80211 station
- *
- * In certain circumstances mac80211 passes a station pointer
- * that may be %NULL, for example during TX or key setup. In
- * that case, we need to use the broadcast station, so this
- * inline wraps that pattern.
- */
-static inline int iwl_legacy_sta_id_or_broadcast(struct iwl_priv *priv,
-                                          struct iwl_rxon_context *context,
-                                          struct ieee80211_sta *sta)
-{
-        int sta_id;
-
-        if (!sta)
-                return context->bcast_sta_id;
-
-        sta_id = iwl_legacy_sta_id(sta);
-
-        /*
-         * mac80211 should not be passing a partially
-         * initialised station!
-         */
-        WARN_ON(sta_id == IWL_INVALID_STATION);
-
-        return sta_id;
-}
-#endif /* __iwl_legacy_sta_h__ */
diff --git a/drivers/net/wireless/iwlegacy/iwl-tx.c b/drivers/net/wireless/iwlegacy/iwl-tx.c
deleted file mode 100644
index ef9e268bf8a0..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl-tx.c
+++ /dev/null
@@ -1,658 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-
-#include <linux/etherdevice.h>
-#include <linux/sched.h>
-#include <linux/slab.h>
-#include <net/mac80211.h>
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-sta.h"
-#include "iwl-io.h"
-#include "iwl-helpers.h"
-
-/**
- * iwl_legacy_txq_update_write_ptr - Send new write index to hardware
- */
-void
-iwl_legacy_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq)
-{
-        u32 reg = 0;
-        int txq_id = txq->q.id;
-
-        if (txq->need_update == 0)
-                return;
-
-        /* if we're trying to save power */
-        if (test_bit(STATUS_POWER_PMI, &priv->status)) {
-                /* 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 = iwl_read32(priv, CSR_UCODE_DRV_GP1);
-
-                if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {
-                        IWL_DEBUG_INFO(priv,
-                                        "Tx queue %d requesting wakeup,"
-                                        " GP1 = 0x%x\n", txq_id, reg);
-                        iwl_legacy_set_bit(priv, CSR_GP_CNTRL,
-                                        CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-                        return;
-                }
-
-                iwl_legacy_write_direct32(priv, HBUS_TARG_WRPTR,
-                                txq->q.write_ptr | (txq_id << 8));
-
-                /*
-                 * 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
-                iwl_write32(priv, HBUS_TARG_WRPTR,
-                            txq->q.write_ptr | (txq_id << 8));
-        txq->need_update = 0;
-}
-EXPORT_SYMBOL(iwl_legacy_txq_update_write_ptr);
-
-/**
- * iwl_legacy_tx_queue_unmap -  Unmap any remaining DMA mappings and free skb's
- */
-void iwl_legacy_tx_queue_unmap(struct iwl_priv *priv, int txq_id)
-{
-        struct iwl_tx_queue *txq = &priv->txq[txq_id];
-        struct iwl_queue *q = &txq->q;
-
-        if (q->n_bd == 0)
-                return;
-
-        while (q->write_ptr != q->read_ptr) {
-                priv->cfg->ops->lib->txq_free_tfd(priv, txq);
-                q->read_ptr = iwl_legacy_queue_inc_wrap(q->read_ptr, q->n_bd);
-        }
-}
-EXPORT_SYMBOL(iwl_legacy_tx_queue_unmap);
-
-/**
- * iwl_legacy_tx_queue_free - Deallocate DMA queue.
- * @txq: Transmit queue to deallocate.
- *
- * Empty queue by removing and destroying all BD's.
- * Free all buffers.
- * 0-fill, but do not free "txq" descriptor structure.
- */
-void iwl_legacy_tx_queue_free(struct iwl_priv *priv, int txq_id)
-{
-        struct iwl_tx_queue *txq = &priv->txq[txq_id];
-        struct device *dev = &priv->pci_dev->dev;
-        int i;
-
-        iwl_legacy_tx_queue_unmap(priv, txq_id);
-
-        /* De-alloc array of command/tx buffers */
-        for (i = 0; i < TFD_TX_CMD_SLOTS; i++)
-                kfree(txq->cmd[i]);
-
-        /* De-alloc circular buffer of TFDs */
-        if (txq->q.n_bd)
-                dma_free_coherent(dev, priv->hw_params.tfd_size *
-                                  txq->q.n_bd, txq->tfds, txq->q.dma_addr);
-
-        /* De-alloc array of per-TFD driver data */
-        kfree(txq->txb);
-        txq->txb = NULL;
-
-        /* deallocate arrays */
-        kfree(txq->cmd);
-        kfree(txq->meta);
-        txq->cmd = NULL;
-        txq->meta = NULL;
-
-        /* 0-fill queue descriptor structure */
-        memset(txq, 0, sizeof(*txq));
-}
-EXPORT_SYMBOL(iwl_legacy_tx_queue_free);
-
-/**
- * iwl_cmd_queue_unmap - Unmap any remaining DMA mappings from command queue
- */
-void iwl_legacy_cmd_queue_unmap(struct iwl_priv *priv)
-{
-        struct iwl_tx_queue *txq = &priv->txq[priv->cmd_queue];
-        struct iwl_queue *q = &txq->q;
-        int i;
-
-        if (q->n_bd == 0)
-                return;
-
-        while (q->read_ptr != q->write_ptr) {
-                i = iwl_legacy_get_cmd_index(q, q->read_ptr, 0);
-
-                if (txq->meta[i].flags & CMD_MAPPED) {
-                        pci_unmap_single(priv->pci_dev,
-                                         dma_unmap_addr(&txq->meta[i], mapping),
-                                         dma_unmap_len(&txq->meta[i], len),
-                                         PCI_DMA_BIDIRECTIONAL);
-                        txq->meta[i].flags = 0;
-                }
-
-                q->read_ptr = iwl_legacy_queue_inc_wrap(q->read_ptr, q->n_bd);
-        }
-
-        i = q->n_window;
-        if (txq->meta[i].flags & CMD_MAPPED) {
-                pci_unmap_single(priv->pci_dev,
-                                 dma_unmap_addr(&txq->meta[i], mapping),
-                                 dma_unmap_len(&txq->meta[i], len),
-                                 PCI_DMA_BIDIRECTIONAL);
-                txq->meta[i].flags = 0;
-        }
-}
-EXPORT_SYMBOL(iwl_legacy_cmd_queue_unmap);
-
-/**
- * iwl_legacy_cmd_queue_free - Deallocate DMA queue.
- * @txq: Transmit queue to deallocate.
- *
- * Empty queue by removing and destroying all BD's.
- * Free all buffers.
- * 0-fill, but do not free "txq" descriptor structure.
- */
-void iwl_legacy_cmd_queue_free(struct iwl_priv *priv)
-{
-        struct iwl_tx_queue *txq = &priv->txq[priv->cmd_queue];
-        struct device *dev = &priv->pci_dev->dev;
-        int i;
-
-        iwl_legacy_cmd_queue_unmap(priv);
-
-        /* De-alloc array of command/tx buffers */
-        for (i = 0; i <= TFD_CMD_SLOTS; i++)
-                kfree(txq->cmd[i]);
-
-        /* De-alloc circular buffer of TFDs */
-        if (txq->q.n_bd)
-                dma_free_coherent(dev, priv->hw_params.tfd_size * txq->q.n_bd,
-                                  txq->tfds, txq->q.dma_addr);
-
-        /* deallocate arrays */
-        kfree(txq->cmd);
-        kfree(txq->meta);
-        txq->cmd = NULL;
-        txq->meta = NULL;
-
-        /* 0-fill queue descriptor structure */
-        memset(txq, 0, sizeof(*txq));
-}
-EXPORT_SYMBOL(iwl_legacy_cmd_queue_free);
-
-/*************** DMA-QUEUE-GENERAL-FUNCTIONS  *****
- * DMA services
- *
- * Theory of operation
- *
- * A Tx or Rx queue resides in host DRAM, and is comprised of a circular buffer
- * of buffer descriptors, each of which points to one or more data buffers for
- * the device to read from or fill.  Driver and device exchange status of each
- * queue via "read" and "write" pointers.  Driver keeps minimum of 2 empty
- * entries in each circular buffer, to protect against confusing empty and full
- * queue states.
- *
- * The device reads or writes the data in the queues via the device's several
- * DMA/FIFO channels.  Each queue is mapped to a single DMA channel.
- *
- * For Tx queue, there are low mark and high mark limits. If, after queuing
- * the packet for Tx, free space become < low mark, Tx queue stopped. When
- * reclaiming packets (on 'tx done IRQ), if free space become > high mark,
- * Tx queue resumed.
- *
- * See more detailed info in iwl-4965-hw.h.
- ***************************************************/
-
-int iwl_legacy_queue_space(const struct iwl_queue *q)
-{
-        int s = q->read_ptr - q->write_ptr;
-
-        if (q->read_ptr > q->write_ptr)
-                s -= q->n_bd;
-
-        if (s <= 0)
-                s += q->n_window;
-        /* keep some reserve to not confuse empty and full situations */
-        s -= 2;
-        if (s < 0)
-                s = 0;
-        return s;
-}
-EXPORT_SYMBOL(iwl_legacy_queue_space);
-
-
-/**
- * iwl_legacy_queue_init - Initialize queue's high/low-water and read/write indexes
- */
-static int iwl_legacy_queue_init(struct iwl_priv *priv, struct iwl_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 iwl_legacy_queue_inc_wrap
-         * and iwl_legacy_queue_dec_wrap are broken. */
-        BUG_ON(!is_power_of_2(count));
-
-        /* slots_num must be power-of-two size, otherwise
-         * iwl_legacy_get_cmd_index is broken. */
-        BUG_ON(!is_power_of_2(slots_num));
-
-        q->low_mark = q->n_window / 4;
-        if (q->low_mark < 4)
-                q->low_mark = 4;
-
-        q->high_mark = q->n_window / 8;
-        if (q->high_mark < 2)
-                q->high_mark = 2;
-
-        q->write_ptr = q->read_ptr = 0;
-
-        return 0;
-}
-
-/**
- * iwl_legacy_tx_queue_alloc - Alloc driver data and TFD CB for one Tx/cmd queue
- */
-static int iwl_legacy_tx_queue_alloc(struct iwl_priv *priv,
-                              struct iwl_tx_queue *txq, u32 id)
-{
-        struct device *dev = &priv->pci_dev->dev;
-        size_t tfd_sz = priv->hw_params.tfd_size * TFD_QUEUE_SIZE_MAX;
-
-        /* Driver private data, only for Tx (not command) queues,
-         * not shared with device. */
-        if (id != priv->cmd_queue) {
-                txq->txb = kzalloc(sizeof(txq->txb[0]) *
-                                   TFD_QUEUE_SIZE_MAX, GFP_KERNEL);
-                if (!txq->txb) {
-                        IWL_ERR(priv, "kmalloc for auxiliary BD "
-                                  "structures failed\n");
-                        goto error;
-                }
-        } else {
-                txq->txb = NULL;
-        }
-
-        /* Circular buffer of transmit frame descriptors (TFDs),
-         * shared with device */
-        txq->tfds = dma_alloc_coherent(dev, tfd_sz, &txq->q.dma_addr,
-                                       GFP_KERNEL);
-        if (!txq->tfds) {
-                IWL_ERR(priv, "pci_alloc_consistent(%zd) failed\n", tfd_sz);
-                goto error;
-        }
-        txq->q.id = id;
-
-        return 0;
-
- error:
-        kfree(txq->txb);
-        txq->txb = NULL;
-
-        return -ENOMEM;
-}
-
-/**
- * iwl_legacy_tx_queue_init - Allocate and initialize one tx/cmd queue
- */
-int iwl_legacy_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
-                      int slots_num, u32 txq_id)
-{
-        int i, len;
-        int ret;
-        int actual_slots = slots_num;
-
-        /*
-         * Alloc buffer array for commands (Tx or other types of commands).
-         * For the command queue (#4/#9), allocate command space + one big
-         * command for scan, since scan command is very huge; the system will
-         * not have two scans at the same time, so only one is needed.
-         * For normal Tx queues (all other queues), no super-size command
-         * space is needed.
-         */
-        if (txq_id == priv->cmd_queue)
-                actual_slots++;
-
-        txq->meta = kzalloc(sizeof(struct iwl_cmd_meta) * actual_slots,
-                            GFP_KERNEL);
-        txq->cmd = kzalloc(sizeof(struct iwl_device_cmd *) * actual_slots,
-                           GFP_KERNEL);
-
-        if (!txq->meta || !txq->cmd)
-                goto out_free_arrays;
-
-        len = sizeof(struct iwl_device_cmd);
-        for (i = 0; i < actual_slots; i++) {
-                /* only happens for cmd queue */
-                if (i == slots_num)
-                        len = IWL_MAX_CMD_SIZE;
-
-                txq->cmd[i] = kmalloc(len, GFP_KERNEL);
-                if (!txq->cmd[i])
-                        goto err;
-        }
-
-        /* Alloc driver data array and TFD circular buffer */
-        ret = iwl_legacy_tx_queue_alloc(priv, txq, txq_id);
-        if (ret)
-                goto err;
-
-        txq->need_update = 0;
-
-        /*
-         * For the default queues 0-3, set up the swq_id
-         * already -- all others need to get one later
-         * (if they need one at all).
-         */
-        if (txq_id < 4)
-                iwl_legacy_set_swq_id(txq, txq_id, txq_id);
-
-        /* TFD_QUEUE_SIZE_MAX must be power-of-two size, otherwise
-         * iwl_legacy_queue_inc_wrap and iwl_legacy_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 */
-        iwl_legacy_queue_init(priv, &txq->q,
-                                TFD_QUEUE_SIZE_MAX, slots_num, txq_id);
-
-        /* Tell device where to find queue */
-        priv->cfg->ops->lib->txq_init(priv, txq);
-
-        return 0;
-err:
-        for (i = 0; i < actual_slots; i++)
-                kfree(txq->cmd[i]);
-out_free_arrays:
-        kfree(txq->meta);
-        kfree(txq->cmd);
-
-        return -ENOMEM;
-}
-EXPORT_SYMBOL(iwl_legacy_tx_queue_init);
-
-void iwl_legacy_tx_queue_reset(struct iwl_priv *priv, struct iwl_tx_queue *txq,
-                        int slots_num, u32 txq_id)
-{
-        int actual_slots = slots_num;
-
-        if (txq_id == priv->cmd_queue)
-                actual_slots++;
-
-        memset(txq->meta, 0, sizeof(struct iwl_cmd_meta) * actual_slots);
-
-        txq->need_update = 0;
-
-        /* Initialize queue's high/low-water marks, and head/tail indexes */
-        iwl_legacy_queue_init(priv, &txq->q,
-                                TFD_QUEUE_SIZE_MAX, slots_num, txq_id);
-
-        /* Tell device where to find queue */
-        priv->cfg->ops->lib->txq_init(priv, txq);
-}
-EXPORT_SYMBOL(iwl_legacy_tx_queue_reset);
-
-/*************** HOST COMMAND QUEUE FUNCTIONS   *****/
-
-/**
- * iwl_legacy_enqueue_hcmd - enqueue a uCode command
- * @priv: device private data point
- * @cmd: a point to the ucode command structure
- *
- * The function returns < 0 values to indicate the operation is
- * failed. On success, it turns the index (> 0) of command in the
- * command queue.
- */
-int iwl_legacy_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
-{
-        struct iwl_tx_queue *txq = &priv->txq[priv->cmd_queue];
-        struct iwl_queue *q = &txq->q;
-        struct iwl_device_cmd *out_cmd;
-        struct iwl_cmd_meta *out_meta;
-        dma_addr_t phys_addr;
-        unsigned long flags;
-        int len;
-        u32 idx;
-        u16 fix_size;
-
-        cmd->len = priv->cfg->ops->utils->get_hcmd_size(cmd->id, cmd->len);
-        fix_size = (u16)(cmd->len + sizeof(out_cmd->hdr));
-
-        /* If any of the command structures end up being larger than
-         * the TFD_MAX_PAYLOAD_SIZE, and it sent as a 'small' command then
-         * we will need to increase the size of the TFD entries
-         * Also, check to see if command buffer should not exceed the size
-         * of device_cmd and max_cmd_size. */
-        BUG_ON((fix_size > TFD_MAX_PAYLOAD_SIZE) &&
-               !(cmd->flags & CMD_SIZE_HUGE));
-        BUG_ON(fix_size > IWL_MAX_CMD_SIZE);
-
-        if (iwl_legacy_is_rfkill(priv) || iwl_legacy_is_ctkill(priv)) {
-                IWL_WARN(priv, "Not sending command - %s KILL\n",
-                         iwl_legacy_is_rfkill(priv) ? "RF" : "CT");
-                return -EIO;
-        }
-
-        spin_lock_irqsave(&priv->hcmd_lock, flags);
-
-        if (iwl_legacy_queue_space(q) < ((cmd->flags & CMD_ASYNC) ? 2 : 1)) {
-                spin_unlock_irqrestore(&priv->hcmd_lock, flags);
-
-                IWL_ERR(priv, "Restarting adapter due to command queue full\n");
-                queue_work(priv->workqueue, &priv->restart);
-                return -ENOSPC;
-        }
-
-        idx = iwl_legacy_get_cmd_index(q, q->write_ptr, cmd->flags & CMD_SIZE_HUGE);
-        out_cmd = txq->cmd[idx];
-        out_meta = &txq->meta[idx];
-
-        if (WARN_ON(out_meta->flags & CMD_MAPPED)) {
-                spin_unlock_irqrestore(&priv->hcmd_lock, flags);
-                return -ENOSPC;
-        }
-
-        memset(out_meta, 0, sizeof(*out_meta)); /* re-initialize to NULL */
-        out_meta->flags = cmd->flags | CMD_MAPPED;
-        if (cmd->flags & CMD_WANT_SKB)
-                out_meta->source = cmd;
-        if (cmd->flags & CMD_ASYNC)
-                out_meta->callback = cmd->callback;
-
-        out_cmd->hdr.cmd = cmd->id;
-        memcpy(&out_cmd->cmd.payload, cmd->data, cmd->len);
-
-        /* At this point, the out_cmd now has all of the incoming cmd
-         * information */
-
-        out_cmd->hdr.flags = 0;
-        out_cmd->hdr.sequence = cpu_to_le16(QUEUE_TO_SEQ(priv->cmd_queue) |
-                        INDEX_TO_SEQ(q->write_ptr));
-        if (cmd->flags & CMD_SIZE_HUGE)
-                out_cmd->hdr.sequence |= SEQ_HUGE_FRAME;
-        len = sizeof(struct iwl_device_cmd);
-        if (idx == TFD_CMD_SLOTS)
-                len = IWL_MAX_CMD_SIZE;
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        switch (out_cmd->hdr.cmd) {
-        case REPLY_TX_LINK_QUALITY_CMD:
-        case SENSITIVITY_CMD:
-                IWL_DEBUG_HC_DUMP(priv,
-                                "Sending command %s (#%x), seq: 0x%04X, "
-                                "%d bytes at %d[%d]:%d\n",
-                                iwl_legacy_get_cmd_string(out_cmd->hdr.cmd),
-                                out_cmd->hdr.cmd,
-                                le16_to_cpu(out_cmd->hdr.sequence), fix_size,
-                                q->write_ptr, idx, priv->cmd_queue);
-                break;
-        default:
-                IWL_DEBUG_HC(priv, "Sending command %s (#%x), seq: 0x%04X, "
-                                "%d bytes at %d[%d]:%d\n",
-                                iwl_legacy_get_cmd_string(out_cmd->hdr.cmd),
-                                out_cmd->hdr.cmd,
-                                le16_to_cpu(out_cmd->hdr.sequence), fix_size,
-                                q->write_ptr, idx, priv->cmd_queue);
-        }
-#endif
-        txq->need_update = 1;
-
-        if (priv->cfg->ops->lib->txq_update_byte_cnt_tbl)
-                /* Set up entry in queue's byte count circular buffer */
-                priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq, 0);
-
-        phys_addr = pci_map_single(priv->pci_dev, &out_cmd->hdr,
-                                   fix_size, PCI_DMA_BIDIRECTIONAL);
-        dma_unmap_addr_set(out_meta, mapping, phys_addr);
-        dma_unmap_len_set(out_meta, len, fix_size);
-
-        trace_iwlwifi_legacy_dev_hcmd(priv, &out_cmd->hdr,
-                                                fix_size, cmd->flags);
-
-        priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,
-                                                   phys_addr, fix_size, 1,
-                                                   U32_PAD(cmd->len));
-
-        /* Increment and update queue's write index */
-        q->write_ptr = iwl_legacy_queue_inc_wrap(q->write_ptr, q->n_bd);
-        iwl_legacy_txq_update_write_ptr(priv, txq);
-
-        spin_unlock_irqrestore(&priv->hcmd_lock, flags);
-        return idx;
-}
-
-/**
- * iwl_legacy_hcmd_queue_reclaim - Reclaim TX command 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 iwl_legacy_hcmd_queue_reclaim(struct iwl_priv *priv, int txq_id,
-                                   int idx, int cmd_idx)
-{
-        struct iwl_tx_queue *txq = &priv->txq[txq_id];
-        struct iwl_queue *q = &txq->q;
-        int nfreed = 0;
-
-        if ((idx >= q->n_bd) || (iwl_legacy_queue_used(q, idx) == 0)) {
-                IWL_ERR(priv, "Read index for DMA queue txq id (%d), index %d, "
-                          "is out of range [0-%d] %d %d.\n", txq_id,
-                          idx, q->n_bd, q->write_ptr, q->read_ptr);
-                return;
-        }
-
-        for (idx = iwl_legacy_queue_inc_wrap(idx, q->n_bd); q->read_ptr != idx;
-             q->read_ptr = iwl_legacy_queue_inc_wrap(q->read_ptr, q->n_bd)) {
-
-                if (nfreed++ > 0) {
-                        IWL_ERR(priv, "HCMD skipped: index (%d) %d %d\n", idx,
-                                        q->write_ptr, q->read_ptr);
-                        queue_work(priv->workqueue, &priv->restart);
-                }
-
-        }
-}
-
-/**
- * iwl_legacy_tx_cmd_complete - Pull unused buffers off the queue and reclaim them
- * @rxb: Rx buffer to reclaim
- *
- * If an Rx buffer has an async callback associated with it the callback
- * will be executed.  The attached skb (if present) will only be freed
- * if the callback returns 1
- */
-void
-iwl_legacy_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        u16 sequence = le16_to_cpu(pkt->hdr.sequence);
-        int txq_id = SEQ_TO_QUEUE(sequence);
-        int index = SEQ_TO_INDEX(sequence);
-        int cmd_index;
-        bool huge = !!(pkt->hdr.sequence & SEQ_HUGE_FRAME);
-        struct iwl_device_cmd *cmd;
-        struct iwl_cmd_meta *meta;
-        struct iwl_tx_queue *txq = &priv->txq[priv->cmd_queue];
-        unsigned long flags;
-
-        /* 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 (WARN(txq_id != priv->cmd_queue,
-                 "wrong command queue %d (should be %d), sequence 0x%X readp=%d writep=%d\n",
-                  txq_id, priv->cmd_queue, sequence,
-                  priv->txq[priv->cmd_queue].q.read_ptr,
-                  priv->txq[priv->cmd_queue].q.write_ptr)) {
-                iwl_print_hex_error(priv, pkt, 32);
-                return;
-        }
-
-        cmd_index = iwl_legacy_get_cmd_index(&txq->q, index, huge);
-        cmd = txq->cmd[cmd_index];
-        meta = &txq->meta[cmd_index];
-
-        txq->time_stamp = jiffies;
-
-        pci_unmap_single(priv->pci_dev,
-                         dma_unmap_addr(meta, mapping),
-                         dma_unmap_len(meta, len),
-                         PCI_DMA_BIDIRECTIONAL);
-
-        /* Input error checking is done when commands are added to queue. */
-        if (meta->flags & CMD_WANT_SKB) {
-                meta->source->reply_page = (unsigned long)rxb_addr(rxb);
-                rxb->page = NULL;
-        } else if (meta->callback)
-                meta->callback(priv, cmd, pkt);
-
-        spin_lock_irqsave(&priv->hcmd_lock, flags);
-
-        iwl_legacy_hcmd_queue_reclaim(priv, txq_id, index, cmd_index);
-
-        if (!(meta->flags & CMD_ASYNC)) {
-                clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
-                IWL_DEBUG_INFO(priv, "Clearing HCMD_ACTIVE for command %s\n",
-                               iwl_legacy_get_cmd_string(cmd->hdr.cmd));
-                wake_up(&priv->wait_command_queue);
-        }
-
-        /* Mark as unmapped */
-        meta->flags = 0;
-
-        spin_unlock_irqrestore(&priv->hcmd_lock, flags);
-}
-EXPORT_SYMBOL(iwl_legacy_tx_cmd_complete);
diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c
deleted file mode 100644
index b282d869a546..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
+++ /dev/null
@@ -1,4016 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/pci-aspm.h>
-#include <linux/slab.h>
-#include <linux/dma-mapping.h>
-#include <linux/delay.h>
-#include <linux/sched.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <linux/firmware.h>
-#include <linux/etherdevice.h>
-#include <linux/if_arp.h>
-
-#include <net/ieee80211_radiotap.h>
-#include <net/mac80211.h>
-
-#include <asm/div64.h>
-
-#define DRV_NAME        "iwl3945"
-
-#include "iwl-fh.h"
-#include "iwl-3945-fh.h"
-#include "iwl-commands.h"
-#include "iwl-sta.h"
-#include "iwl-3945.h"
-#include "iwl-core.h"
-#include "iwl-helpers.h"
-#include "iwl-dev.h"
-#include "iwl-spectrum.h"
-
-/*
- * module name, copyright, version, etc.
- */
-
-#define DRV_DESCRIPTION \
-"Intel(R) PRO/Wireless 3945ABG/BG Network Connection driver for Linux"
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-#define VD "d"
-#else
-#define VD
-#endif
-
-/*
- * add "s" to indicate spectrum measurement included.
- * we add it here to be consistent with previous releases in which
- * this was configurable.
- */
-#define DRV_VERSION  IWLWIFI_VERSION VD "s"
-#define DRV_COPYRIGHT   "Copyright(c) 2003-2011 Intel Corporation"
-#define DRV_AUTHOR     "<ilw@linux.intel.com>"
-
-MODULE_DESCRIPTION(DRV_DESCRIPTION);
-MODULE_VERSION(DRV_VERSION);
-MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
-MODULE_LICENSE("GPL");
-
- /* module parameters */
-struct iwl_mod_params iwl3945_mod_params = {
-        .sw_crypto = 1,
-        .restart_fw = 1,
-        .disable_hw_scan = 1,
-        /* the rest are 0 by default */
-};
-
-/**
- * iwl3945_get_antenna_flags - Get antenna flags for RXON command
- * @priv: eeprom and antenna fields are used to determine antenna flags
- *
- * priv->eeprom39  is used to determine if antenna AUX/MAIN are reversed
- * iwl3945_mod_params.antenna specifies the antenna diversity mode:
- *
- * IWL_ANTENNA_DIVERSITY - NIC selects best antenna by itself
- * IWL_ANTENNA_MAIN      - Force MAIN antenna
- * IWL_ANTENNA_AUX       - Force AUX antenna
- */
-__le32 iwl3945_get_antenna_flags(const struct iwl_priv *priv)
-{
-        struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom;
-
-        switch (iwl3945_mod_params.antenna) {
-        case IWL_ANTENNA_DIVERSITY:
-                return 0;
-
-        case IWL_ANTENNA_MAIN:
-                if (eeprom->antenna_switch_type)
-                        return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_B_MSK;
-                return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_A_MSK;
-
-        case IWL_ANTENNA_AUX:
-                if (eeprom->antenna_switch_type)
-                        return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_A_MSK;
-                return RXON_FLG_DIS_DIV_MSK | RXON_FLG_ANT_B_MSK;
-        }
-
-        /* bad antenna selector value */
-        IWL_ERR(priv, "Bad antenna selector value (0x%x)\n",
-                iwl3945_mod_params.antenna);
-
-        return 0;               /* "diversity" is default if error */
-}
-
-static int iwl3945_set_ccmp_dynamic_key_info(struct iwl_priv *priv,
-                                   struct ieee80211_key_conf *keyconf,
-                                   u8 sta_id)
-{
-        unsigned long flags;
-        __le16 key_flags = 0;
-        int ret;
-
-        key_flags |= (STA_KEY_FLG_CCMP | STA_KEY_FLG_MAP_KEY_MSK);
-        key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS);
-
-        if (sta_id == priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id)
-                key_flags |= STA_KEY_MULTICAST_MSK;
-
-        keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
-        keyconf->hw_key_idx = keyconf->keyidx;
-        key_flags &= ~STA_KEY_FLG_INVALID;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        priv->stations[sta_id].keyinfo.cipher = keyconf->cipher;
-        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);
-
-        if ((priv->stations[sta_id].sta.key.key_flags & STA_KEY_FLG_ENCRYPT_MSK)
-                        == STA_KEY_FLG_NO_ENC)
-                priv->stations[sta_id].sta.key.key_offset =
-                                 iwl_legacy_get_free_ucode_key_index(priv);
-        /* else, we are overriding an existing key => no need to allocated room
-        * in uCode. */
-
-        WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET,
-                "no space for a new key");
-
-        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;
-
-        IWL_DEBUG_INFO(priv, "hwcrypto: modify ucode station key info\n");
-
-        ret = iwl_legacy_send_add_sta(priv,
-                                &priv->stations[sta_id].sta, CMD_ASYNC);
-
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        return ret;
-}
-
-static int iwl3945_set_tkip_dynamic_key_info(struct iwl_priv *priv,
-                                  struct ieee80211_key_conf *keyconf,
-                                  u8 sta_id)
-{
-        return -EOPNOTSUPP;
-}
-
-static int iwl3945_set_wep_dynamic_key_info(struct iwl_priv *priv,
-                                  struct ieee80211_key_conf *keyconf,
-                                  u8 sta_id)
-{
-        return -EOPNOTSUPP;
-}
-
-static int iwl3945_clear_sta_key_info(struct iwl_priv *priv, u8 sta_id)
-{
-        unsigned long flags;
-        struct iwl_legacy_addsta_cmd sta_cmd;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        memset(&priv->stations[sta_id].keyinfo, 0, sizeof(struct iwl_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;
-        memcpy(&sta_cmd, &priv->stations[sta_id].sta, sizeof(struct iwl_legacy_addsta_cmd));
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        IWL_DEBUG_INFO(priv, "hwcrypto: clear ucode station key info\n");
-        return iwl_legacy_send_add_sta(priv, &sta_cmd, CMD_SYNC);
-}
-
-static int iwl3945_set_dynamic_key(struct iwl_priv *priv,
-                        struct ieee80211_key_conf *keyconf, u8 sta_id)
-{
-        int ret = 0;
-
-        keyconf->hw_key_idx = HW_KEY_DYNAMIC;
-
-        switch (keyconf->cipher) {
-        case WLAN_CIPHER_SUITE_CCMP:
-                ret = iwl3945_set_ccmp_dynamic_key_info(priv, keyconf, sta_id);
-                break;
-        case WLAN_CIPHER_SUITE_TKIP:
-                ret = iwl3945_set_tkip_dynamic_key_info(priv, keyconf, sta_id);
-                break;
-        case WLAN_CIPHER_SUITE_WEP40:
-        case WLAN_CIPHER_SUITE_WEP104:
-                ret = iwl3945_set_wep_dynamic_key_info(priv, keyconf, sta_id);
-                break;
-        default:
-                IWL_ERR(priv, "Unknown alg: %s alg=%x\n", __func__,
-                        keyconf->cipher);
-                ret = -EINVAL;
-        }
-
-        IWL_DEBUG_WEP(priv, "Set dynamic key: alg=%x len=%d idx=%d sta=%d ret=%d\n",
-                      keyconf->cipher, keyconf->keylen, keyconf->keyidx,
-                      sta_id, ret);
-
-        return ret;
-}
-
-static int iwl3945_remove_static_key(struct iwl_priv *priv)
-{
-        int ret = -EOPNOTSUPP;
-
-        return ret;
-}
-
-static int iwl3945_set_static_key(struct iwl_priv *priv,
-                                struct ieee80211_key_conf *key)
-{
-        if (key->cipher == WLAN_CIPHER_SUITE_WEP40 ||
-            key->cipher == WLAN_CIPHER_SUITE_WEP104)
-                return -EOPNOTSUPP;
-
-        IWL_ERR(priv, "Static key invalid: cipher %x\n", key->cipher);
-        return -EINVAL;
-}
-
-static void iwl3945_clear_free_frames(struct iwl_priv *priv)
-{
-        struct list_head *element;
-
-        IWL_DEBUG_INFO(priv, "%d frames on pre-allocated heap on clear.\n",
-                       priv->frames_count);
-
-        while (!list_empty(&priv->free_frames)) {
-                element = priv->free_frames.next;
-                list_del(element);
-                kfree(list_entry(element, struct iwl3945_frame, list));
-                priv->frames_count--;
-        }
-
-        if (priv->frames_count) {
-                IWL_WARN(priv, "%d frames still in use.  Did we lose one?\n",
-                            priv->frames_count);
-                priv->frames_count = 0;
-        }
-}
-
-static struct iwl3945_frame *iwl3945_get_free_frame(struct iwl_priv *priv)
-{
-        struct iwl3945_frame *frame;
-        struct list_head *element;
-        if (list_empty(&priv->free_frames)) {
-                frame = kzalloc(sizeof(*frame), GFP_KERNEL);
-                if (!frame) {
-                        IWL_ERR(priv, "Could not allocate frame!\n");
-                        return NULL;
-                }
-
-                priv->frames_count++;
-                return frame;
-        }
-
-        element = priv->free_frames.next;
-        list_del(element);
-        return list_entry(element, struct iwl3945_frame, list);
-}
-
-static void iwl3945_free_frame(struct iwl_priv *priv, struct iwl3945_frame *frame)
-{
-        memset(frame, 0, sizeof(*frame));
-        list_add(&frame->list, &priv->free_frames);
-}
-
-unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,
-                                struct ieee80211_hdr *hdr,
-                                int left)
-{
-
-        if (!iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS) || !priv->beacon_skb)
-                return 0;
-
-        if (priv->beacon_skb->len > left)
-                return 0;
-
-        memcpy(hdr, priv->beacon_skb->data, priv->beacon_skb->len);
-
-        return priv->beacon_skb->len;
-}
-
-static int iwl3945_send_beacon_cmd(struct iwl_priv *priv)
-{
-        struct iwl3945_frame *frame;
-        unsigned int frame_size;
-        int rc;
-        u8 rate;
-
-        frame = iwl3945_get_free_frame(priv);
-
-        if (!frame) {
-                IWL_ERR(priv, "Could not obtain free frame buffer for beacon "
-                          "command.\n");
-                return -ENOMEM;
-        }
-
-        rate = iwl_legacy_get_lowest_plcp(priv,
-                                &priv->contexts[IWL_RXON_CTX_BSS]);
-
-        frame_size = iwl3945_hw_get_beacon_cmd(priv, frame, rate);
-
-        rc = iwl_legacy_send_cmd_pdu(priv, REPLY_TX_BEACON, frame_size,
-                              &frame->u.cmd[0]);
-
-        iwl3945_free_frame(priv, frame);
-
-        return rc;
-}
-
-static void iwl3945_unset_hw_params(struct iwl_priv *priv)
-{
-        if (priv->_3945.shared_virt)
-                dma_free_coherent(&priv->pci_dev->dev,
-                                  sizeof(struct iwl3945_shared),
-                                  priv->_3945.shared_virt,
-                                  priv->_3945.shared_phys);
-}
-
-static void iwl3945_build_tx_cmd_hwcrypto(struct iwl_priv *priv,
-                                      struct ieee80211_tx_info *info,
-                                      struct iwl_device_cmd *cmd,
-                                      struct sk_buff *skb_frag,
-                                      int sta_id)
-{
-        struct iwl3945_tx_cmd *tx_cmd = (struct iwl3945_tx_cmd *)cmd->cmd.payload;
-        struct iwl_hw_key *keyinfo = &priv->stations[sta_id].keyinfo;
-
-        tx_cmd->sec_ctl = 0;
-
-        switch (keyinfo->cipher) {
-        case WLAN_CIPHER_SUITE_CCMP:
-                tx_cmd->sec_ctl = TX_CMD_SEC_CCM;
-                memcpy(tx_cmd->key, keyinfo->key, keyinfo->keylen);
-                IWL_DEBUG_TX(priv, "tx_cmd with AES hwcrypto\n");
-                break;
-
-        case WLAN_CIPHER_SUITE_TKIP:
-                break;
-
-        case WLAN_CIPHER_SUITE_WEP104:
-                tx_cmd->sec_ctl |= TX_CMD_SEC_KEY128;
-                /* fall through */
-        case WLAN_CIPHER_SUITE_WEP40:
-                tx_cmd->sec_ctl |= TX_CMD_SEC_WEP |
-                    (info->control.hw_key->hw_key_idx & TX_CMD_SEC_MSK) << TX_CMD_SEC_SHIFT;
-
-                memcpy(&tx_cmd->key[3], keyinfo->key, keyinfo->keylen);
-
-                IWL_DEBUG_TX(priv, "Configuring packet for WEP encryption "
-                             "with key %d\n", info->control.hw_key->hw_key_idx);
-                break;
-
-        default:
-                IWL_ERR(priv, "Unknown encode cipher %x\n", keyinfo->cipher);
-                break;
-        }
-}
-
-/*
- * handle build REPLY_TX command notification.
- */
-static void iwl3945_build_tx_cmd_basic(struct iwl_priv *priv,
-                                  struct iwl_device_cmd *cmd,
-                                  struct ieee80211_tx_info *info,
-                                  struct ieee80211_hdr *hdr, u8 std_id)
-{
-        struct iwl3945_tx_cmd *tx_cmd = (struct iwl3945_tx_cmd *)cmd->cmd.payload;
-        __le32 tx_flags = tx_cmd->tx_flags;
-        __le16 fc = hdr->frame_control;
-
-        tx_cmd->stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
-        if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) {
-                tx_flags |= TX_CMD_FLG_ACK_MSK;
-                if (ieee80211_is_mgmt(fc))
-                        tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
-                if (ieee80211_is_probe_resp(fc) &&
-                    !(le16_to_cpu(hdr->seq_ctrl) & 0xf))
-                        tx_flags |= TX_CMD_FLG_TSF_MSK;
-        } else {
-                tx_flags &= (~TX_CMD_FLG_ACK_MSK);
-                tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
-        }
-
-        tx_cmd->sta_id = std_id;
-        if (ieee80211_has_morefrags(fc))
-                tx_flags |= TX_CMD_FLG_MORE_FRAG_MSK;
-
-        if (ieee80211_is_data_qos(fc)) {
-                u8 *qc = ieee80211_get_qos_ctl(hdr);
-                tx_cmd->tid_tspec = qc[0] & 0xf;
-                tx_flags &= ~TX_CMD_FLG_SEQ_CTL_MSK;
-        } else {
-                tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
-        }
-
-        iwl_legacy_tx_cmd_protection(priv, info, fc, &tx_flags);
-
-        tx_flags &= ~(TX_CMD_FLG_ANT_SEL_MSK);
-        if (ieee80211_is_mgmt(fc)) {
-                if (ieee80211_is_assoc_req(fc) || ieee80211_is_reassoc_req(fc))
-                        tx_cmd->timeout.pm_frame_timeout = cpu_to_le16(3);
-                else
-                        tx_cmd->timeout.pm_frame_timeout = cpu_to_le16(2);
-        } else {
-                tx_cmd->timeout.pm_frame_timeout = 0;
-        }
-
-        tx_cmd->driver_txop = 0;
-        tx_cmd->tx_flags = tx_flags;
-        tx_cmd->next_frame_len = 0;
-}
-
-/*
- * start REPLY_TX command process
- */
-static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
-{
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-        struct iwl3945_tx_cmd *tx_cmd;
-        struct iwl_tx_queue *txq = NULL;
-        struct iwl_queue *q = NULL;
-        struct iwl_device_cmd *out_cmd;
-        struct iwl_cmd_meta *out_meta;
-        dma_addr_t phys_addr;
-        dma_addr_t txcmd_phys;
-        int txq_id = skb_get_queue_mapping(skb);
-        u16 len, idx, hdr_len;
-        u8 id;
-        u8 unicast;
-        u8 sta_id;
-        u8 tid = 0;
-        __le16 fc;
-        u8 wait_write_ptr = 0;
-        unsigned long flags;
-
-        spin_lock_irqsave(&priv->lock, flags);
-        if (iwl_legacy_is_rfkill(priv)) {
-                IWL_DEBUG_DROP(priv, "Dropping - RF KILL\n");
-                goto drop_unlock;
-        }
-
-        if ((ieee80211_get_tx_rate(priv->hw, info)->hw_value & 0xFF) == IWL_INVALID_RATE) {
-                IWL_ERR(priv, "ERROR: No TX rate available.\n");
-                goto drop_unlock;
-        }
-
-        unicast = !is_multicast_ether_addr(hdr->addr1);
-        id = 0;
-
-        fc = hdr->frame_control;
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        if (ieee80211_is_auth(fc))
-                IWL_DEBUG_TX(priv, "Sending AUTH frame\n");
-        else if (ieee80211_is_assoc_req(fc))
-                IWL_DEBUG_TX(priv, "Sending ASSOC frame\n");
-        else if (ieee80211_is_reassoc_req(fc))
-                IWL_DEBUG_TX(priv, "Sending REASSOC frame\n");
-#endif
-
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        hdr_len = ieee80211_hdrlen(fc);
-
-        /* Find index into station table for destination station */
-        sta_id = iwl_legacy_sta_id_or_broadcast(
-                        priv, &priv->contexts[IWL_RXON_CTX_BSS],
-                        info->control.sta);
-        if (sta_id == IWL_INVALID_STATION) {
-                IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",
-                               hdr->addr1);
-                goto drop;
-        }
-
-        IWL_DEBUG_RATE(priv, "station Id %d\n", sta_id);
-
-        if (ieee80211_is_data_qos(fc)) {
-                u8 *qc = ieee80211_get_qos_ctl(hdr);
-                tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK;
-                if (unlikely(tid >= MAX_TID_COUNT))
-                        goto drop;
-        }
-
-        /* Descriptor for chosen Tx queue */
-        txq = &priv->txq[txq_id];
-        q = &txq->q;
-
-        if ((iwl_legacy_queue_space(q) < q->high_mark))
-                goto drop;
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        idx = iwl_legacy_get_cmd_index(q, q->write_ptr, 0);
-
-        /* Set up driver data for this TFD */
-        memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl_tx_info));
-        txq->txb[q->write_ptr].skb = skb;
-        txq->txb[q->write_ptr].ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-        /* Init first empty entry in queue's array of Tx/cmd buffers */
-        out_cmd = txq->cmd[idx];
-        out_meta = &txq->meta[idx];
-        tx_cmd = (struct iwl3945_tx_cmd *)out_cmd->cmd.payload;
-        memset(&out_cmd->hdr, 0, sizeof(out_cmd->hdr));
-        memset(tx_cmd, 0, sizeof(*tx_cmd));
-
-        /*
-         * Set up the Tx-command (not MAC!) header.
-         * Store the chosen Tx queue and TFD index within the sequence field;
-         * after Tx, uCode's Tx response will return this value so driver can
-         * locate the frame within the tx queue and do post-tx processing.
-         */
-        out_cmd->hdr.cmd = REPLY_TX;
-        out_cmd->hdr.sequence = cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) |
-                                INDEX_TO_SEQ(q->write_ptr)));
-
-        /* Copy MAC header from skb into command buffer */
-        memcpy(tx_cmd->hdr, hdr, hdr_len);
-
-
-        if (info->control.hw_key)
-                iwl3945_build_tx_cmd_hwcrypto(priv, info, out_cmd, skb, sta_id);
-
-        /* TODO need this for burst mode later on */
-        iwl3945_build_tx_cmd_basic(priv, out_cmd, info, hdr, sta_id);
-
-        /* set is_hcca to 0; it probably will never be implemented */
-        iwl3945_hw_build_tx_cmd_rate(priv, out_cmd, info, hdr, sta_id, 0);
-
-        /* Total # bytes to be transmitted */
-        len = (u16)skb->len;
-        tx_cmd->len = cpu_to_le16(len);
-
-        iwl_legacy_dbg_log_tx_data_frame(priv, len, hdr);
-        iwl_legacy_update_stats(priv, true, fc, len);
-        tx_cmd->tx_flags &= ~TX_CMD_FLG_ANT_A_MSK;
-        tx_cmd->tx_flags &= ~TX_CMD_FLG_ANT_B_MSK;
-
-        if (!ieee80211_has_morefrags(hdr->frame_control)) {
-                txq->need_update = 1;
-        } else {
-                wait_write_ptr = 1;
-                txq->need_update = 0;
-        }
-
-        IWL_DEBUG_TX(priv, "sequence nr = 0X%x\n",
-                     le16_to_cpu(out_cmd->hdr.sequence));
-        IWL_DEBUG_TX(priv, "tx_flags = 0X%x\n", le32_to_cpu(tx_cmd->tx_flags));
-        iwl_print_hex_dump(priv, IWL_DL_TX, tx_cmd, sizeof(*tx_cmd));
-        iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx_cmd->hdr,
-                           ieee80211_hdrlen(fc));
-
-        /*
-         * Use the first empty entry in this queue's command buffer array
-         * to contain the Tx command and MAC header concatenated together
-         * (payload data will be in another buffer).
-         * Size of this varies, due to varying MAC header length.
-         * If end is not dword aligned, we'll have 2 extra bytes at the end
-         * of the MAC header (device reads on dword boundaries).
-         * We'll tell device about this padding later.
-         */
-        len = sizeof(struct iwl3945_tx_cmd) +
-                        sizeof(struct iwl_cmd_header) + hdr_len;
-        len = (len + 3) & ~3;
-
-        /* Physical address of this Tx command's header (not MAC header!),
-         * within command buffer array. */
-        txcmd_phys = pci_map_single(priv->pci_dev, &out_cmd->hdr,
-                                    len, PCI_DMA_TODEVICE);
-        /* we do not map meta data ... so we can safely access address to
-         * provide to unmap command*/
-        dma_unmap_addr_set(out_meta, mapping, txcmd_phys);
-        dma_unmap_len_set(out_meta, len, len);
-
-        /* Add buffer containing Tx command and MAC(!) header to TFD's
-         * first entry */
-        priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,
-                                                   txcmd_phys, len, 1, 0);
-
-
-        /* Set up TFD's 2nd entry to point directly to remainder of skb,
-         * if any (802.11 null frames have no payload). */
-        len = skb->len - hdr_len;
-        if (len) {
-                phys_addr = pci_map_single(priv->pci_dev, skb->data + hdr_len,
-                                           len, PCI_DMA_TODEVICE);
-                priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,
-                                                           phys_addr, len,
-                                                           0, U32_PAD(len));
-        }
-
-
-        /* Tell device the write index *just past* this latest filled TFD */
-        q->write_ptr = iwl_legacy_queue_inc_wrap(q->write_ptr, q->n_bd);
-        iwl_legacy_txq_update_write_ptr(priv, txq);
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        if ((iwl_legacy_queue_space(q) < q->high_mark)
-            && priv->mac80211_registered) {
-                if (wait_write_ptr) {
-                        spin_lock_irqsave(&priv->lock, flags);
-                        txq->need_update = 1;
-                        iwl_legacy_txq_update_write_ptr(priv, txq);
-                        spin_unlock_irqrestore(&priv->lock, flags);
-                }
-
-                iwl_legacy_stop_queue(priv, txq);
-        }
-
-        return 0;
-
-drop_unlock:
-        spin_unlock_irqrestore(&priv->lock, flags);
-drop:
-        return -1;
-}
-
-static int iwl3945_get_measurement(struct iwl_priv *priv,
-                               struct ieee80211_measurement_params *params,
-                               u8 type)
-{
-        struct iwl_spectrum_cmd spectrum;
-        struct iwl_rx_packet *pkt;
-        struct iwl_host_cmd cmd = {
-                .id = REPLY_SPECTRUM_MEASUREMENT_CMD,
-                .data = (void *)&spectrum,
-                .flags = CMD_WANT_SKB,
-        };
-        u32 add_time = le64_to_cpu(params->start_time);
-        int rc;
-        int spectrum_resp_status;
-        int duration = le16_to_cpu(params->duration);
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-        if (iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS))
-                add_time = iwl_legacy_usecs_to_beacons(priv,
-                        le64_to_cpu(params->start_time) - priv->_3945.last_tsf,
-                        le16_to_cpu(ctx->timing.beacon_interval));
-
-        memset(&spectrum, 0, sizeof(spectrum));
-
-        spectrum.channel_count = cpu_to_le16(1);
-        spectrum.flags =
-            RXON_FLG_TSF2HOST_MSK | RXON_FLG_ANT_A_MSK | RXON_FLG_DIS_DIV_MSK;
-        spectrum.filter_flags = MEASUREMENT_FILTER_FLAG;
-        cmd.len = sizeof(spectrum);
-        spectrum.len = cpu_to_le16(cmd.len - sizeof(spectrum.len));
-
-        if (iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS))
-                spectrum.start_time =
-                        iwl_legacy_add_beacon_time(priv,
-                                priv->_3945.last_beacon_time, add_time,
-                                le16_to_cpu(ctx->timing.beacon_interval));
-        else
-                spectrum.start_time = 0;
-
-        spectrum.channels[0].duration = cpu_to_le32(duration * TIME_UNIT);
-        spectrum.channels[0].channel = params->channel;
-        spectrum.channels[0].type = type;
-        if (ctx->active.flags & RXON_FLG_BAND_24G_MSK)
-                spectrum.flags |= RXON_FLG_BAND_24G_MSK |
-                    RXON_FLG_AUTO_DETECT_MSK | RXON_FLG_TGG_PROTECT_MSK;
-
-        rc = iwl_legacy_send_cmd_sync(priv, &cmd);
-        if (rc)
-                return rc;
-
-        pkt = (struct iwl_rx_packet *)cmd.reply_page;
-        if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) {
-                IWL_ERR(priv, "Bad return from REPLY_RX_ON_ASSOC command\n");
-                rc = -EIO;
-        }
-
-        spectrum_resp_status = le16_to_cpu(pkt->u.spectrum.status);
-        switch (spectrum_resp_status) {
-        case 0:         /* Command will be handled */
-                if (pkt->u.spectrum.id != 0xff) {
-                        IWL_DEBUG_INFO(priv, "Replaced existing measurement: %d\n",
-                                                pkt->u.spectrum.id);
-                        priv->measurement_status &= ~MEASUREMENT_READY;
-                }
-                priv->measurement_status |= MEASUREMENT_ACTIVE;
-                rc = 0;
-                break;
-
-        case 1:         /* Command will not be handled */
-                rc = -EAGAIN;
-                break;
-        }
-
-        iwl_legacy_free_pages(priv, cmd.reply_page);
-
-        return rc;
-}
-
-static void iwl3945_rx_reply_alive(struct iwl_priv *priv,
-                               struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_alive_resp *palive;
-        struct delayed_work *pwork;
-
-        palive = &pkt->u.alive_frame;
-
-        IWL_DEBUG_INFO(priv, "Alive ucode status 0x%08X revision "
-                       "0x%01X 0x%01X\n",
-                       palive->is_valid, palive->ver_type,
-                       palive->ver_subtype);
-
-        if (palive->ver_subtype == INITIALIZE_SUBTYPE) {
-                IWL_DEBUG_INFO(priv, "Initialization Alive received.\n");
-                memcpy(&priv->card_alive_init, &pkt->u.alive_frame,
-                       sizeof(struct iwl_alive_resp));
-                pwork = &priv->init_alive_start;
-        } else {
-                IWL_DEBUG_INFO(priv, "Runtime Alive received.\n");
-                memcpy(&priv->card_alive, &pkt->u.alive_frame,
-                       sizeof(struct iwl_alive_resp));
-                pwork = &priv->alive_start;
-                iwl3945_disable_events(priv);
-        }
-
-        /* We delay the ALIVE response by 5ms to
-         * give the HW RF Kill time to activate... */
-        if (palive->is_valid == UCODE_VALID_OK)
-                queue_delayed_work(priv->workqueue, pwork,
-                                   msecs_to_jiffies(5));
-        else
-                IWL_WARN(priv, "uCode did not respond OK.\n");
-}
-
-static void iwl3945_rx_reply_add_sta(struct iwl_priv *priv,
-                                 struct iwl_rx_mem_buffer *rxb)
-{
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-#endif
-
-        IWL_DEBUG_RX(priv, "Received REPLY_ADD_STA: 0x%02X\n", pkt->u.status);
-}
-
-static void iwl3945_rx_beacon_notif(struct iwl_priv *priv,
-                                struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl3945_beacon_notif *beacon = &(pkt->u.beacon_status);
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        u8 rate = beacon->beacon_notify_hdr.rate;
-
-        IWL_DEBUG_RX(priv, "beacon status %x retries %d iss %d "
-                "tsf %d %d rate %d\n",
-                le32_to_cpu(beacon->beacon_notify_hdr.status) & TX_STATUS_MSK,
-                beacon->beacon_notify_hdr.failure_frame,
-                le32_to_cpu(beacon->ibss_mgr_status),
-                le32_to_cpu(beacon->high_tsf),
-                le32_to_cpu(beacon->low_tsf), rate);
-#endif
-
-        priv->ibss_manager = le32_to_cpu(beacon->ibss_mgr_status);
-
-}
-
-/* Handle notification from uCode that card's power state is changing
- * due to software, hardware, or critical temperature RFKILL */
-static void iwl3945_rx_card_state_notif(struct iwl_priv *priv,
-                                    struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags);
-        unsigned long status = priv->status;
-
-        IWL_WARN(priv, "Card state received: HW:%s SW:%s\n",
-                          (flags & HW_CARD_DISABLED) ? "Kill" : "On",
-                          (flags & SW_CARD_DISABLED) ? "Kill" : "On");
-
-        iwl_write32(priv, CSR_UCODE_DRV_GP1_SET,
-                    CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
-
-        if (flags & HW_CARD_DISABLED)
-                set_bit(STATUS_RF_KILL_HW, &priv->status);
-        else
-                clear_bit(STATUS_RF_KILL_HW, &priv->status);
-
-
-        iwl_legacy_scan_cancel(priv);
-
-        if ((test_bit(STATUS_RF_KILL_HW, &status) !=
-             test_bit(STATUS_RF_KILL_HW, &priv->status)))
-                wiphy_rfkill_set_hw_state(priv->hw->wiphy,
-                                test_bit(STATUS_RF_KILL_HW, &priv->status));
-        else
-                wake_up(&priv->wait_command_queue);
-}
-
-/**
- * iwl3945_setup_rx_handlers - Initialize Rx handler callbacks
- *
- * Setup the RX handlers for each of the reply types sent from the uCode
- * to the host.
- *
- * This function chains into the hardware specific files for them to setup
- * any hardware specific handlers as well.
- */
-static void iwl3945_setup_rx_handlers(struct iwl_priv *priv)
-{
-        priv->rx_handlers[REPLY_ALIVE] = iwl3945_rx_reply_alive;
-        priv->rx_handlers[REPLY_ADD_STA] = iwl3945_rx_reply_add_sta;
-        priv->rx_handlers[REPLY_ERROR] = iwl_legacy_rx_reply_error;
-        priv->rx_handlers[CHANNEL_SWITCH_NOTIFICATION] = iwl_legacy_rx_csa;
-        priv->rx_handlers[SPECTRUM_MEASURE_NOTIFICATION] =
-                        iwl_legacy_rx_spectrum_measure_notif;
-        priv->rx_handlers[PM_SLEEP_NOTIFICATION] = iwl_legacy_rx_pm_sleep_notif;
-        priv->rx_handlers[PM_DEBUG_STATISTIC_NOTIFIC] =
-            iwl_legacy_rx_pm_debug_statistics_notif;
-        priv->rx_handlers[BEACON_NOTIFICATION] = iwl3945_rx_beacon_notif;
-
-        /*
-         * The same handler is used for both the REPLY to a discrete
-         * statistics request from the host as well as for the periodic
-         * statistics notifications (after received beacons) from the uCode.
-         */
-        priv->rx_handlers[REPLY_STATISTICS_CMD] = iwl3945_reply_statistics;
-        priv->rx_handlers[STATISTICS_NOTIFICATION] = iwl3945_hw_rx_statistics;
-
-        iwl_legacy_setup_rx_scan_handlers(priv);
-        priv->rx_handlers[CARD_STATE_NOTIFICATION] = iwl3945_rx_card_state_notif;
-
-        /* Set up hardware specific Rx handlers */
-        iwl3945_hw_rx_handler_setup(priv);
-}
-
-/************************** RX-FUNCTIONS ****************************/
-/*
- * Rx theory of operation
- *
- * The host allocates 32 DMA target addresses and passes the host address
- * to the firmware at register IWL_RFDS_TABLE_LOWER + N * RFD_SIZE where N is
- * 0 to 31
- *
- * Rx Queue Indexes
- * The host/firmware share two index registers for managing the Rx buffers.
- *
- * The READ index maps to the first position that the firmware may be writing
- * to -- the driver can read up to (but not including) this position and get
- * good data.
- * The READ index is managed by the firmware once the card is enabled.
- *
- * The WRITE index maps to the last position the driver has read from -- the
- * position preceding WRITE is the last slot the firmware can place a packet.
- *
- * The queue is empty (no good data) if WRITE = READ - 1, and is full if
- * WRITE = READ.
- *
- * During initialization, the host sets up the READ queue position to the first
- * INDEX position, and WRITE to the last (READ - 1 wrapped)
- *
- * When the firmware places a packet in a buffer, it will advance the READ index
- * and fire the RX interrupt.  The driver can then query the READ index and
- * process as many packets as possible, moving the WRITE index forward as it
- * resets the Rx queue buffers with new memory.
- *
- * The management in the driver is as follows:
- * + A list of pre-allocated SKBs is stored in iwl->rxq->rx_free.  When
- *   iwl->rxq->free_count drops to or below RX_LOW_WATERMARK, work is scheduled
- *   to replenish the iwl->rxq->rx_free.
- * + In iwl3945_rx_replenish (scheduled) if 'processed' != 'read' then the
- *   iwl->rxq is replenished and the READ INDEX is updated (updating the
- *   'processed' and 'read' driver indexes as well)
- * + A received packet is processed and handed to the kernel network stack,
- *   detached from the iwl->rxq.  The driver 'processed' index is updated.
- * + The Host/Firmware iwl->rxq is replenished at tasklet time from the rx_free
- *   list. If there are no allocated buffers in iwl->rxq->rx_free, the READ
- *   INDEX is not incremented and iwl->status(RX_STALLED) is set.  If there
- *   were enough free buffers and RX_STALLED is set it is cleared.
- *
- *
- * Driver sequence:
- *
- * iwl3945_rx_replenish()     Replenishes rx_free list from rx_used, and calls
- *                            iwl3945_rx_queue_restock
- * iwl3945_rx_queue_restock() Moves available buffers from rx_free into Rx
- *                            queue, updates firmware pointers, and updates
- *                            the WRITE index.  If insufficient rx_free buffers
- *                            are available, schedules iwl3945_rx_replenish
- *
- * -- enable interrupts --
- * ISR - iwl3945_rx()         Detach iwl_rx_mem_buffers from pool up to the
- *                            READ INDEX, detaching the SKB from the pool.
- *                            Moves the packet buffer from queue to rx_used.
- *                            Calls iwl3945_rx_queue_restock to refill any empty
- *                            slots.
- * ...
- *
- */
-
-/**
- * iwl3945_dma_addr2rbd_ptr - convert a DMA address to a uCode read buffer ptr
- */
-static inline __le32 iwl3945_dma_addr2rbd_ptr(struct iwl_priv *priv,
-                                          dma_addr_t dma_addr)
-{
-        return cpu_to_le32((u32)dma_addr);
-}
-
-/**
- * iwl3945_rx_queue_restock - refill RX queue from pre-allocated pool
- *
- * If there are slots in the RX queue that need to be restocked,
- * and we have free pre-allocated buffers, fill the ranks as much
- * as we can, pulling from rx_free.
- *
- * This moves the 'write' index forward to catch up with 'processed', and
- * also updates the memory address in the firmware to reference the new
- * target buffer.
- */
-static void iwl3945_rx_queue_restock(struct iwl_priv *priv)
-{
-        struct iwl_rx_queue *rxq = &priv->rxq;
-        struct list_head *element;
-        struct iwl_rx_mem_buffer *rxb;
-        unsigned long flags;
-        int write;
-
-        spin_lock_irqsave(&rxq->lock, flags);
-        write = rxq->write & ~0x7;
-        while ((iwl_legacy_rx_queue_space(rxq) > 0) && (rxq->free_count)) {
-                /* Get next free Rx buffer, remove from free list */
-                element = rxq->rx_free.next;
-                rxb = list_entry(element, struct iwl_rx_mem_buffer, list);
-                list_del(element);
-
-                /* Point to Rx buffer via next RBD in circular buffer */
-                rxq->bd[rxq->write] = iwl3945_dma_addr2rbd_ptr(priv, rxb->page_dma);
-                rxq->queue[rxq->write] = rxb;
-                rxq->write = (rxq->write + 1) & RX_QUEUE_MASK;
-                rxq->free_count--;
-        }
-        spin_unlock_irqrestore(&rxq->lock, flags);
-        /* If the pre-allocated buffer pool is dropping low, schedule to
-         * refill it */
-        if (rxq->free_count <= RX_LOW_WATERMARK)
-                queue_work(priv->workqueue, &priv->rx_replenish);
-
-
-        /* If we've added more space for the firmware to place data, tell it.
-         * Increment device's write pointer in multiples of 8. */
-        if ((rxq->write_actual != (rxq->write & ~0x7))
-            || (abs(rxq->write - rxq->read) > 7)) {
-                spin_lock_irqsave(&rxq->lock, flags);
-                rxq->need_update = 1;
-                spin_unlock_irqrestore(&rxq->lock, flags);
-                iwl_legacy_rx_queue_update_write_ptr(priv, rxq);
-        }
-}
-
-/**
- * iwl3945_rx_replenish - Move all used packet from rx_used to rx_free
- *
- * When moving to rx_free an SKB is allocated for the slot.
- *
- * Also restock the Rx queue via iwl3945_rx_queue_restock.
- * This is called as a scheduled work item (except for during initialization)
- */
-static void iwl3945_rx_allocate(struct iwl_priv *priv, gfp_t priority)
-{
-        struct iwl_rx_queue *rxq = &priv->rxq;
-        struct list_head *element;
-        struct iwl_rx_mem_buffer *rxb;
-        struct page *page;
-        unsigned long flags;
-        gfp_t gfp_mask = priority;
-
-        while (1) {
-                spin_lock_irqsave(&rxq->lock, flags);
-
-                if (list_empty(&rxq->rx_used)) {
-                        spin_unlock_irqrestore(&rxq->lock, flags);
-                        return;
-                }
-                spin_unlock_irqrestore(&rxq->lock, flags);
-
-                if (rxq->free_count > RX_LOW_WATERMARK)
-                        gfp_mask |= __GFP_NOWARN;
-
-                if (priv->hw_params.rx_page_order > 0)
-                        gfp_mask |= __GFP_COMP;
-
-                /* Alloc a new receive buffer */
-                page = alloc_pages(gfp_mask, priv->hw_params.rx_page_order);
-                if (!page) {
-                        if (net_ratelimit())
-                                IWL_DEBUG_INFO(priv, "Failed to allocate SKB buffer.\n");
-                        if ((rxq->free_count <= RX_LOW_WATERMARK) &&
-                            net_ratelimit())
-                                IWL_CRIT(priv, "Failed to allocate SKB buffer with %s. Only %u free buffers remaining.\n",
-                                         priority == GFP_ATOMIC ?  "GFP_ATOMIC" : "GFP_KERNEL",
-                                         rxq->free_count);
-                        /* We don't reschedule replenish work here -- we will
-                         * call the restock method and if it still needs
-                         * more buffers it will schedule replenish */
-                        break;
-                }
-
-                spin_lock_irqsave(&rxq->lock, flags);
-                if (list_empty(&rxq->rx_used)) {
-                        spin_unlock_irqrestore(&rxq->lock, flags);
-                        __free_pages(page, priv->hw_params.rx_page_order);
-                        return;
-                }
-                element = rxq->rx_used.next;
-                rxb = list_entry(element, struct iwl_rx_mem_buffer, list);
-                list_del(element);
-                spin_unlock_irqrestore(&rxq->lock, flags);
-
-                rxb->page = page;
-                /* Get physical address of RB/SKB */
-                rxb->page_dma = pci_map_page(priv->pci_dev, page, 0,
-                                PAGE_SIZE << priv->hw_params.rx_page_order,
-                                PCI_DMA_FROMDEVICE);
-
-                spin_lock_irqsave(&rxq->lock, flags);
-
-                list_add_tail(&rxb->list, &rxq->rx_free);
-                rxq->free_count++;
-                priv->alloc_rxb_page++;
-
-                spin_unlock_irqrestore(&rxq->lock, flags);
-        }
-}
-
-void iwl3945_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
-{
-        unsigned long flags;
-        int i;
-        spin_lock_irqsave(&rxq->lock, flags);
-        INIT_LIST_HEAD(&rxq->rx_free);
-        INIT_LIST_HEAD(&rxq->rx_used);
-        /* Fill the rx_used queue with _all_ of the Rx buffers */
-        for (i = 0; i < RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++) {
-                /* In the reset function, these buffers may have been allocated
-                 * to an SKB, so we need to unmap and free potential storage */
-                if (rxq->pool[i].page != NULL) {
-                        pci_unmap_page(priv->pci_dev, rxq->pool[i].page_dma,
-                                PAGE_SIZE << priv->hw_params.rx_page_order,
-                                PCI_DMA_FROMDEVICE);
-                        __iwl_legacy_free_pages(priv, rxq->pool[i].page);
-                        rxq->pool[i].page = NULL;
-                }
-                list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
-        }
-
-        /* Set us so that we have processed and used all buffers, but have
-         * not restocked the Rx queue with fresh buffers */
-        rxq->read = rxq->write = 0;
-        rxq->write_actual = 0;
-        rxq->free_count = 0;
-        spin_unlock_irqrestore(&rxq->lock, flags);
-}
-
-void iwl3945_rx_replenish(void *data)
-{
-        struct iwl_priv *priv = data;
-        unsigned long flags;
-
-        iwl3945_rx_allocate(priv, GFP_KERNEL);
-
-        spin_lock_irqsave(&priv->lock, flags);
-        iwl3945_rx_queue_restock(priv);
-        spin_unlock_irqrestore(&priv->lock, flags);
-}
-
-static void iwl3945_rx_replenish_now(struct iwl_priv *priv)
-{
-        iwl3945_rx_allocate(priv, GFP_ATOMIC);
-
-        iwl3945_rx_queue_restock(priv);
-}
-
-
-/* Assumes that the skb field of the buffers in 'pool' is kept accurate.
- * If an SKB has been detached, the POOL needs to have its SKB set to NULL
- * This free routine walks the list of POOL entries and if SKB is set to
- * non NULL it is unmapped and freed
- */
-static void iwl3945_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
-{
-        int i;
-        for (i = 0; i < RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {
-                if (rxq->pool[i].page != NULL) {
-                        pci_unmap_page(priv->pci_dev, rxq->pool[i].page_dma,
-                                PAGE_SIZE << priv->hw_params.rx_page_order,
-                                PCI_DMA_FROMDEVICE);
-                        __iwl_legacy_free_pages(priv, rxq->pool[i].page);
-                        rxq->pool[i].page = NULL;
-                }
-        }
-
-        dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,
-                          rxq->bd_dma);
-        dma_free_coherent(&priv->pci_dev->dev, sizeof(struct iwl_rb_status),
-                          rxq->rb_stts, rxq->rb_stts_dma);
-        rxq->bd = NULL;
-        rxq->rb_stts  = NULL;
-}
-
-
-/* Convert linear signal-to-noise ratio into dB */
-static u8 ratio2dB[100] = {
-/*       0   1   2   3   4   5   6   7   8   9 */
-         0,  0,  6, 10, 12, 14, 16, 17, 18, 19, /* 00 - 09 */
-        20, 21, 22, 22, 23, 23, 24, 25, 26, 26, /* 10 - 19 */
-        26, 26, 26, 27, 27, 28, 28, 28, 29, 29, /* 20 - 29 */
-        29, 30, 30, 30, 31, 31, 31, 31, 32, 32, /* 30 - 39 */
-        32, 32, 32, 33, 33, 33, 33, 33, 34, 34, /* 40 - 49 */
-        34, 34, 34, 34, 35, 35, 35, 35, 35, 35, /* 50 - 59 */
-        36, 36, 36, 36, 36, 36, 36, 37, 37, 37, /* 60 - 69 */
-        37, 37, 37, 37, 37, 38, 38, 38, 38, 38, /* 70 - 79 */
-        38, 38, 38, 38, 38, 39, 39, 39, 39, 39, /* 80 - 89 */
-        39, 39, 39, 39, 39, 40, 40, 40, 40, 40  /* 90 - 99 */
-};
-
-/* Calculates a relative dB value from a ratio of linear
- *   (i.e. not dB) signal levels.
- * Conversion assumes that levels are voltages (20*log), not powers (10*log). */
-int iwl3945_calc_db_from_ratio(int sig_ratio)
-{
-        /* 1000:1 or higher just report as 60 dB */
-        if (sig_ratio >= 1000)
-                return 60;
-
-        /* 100:1 or higher, divide by 10 and use table,
-         *   add 20 dB to make up for divide by 10 */
-        if (sig_ratio >= 100)
-                return 20 + (int)ratio2dB[sig_ratio/10];
-
-        /* We shouldn't see this */
-        if (sig_ratio < 1)
-                return 0;
-
-        /* Use table for ratios 1:1 - 99:1 */
-        return (int)ratio2dB[sig_ratio];
-}
-
-/**
- * iwl3945_rx_handle - Main entry function for receiving responses from uCode
- *
- * Uses the priv->rx_handlers callback function array to invoke
- * the appropriate handlers, including command responses,
- * frame-received notifications, and other notifications.
- */
-static void iwl3945_rx_handle(struct iwl_priv *priv)
-{
-        struct iwl_rx_mem_buffer *rxb;
-        struct iwl_rx_packet *pkt;
-        struct iwl_rx_queue *rxq = &priv->rxq;
-        u32 r, i;
-        int reclaim;
-        unsigned long flags;
-        u8 fill_rx = 0;
-        u32 count = 8;
-        int total_empty = 0;
-
-        /* uCode's read index (stored in shared DRAM) indicates the last Rx
-         * buffer that the driver may process (last buffer filled by ucode). */
-        r = le16_to_cpu(rxq->rb_stts->closed_rb_num) &  0x0FFF;
-        i = rxq->read;
-
-        /* calculate total frames need to be restock after handling RX */
-        total_empty = r - rxq->write_actual;
-        if (total_empty < 0)
-                total_empty += RX_QUEUE_SIZE;
-
-        if (total_empty > (RX_QUEUE_SIZE / 2))
-                fill_rx = 1;
-        /* Rx interrupt, but nothing sent from uCode */
-        if (i == r)
-                IWL_DEBUG_RX(priv, "r = %d, i = %d\n", r, i);
-
-        while (i != r) {
-                int len;
-
-                rxb = rxq->queue[i];
-
-                /* If an RXB doesn't have a Rx queue slot associated with it,
-                 * then a bug has been introduced in the queue refilling
-                 * routines -- catch it here */
-                BUG_ON(rxb == NULL);
-
-                rxq->queue[i] = NULL;
-
-                pci_unmap_page(priv->pci_dev, rxb->page_dma,
-                               PAGE_SIZE << priv->hw_params.rx_page_order,
-                               PCI_DMA_FROMDEVICE);
-                pkt = rxb_addr(rxb);
-
-                len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
-                len += sizeof(u32); /* account for status word */
-                trace_iwlwifi_legacy_dev_rx(priv, pkt, len);
-
-                /* Reclaim a command buffer only if this packet is a response
-                 *   to a (driver-originated) command.
-                 * If the packet (e.g. Rx frame) originated from uCode,
-                 *   there is no command buffer to reclaim.
-                 * Ucode should set SEQ_RX_FRAME bit if ucode-originated,
-                 *   but apparently a few don't get set; catch them here. */
-                reclaim = !(pkt->hdr.sequence & SEQ_RX_FRAME) &&
-                        (pkt->hdr.cmd != STATISTICS_NOTIFICATION) &&
-                        (pkt->hdr.cmd != REPLY_TX);
-
-                /* Based on type of command response or notification,
-                 *   handle those that need handling via function in
-                 *   rx_handlers table.  See iwl3945_setup_rx_handlers() */
-                if (priv->rx_handlers[pkt->hdr.cmd]) {
-                        IWL_DEBUG_RX(priv, "r = %d, i = %d, %s, 0x%02x\n", r, i,
-                        iwl_legacy_get_cmd_string(pkt->hdr.cmd), pkt->hdr.cmd);
-                        priv->isr_stats.rx_handlers[pkt->hdr.cmd]++;
-                        priv->rx_handlers[pkt->hdr.cmd] (priv, rxb);
-                } else {
-                        /* No handling needed */
-                        IWL_DEBUG_RX(priv,
-                                "r %d i %d No handler needed for %s, 0x%02x\n",
-                                r, i, iwl_legacy_get_cmd_string(pkt->hdr.cmd),
-                                pkt->hdr.cmd);
-                }
-
-                /*
-                 * XXX: After here, we should always check rxb->page
-                 * against NULL before touching it or its virtual
-                 * memory (pkt). Because some rx_handler might have
-                 * already taken or freed the pages.
-                 */
-
-                if (reclaim) {
-                        /* Invoke any callbacks, transfer the buffer to caller,
-                         * and fire off the (possibly) blocking iwl_legacy_send_cmd()
-                         * as we reclaim the driver command queue */
-                        if (rxb->page)
-                                iwl_legacy_tx_cmd_complete(priv, rxb);
-                        else
-                                IWL_WARN(priv, "Claim null rxb?\n");
-                }
-
-                /* Reuse the page if possible. For notification packets and
-                 * SKBs that fail to Rx correctly, add them back into the
-                 * rx_free list for reuse later. */
-                spin_lock_irqsave(&rxq->lock, flags);
-                if (rxb->page != NULL) {
-                        rxb->page_dma = pci_map_page(priv->pci_dev, rxb->page,
-                                0, PAGE_SIZE << priv->hw_params.rx_page_order,
-                                PCI_DMA_FROMDEVICE);
-                        list_add_tail(&rxb->list, &rxq->rx_free);
-                        rxq->free_count++;
-                } else
-                        list_add_tail(&rxb->list, &rxq->rx_used);
-
-                spin_unlock_irqrestore(&rxq->lock, flags);
-
-                i = (i + 1) & RX_QUEUE_MASK;
-                /* If there are a lot of unused frames,
-                 * restock the Rx queue so ucode won't assert. */
-                if (fill_rx) {
-                        count++;
-                        if (count >= 8) {
-                                rxq->read = i;
-                                iwl3945_rx_replenish_now(priv);
-                                count = 0;
-                        }
-                }
-        }
-
-        /* Backtrack one entry */
-        rxq->read = i;
-        if (fill_rx)
-                iwl3945_rx_replenish_now(priv);
-        else
-                iwl3945_rx_queue_restock(priv);
-}
-
-/* call this function to flush any scheduled tasklet */
-static inline void iwl3945_synchronize_irq(struct iwl_priv *priv)
-{
-        /* wait to make sure we flush pending tasklet*/
-        synchronize_irq(priv->pci_dev->irq);
-        tasklet_kill(&priv->irq_tasklet);
-}
-
-static const char *iwl3945_desc_lookup(int i)
-{
-        switch (i) {
-        case 1:
-                return "FAIL";
-        case 2:
-                return "BAD_PARAM";
-        case 3:
-                return "BAD_CHECKSUM";
-        case 4:
-                return "NMI_INTERRUPT";
-        case 5:
-                return "SYSASSERT";
-        case 6:
-                return "FATAL_ERROR";
-        }
-
-        return "UNKNOWN";
-}
-
-#define ERROR_START_OFFSET  (1 * sizeof(u32))
-#define ERROR_ELEM_SIZE     (7 * sizeof(u32))
-
-void iwl3945_dump_nic_error_log(struct iwl_priv *priv)
-{
-        u32 i;
-        u32 desc, time, count, base, data1;
-        u32 blink1, blink2, ilink1, ilink2;
-
-        base = le32_to_cpu(priv->card_alive.error_event_table_ptr);
-
-        if (!iwl3945_hw_valid_rtc_data_addr(base)) {
-                IWL_ERR(priv, "Not valid error log pointer 0x%08X\n", base);
-                return;
-        }
-
-
-        count = iwl_legacy_read_targ_mem(priv, base);
-
-        if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) {
-                IWL_ERR(priv, "Start IWL Error Log Dump:\n");
-                IWL_ERR(priv, "Status: 0x%08lX, count: %d\n",
-                        priv->status, count);
-        }
-
-        IWL_ERR(priv, "Desc       Time       asrtPC  blink2 "
-                  "ilink1  nmiPC   Line\n");
-        for (i = ERROR_START_OFFSET;
-             i < (count * ERROR_ELEM_SIZE) + ERROR_START_OFFSET;
-             i += ERROR_ELEM_SIZE) {
-                desc = iwl_legacy_read_targ_mem(priv, base + i);
-                time =
-                    iwl_legacy_read_targ_mem(priv, base + i + 1 * sizeof(u32));
-                blink1 =
-                    iwl_legacy_read_targ_mem(priv, base + i + 2 * sizeof(u32));
-                blink2 =
-                    iwl_legacy_read_targ_mem(priv, base + i + 3 * sizeof(u32));
-                ilink1 =
-                    iwl_legacy_read_targ_mem(priv, base + i + 4 * sizeof(u32));
-                ilink2 =
-                    iwl_legacy_read_targ_mem(priv, base + i + 5 * sizeof(u32));
-                data1 =
-                    iwl_legacy_read_targ_mem(priv, base + i + 6 * sizeof(u32));
-
-                IWL_ERR(priv,
-                        "%-13s (0x%X) %010u 0x%05X 0x%05X 0x%05X 0x%05X %u\n\n",
-                        iwl3945_desc_lookup(desc), desc, time, blink1, blink2,
-                        ilink1, ilink2, data1);
-                trace_iwlwifi_legacy_dev_ucode_error(priv, desc, time, data1, 0,
-                                        0, blink1, blink2, ilink1, ilink2);
-        }
-}
-
-static void iwl3945_irq_tasklet(struct iwl_priv *priv)
-{
-        u32 inta, handled = 0;
-        u32 inta_fh;
-        unsigned long flags;
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        u32 inta_mask;
-#endif
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        /* 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 = 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 = iwl_read32(priv, CSR_FH_INT_STATUS);
-        iwl_write32(priv, CSR_FH_INT_STATUS, inta_fh);
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        if (iwl_legacy_get_debug_level(priv) & IWL_DL_ISR) {
-                /* just for debug */
-                inta_mask = iwl_read32(priv, CSR_INT_MASK);
-                IWL_DEBUG_ISR(priv, "inta 0x%08x, enabled 0x%08x, fh 0x%08x\n",
-                              inta, inta_mask, inta_fh);
-        }
-#endif
-
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        /* Since CSR_INT and CSR_FH_INT_STATUS reads and clears are not
-         * 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 & CSR39_FH_INT_RX_MASK)
-                inta |= CSR_INT_BIT_FH_RX;
-        if (inta_fh & CSR39_FH_INT_TX_MASK)
-                inta |= CSR_INT_BIT_FH_TX;
-
-        /* Now service all interrupt bits discovered above. */
-        if (inta & CSR_INT_BIT_HW_ERR) {
-                IWL_ERR(priv, "Hardware error detected.  Restarting.\n");
-
-                /* Tell the device to stop sending interrupts */
-                iwl_legacy_disable_interrupts(priv);
-
-                priv->isr_stats.hw++;
-                iwl_legacy_irq_handle_error(priv);
-
-                handled |= CSR_INT_BIT_HW_ERR;
-
-                return;
-        }
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        if (iwl_legacy_get_debug_level(priv) & (IWL_DL_ISR)) {
-                /* NIC fires this, but we don't use it, redundant with WAKEUP */
-                if (inta & CSR_INT_BIT_SCD) {
-                        IWL_DEBUG_ISR(priv, "Scheduler finished to transmit "
-                                      "the frame/frames.\n");
-                        priv->isr_stats.sch++;
-                }
-
-                /* Alive notification via Rx interrupt will do the real work */
-                if (inta & CSR_INT_BIT_ALIVE) {
-                        IWL_DEBUG_ISR(priv, "Alive interrupt\n");
-                        priv->isr_stats.alive++;
-                }
-        }
-#endif
-        /* Safely ignore these bits for debug checks below */
-        inta &= ~(CSR_INT_BIT_SCD | CSR_INT_BIT_ALIVE);
-
-        /* Error detected by uCode */
-        if (inta & CSR_INT_BIT_SW_ERR) {
-                IWL_ERR(priv, "Microcode SW error detected. "
-                        "Restarting 0x%X.\n", inta);
-                priv->isr_stats.sw++;
-                iwl_legacy_irq_handle_error(priv);
-                handled |= CSR_INT_BIT_SW_ERR;
-        }
-
-        /* uCode wakes up after power-down sleep */
-        if (inta & CSR_INT_BIT_WAKEUP) {
-                IWL_DEBUG_ISR(priv, "Wakeup interrupt\n");
-                iwl_legacy_rx_queue_update_write_ptr(priv, &priv->rxq);
-                iwl_legacy_txq_update_write_ptr(priv, &priv->txq[0]);
-                iwl_legacy_txq_update_write_ptr(priv, &priv->txq[1]);
-                iwl_legacy_txq_update_write_ptr(priv, &priv->txq[2]);
-                iwl_legacy_txq_update_write_ptr(priv, &priv->txq[3]);
-                iwl_legacy_txq_update_write_ptr(priv, &priv->txq[4]);
-                iwl_legacy_txq_update_write_ptr(priv, &priv->txq[5]);
-
-                priv->isr_stats.wakeup++;
-                handled |= CSR_INT_BIT_WAKEUP;
-        }
-
-        /* All uCode command responses, including Tx command responses,
-         * Rx "responses" (frame-received notification), and other
-         * notifications from uCode come through here*/
-        if (inta & (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX)) {
-                iwl3945_rx_handle(priv);
-                priv->isr_stats.rx++;
-                handled |= (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX);
-        }
-
-        if (inta & CSR_INT_BIT_FH_TX) {
-                IWL_DEBUG_ISR(priv, "Tx interrupt\n");
-                priv->isr_stats.tx++;
-
-                iwl_write32(priv, CSR_FH_INT_STATUS, (1 << 6));
-                iwl_legacy_write_direct32(priv, FH39_TCSR_CREDIT
-                                        (FH39_SRVC_CHNL), 0x0);
-                handled |= CSR_INT_BIT_FH_TX;
-        }
-
-        if (inta & ~handled) {
-                IWL_ERR(priv, "Unhandled INTA bits 0x%08x\n", inta & ~handled);
-                priv->isr_stats.unhandled++;
-        }
-
-        if (inta & ~priv->inta_mask) {
-                IWL_WARN(priv, "Disabled INTA bits 0x%08x were pending\n",
-                         inta & ~priv->inta_mask);
-                IWL_WARN(priv, "   with FH_INT = 0x%08x\n", inta_fh);
-        }
-
-        /* Re-enable all interrupts */
-        /* only Re-enable if disabled by irq */
-        if (test_bit(STATUS_INT_ENABLED, &priv->status))
-                iwl_legacy_enable_interrupts(priv);
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        if (iwl_legacy_get_debug_level(priv) & (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(priv, "End inta 0x%08x, enabled 0x%08x, fh 0x%08x, "
-                        "flags 0x%08lx\n", inta, inta_mask, inta_fh, flags);
-        }
-#endif
-}
-
-static int iwl3945_get_channels_for_scan(struct iwl_priv *priv,
-                                         enum ieee80211_band band,
-                                     u8 is_active, u8 n_probes,
-                                     struct iwl3945_scan_channel *scan_ch,
-                                     struct ieee80211_vif *vif)
-{
-        struct ieee80211_channel *chan;
-        const struct ieee80211_supported_band *sband;
-        const struct iwl_channel_info *ch_info;
-        u16 passive_dwell = 0;
-        u16 active_dwell = 0;
-        int added, i;
-
-        sband = iwl_get_hw_mode(priv, band);
-        if (!sband)
-                return 0;
-
-        active_dwell = iwl_legacy_get_active_dwell_time(priv, band, n_probes);
-        passive_dwell = iwl_legacy_get_passive_dwell_time(priv, band, vif);
-
-        if (passive_dwell <= active_dwell)
-                passive_dwell = active_dwell + 1;
-
-        for (i = 0, added = 0; i < priv->scan_request->n_channels; i++) {
-                chan = priv->scan_request->channels[i];
-
-                if (chan->band != band)
-                        continue;
-
-                scan_ch->channel = chan->hw_value;
-
-                ch_info = iwl_legacy_get_channel_info(priv, band,
-                                                        scan_ch->channel);
-                if (!iwl_legacy_is_channel_valid(ch_info)) {
-                        IWL_DEBUG_SCAN(priv,
-                                "Channel %d is INVALID for this band.\n",
-                               scan_ch->channel);
-                        continue;
-                }
-
-                scan_ch->active_dwell = cpu_to_le16(active_dwell);
-                scan_ch->passive_dwell = cpu_to_le16(passive_dwell);
-                /* If passive , set up for auto-switch
-                 *  and use long active_dwell time.
-                 */
-                if (!is_active || iwl_legacy_is_channel_passive(ch_info) ||
-                    (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN)) {
-                        scan_ch->type = 0;      /* passive */
-                        if (IWL_UCODE_API(priv->ucode_ver) == 1)
-                                scan_ch->active_dwell = cpu_to_le16(passive_dwell - 1);
-                } else {
-                        scan_ch->type = 1;      /* active */
-                }
-
-                /* Set direct probe bits. These may be used both for active
-                 * scan channels (probes gets sent right away),
-                 * or for passive channels (probes get se sent only after
-                 * hearing clear Rx packet).*/
-                if (IWL_UCODE_API(priv->ucode_ver) >= 2) {
-                        if (n_probes)
-                                scan_ch->type |= IWL39_SCAN_PROBE_MASK(n_probes);
-                } else {
-                        /* uCode v1 does not allow setting direct probe bits on
-                         * passive channel. */
-                        if ((scan_ch->type & 1) && n_probes)
-                                scan_ch->type |= IWL39_SCAN_PROBE_MASK(n_probes);
-                }
-
-                /* Set txpower levels to defaults */
-                scan_ch->tpc.dsp_atten = 110;
-                /* scan_pwr_info->tpc.dsp_atten; */
-
-                /*scan_pwr_info->tpc.tx_gain; */
-                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));
-                        /* NOTE: if we were doing 6Mb OFDM for scans we'd use
-                         * power level:
-                         * scan_ch->tpc.tx_gain = ((1 << 5) | (2 << 3)) | 3;
-                         */
-                }
-
-                IWL_DEBUG_SCAN(priv, "Scanning %d [%s %d]\n",
-                               scan_ch->channel,
-                               (scan_ch->type & 1) ? "ACTIVE" : "PASSIVE",
-                               (scan_ch->type & 1) ?
-                               active_dwell : passive_dwell);
-
-                scan_ch++;
-                added++;
-        }
-
-        IWL_DEBUG_SCAN(priv, "total channels to scan %d\n", added);
-        return added;
-}
-
-static void iwl3945_init_hw_rates(struct iwl_priv *priv,
-                              struct ieee80211_rate *rates)
-{
-        int i;
-
-        for (i = 0; i < IWL_RATE_COUNT_LEGACY; i++) {
-                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 > IWL39_LAST_OFDM_RATE) || (i < IWL_FIRST_OFDM_RATE)) {
-                        /*
-                         * If CCK != 1M then set short preamble rate flag.
-                         */
-                        rates[i].flags |= (iwl3945_rates[i].plcp == 10) ?
-                                0 : IEEE80211_RATE_SHORT_PREAMBLE;
-                }
-        }
-}
-
-/******************************************************************************
- *
- * uCode download functions
- *
- ******************************************************************************/
-
-static void iwl3945_dealloc_ucode_pci(struct iwl_priv *priv)
-{
-        iwl_legacy_free_fw_desc(priv->pci_dev, &priv->ucode_code);
-        iwl_legacy_free_fw_desc(priv->pci_dev, &priv->ucode_data);
-        iwl_legacy_free_fw_desc(priv->pci_dev, &priv->ucode_data_backup);
-        iwl_legacy_free_fw_desc(priv->pci_dev, &priv->ucode_init);
-        iwl_legacy_free_fw_desc(priv->pci_dev, &priv->ucode_init_data);
-        iwl_legacy_free_fw_desc(priv->pci_dev, &priv->ucode_boot);
-}
-
-/**
- * iwl3945_verify_inst_full - verify runtime uCode image in card vs. host,
- *     looking at all data.
- */
-static int iwl3945_verify_inst_full(struct iwl_priv *priv, __le32 *image, u32 len)
-{
-        u32 val;
-        u32 save_len = len;
-        int rc = 0;
-        u32 errcnt;
-
-        IWL_DEBUG_INFO(priv, "ucode inst image size is %u\n", len);
-
-        iwl_legacy_write_direct32(priv, HBUS_TARG_MEM_RADDR,
-                               IWL39_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 = _iwl_legacy_read_direct32(priv, HBUS_TARG_MEM_RDAT);
-                if (val != le32_to_cpu(*image)) {
-                        IWL_ERR(priv, "uCode INST section is invalid at "
-                                  "offset 0x%x, is 0x%x, s/b 0x%x\n",
-                                  save_len - len, val, le32_to_cpu(*image));
-                        rc = -EIO;
-                        errcnt++;
-                        if (errcnt >= 20)
-                                break;
-                }
-        }
-
-
-        if (!errcnt)
-                IWL_DEBUG_INFO(priv,
-                        "ucode image in INSTRUCTION memory is good\n");
-
-        return rc;
-}
-
-
-/**
- * iwl3945_verify_inst_sparse - verify runtime uCode image in card vs. host,
- *   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 iwl3945_verify_inst_sparse(struct iwl_priv *priv, __le32 *image, u32 len)
-{
-        u32 val;
-        int rc = 0;
-        u32 errcnt = 0;
-        u32 i;
-
-        IWL_DEBUG_INFO(priv, "ucode inst image size is %u\n", len);
-
-        for (i = 0; i < len; i += 100, image += 100/sizeof(u32)) {
-                /* 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 */
-                iwl_legacy_write_direct32(priv, HBUS_TARG_MEM_RADDR,
-                        i + IWL39_RTC_INST_LOWER_BOUND);
-                val = _iwl_legacy_read_direct32(priv, HBUS_TARG_MEM_RDAT);
-                if (val != le32_to_cpu(*image)) {
-#if 0 /* Enable this if you want to see details */
-                        IWL_ERR(priv, "uCode INST section is invalid at "
-                                  "offset 0x%x, is 0x%x, s/b 0x%x\n",
-                                  i, val, *image);
-#endif
-                        rc = -EIO;
-                        errcnt++;
-                        if (errcnt >= 3)
-                                break;
-                }
-        }
-
-        return rc;
-}
-
-
-/**
- * iwl3945_verify_ucode - determine which instruction image is in SRAM,
- *    and verify its contents
- */
-static int iwl3945_verify_ucode(struct iwl_priv *priv)
-{
-        __le32 *image;
-        u32 len;
-        int rc = 0;
-
-        /* Try bootstrap */
-        image = (__le32 *)priv->ucode_boot.v_addr;
-        len = priv->ucode_boot.len;
-        rc = iwl3945_verify_inst_sparse(priv, image, len);
-        if (rc == 0) {
-                IWL_DEBUG_INFO(priv, "Bootstrap uCode is good in inst SRAM\n");
-                return 0;
-        }
-
-        /* Try initialize */
-        image = (__le32 *)priv->ucode_init.v_addr;
-        len = priv->ucode_init.len;
-        rc = iwl3945_verify_inst_sparse(priv, image, len);
-        if (rc == 0) {
-                IWL_DEBUG_INFO(priv, "Initialize uCode is good in inst SRAM\n");
-                return 0;
-        }
-
-        /* Try runtime/protocol */
-        image = (__le32 *)priv->ucode_code.v_addr;
-        len = priv->ucode_code.len;
-        rc = iwl3945_verify_inst_sparse(priv, image, len);
-        if (rc == 0) {
-                IWL_DEBUG_INFO(priv, "Runtime uCode is good in inst SRAM\n");
-                return 0;
-        }
-
-        IWL_ERR(priv, "NO VALID UCODE IMAGE IN INSTRUCTION SRAM!!\n");
-
-        /* Since nothing seems to match, show first several data entries in
-         * instruction SRAM, so maybe visual inspection will give a clue.
-         * Selection of bootstrap image (vs. other images) is arbitrary. */
-        image = (__le32 *)priv->ucode_boot.v_addr;
-        len = priv->ucode_boot.len;
-        rc = iwl3945_verify_inst_full(priv, image, len);
-
-        return rc;
-}
-
-static void iwl3945_nic_start(struct iwl_priv *priv)
-{
-        /* Remove all resets to allow NIC to operate */
-        iwl_write32(priv, CSR_RESET, 0);
-}
-
-#define IWL3945_UCODE_GET(item)                                         \
-static u32 iwl3945_ucode_get_##item(const struct iwl_ucode_header *ucode)\
-{                                                                       \
-        return le32_to_cpu(ucode->v1.item);                             \
-}
-
-static u32 iwl3945_ucode_get_header_size(u32 api_ver)
-{
-        return 24;
-}
-
-static u8 *iwl3945_ucode_get_data(const struct iwl_ucode_header *ucode)
-{
-        return (u8 *) ucode->v1.data;
-}
-
-IWL3945_UCODE_GET(inst_size);
-IWL3945_UCODE_GET(data_size);
-IWL3945_UCODE_GET(init_size);
-IWL3945_UCODE_GET(init_data_size);
-IWL3945_UCODE_GET(boot_size);
-
-/**
- * iwl3945_read_ucode - Read uCode images from disk file.
- *
- * Copy into buffers for card to fetch via bus-mastering
- */
-static int iwl3945_read_ucode(struct iwl_priv *priv)
-{
-        const struct iwl_ucode_header *ucode;
-        int ret = -EINVAL, index;
-        const struct firmware *ucode_raw;
-        /* firmware file name contains uCode/driver compatibility version */
-        const char *name_pre = priv->cfg->fw_name_pre;
-        const unsigned int api_max = priv->cfg->ucode_api_max;
-        const unsigned int api_min = priv->cfg->ucode_api_min;
-        char buf[25];
-        u8 *src;
-        size_t len;
-        u32 api_ver, inst_size, data_size, init_size, init_data_size, boot_size;
-
-        /* Ask kernel firmware_class module to get the boot firmware off disk.
-         * request_firmware() is synchronous, file is in memory on return. */
-        for (index = api_max; index >= api_min; index--) {
-                sprintf(buf, "%s%u%s", name_pre, index, ".ucode");
-                ret = request_firmware(&ucode_raw, buf, &priv->pci_dev->dev);
-                if (ret < 0) {
-                        IWL_ERR(priv, "%s firmware file req failed: %d\n",
-                                  buf, ret);
-                        if (ret == -ENOENT)
-                                continue;
-                        else
-                                goto error;
-                } else {
-                        if (index < api_max)
-                                IWL_ERR(priv, "Loaded firmware %s, "
-                                        "which is deprecated. "
-                                        " Please use API v%u instead.\n",
-                                          buf, api_max);
-                        IWL_DEBUG_INFO(priv, "Got firmware '%s' file "
-                                       "(%zd bytes) from disk\n",
-                                       buf, ucode_raw->size);
-                        break;
-                }
-        }
-
-        if (ret < 0)
-                goto error;
-
-        /* Make sure that we got at least our header! */
-        if (ucode_raw->size <  iwl3945_ucode_get_header_size(1)) {
-                IWL_ERR(priv, "File size way too small!\n");
-                ret = -EINVAL;
-                goto err_release;
-        }
-
-        /* Data from ucode file:  header followed by uCode images */
-        ucode = (struct iwl_ucode_header *)ucode_raw->data;
-
-        priv->ucode_ver = le32_to_cpu(ucode->ver);
-        api_ver = IWL_UCODE_API(priv->ucode_ver);
-        inst_size = iwl3945_ucode_get_inst_size(ucode);
-        data_size = iwl3945_ucode_get_data_size(ucode);
-        init_size = iwl3945_ucode_get_init_size(ucode);
-        init_data_size = iwl3945_ucode_get_init_data_size(ucode);
-        boot_size = iwl3945_ucode_get_boot_size(ucode);
-        src = iwl3945_ucode_get_data(ucode);
-
-        /* api_ver should match the api version forming part of the
-         * firmware filename ... but we don't check for that and only rely
-         * on the API version read from firmware header from here on forward */
-
-        if (api_ver < api_min || api_ver > api_max) {
-                IWL_ERR(priv, "Driver unable to support your firmware API. "
-                          "Driver supports v%u, firmware is v%u.\n",
-                          api_max, api_ver);
-                priv->ucode_ver = 0;
-                ret = -EINVAL;
-                goto err_release;
-        }
-        if (api_ver != api_max)
-                IWL_ERR(priv, "Firmware has old API version. Expected %u, "
-                          "got %u. New firmware can be obtained "
-                          "from http://www.intellinuxwireless.org.\n",
-                          api_max, api_ver);
-
-        IWL_INFO(priv, "loaded firmware version %u.%u.%u.%u\n",
-                IWL_UCODE_MAJOR(priv->ucode_ver),
-                IWL_UCODE_MINOR(priv->ucode_ver),
-                IWL_UCODE_API(priv->ucode_ver),
-                IWL_UCODE_SERIAL(priv->ucode_ver));
-
-        snprintf(priv->hw->wiphy->fw_version,
-                 sizeof(priv->hw->wiphy->fw_version),
-                 "%u.%u.%u.%u",
-                 IWL_UCODE_MAJOR(priv->ucode_ver),
-                 IWL_UCODE_MINOR(priv->ucode_ver),
-                 IWL_UCODE_API(priv->ucode_ver),
-                 IWL_UCODE_SERIAL(priv->ucode_ver));
-
-        IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n",
-                       priv->ucode_ver);
-        IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %u\n",
-                       inst_size);
-        IWL_DEBUG_INFO(priv, "f/w package hdr runtime data size = %u\n",
-                       data_size);
-        IWL_DEBUG_INFO(priv, "f/w package hdr init inst size = %u\n",
-                       init_size);
-        IWL_DEBUG_INFO(priv, "f/w package hdr init data size = %u\n",
-                       init_data_size);
-        IWL_DEBUG_INFO(priv, "f/w package hdr boot inst size = %u\n",
-                       boot_size);
-
-
-        /* Verify size of file vs. image size info in file's header */
-        if (ucode_raw->size != iwl3945_ucode_get_header_size(api_ver) +
-                inst_size + data_size + init_size +
-                init_data_size + boot_size) {
-
-                IWL_DEBUG_INFO(priv,
-                        "uCode file size %zd does not match expected size\n",
-                        ucode_raw->size);
-                ret = -EINVAL;
-                goto err_release;
-        }
-
-        /* Verify that uCode images will fit in card's SRAM */
-        if (inst_size > IWL39_MAX_INST_SIZE) {
-                IWL_DEBUG_INFO(priv, "uCode instr len %d too large to fit in\n",
-                               inst_size);
-                ret = -EINVAL;
-                goto err_release;
-        }
-
-        if (data_size > IWL39_MAX_DATA_SIZE) {
-                IWL_DEBUG_INFO(priv, "uCode data len %d too large to fit in\n",
-                               data_size);
-                ret = -EINVAL;
-                goto err_release;
-        }
-        if (init_size > IWL39_MAX_INST_SIZE) {
-                IWL_DEBUG_INFO(priv,
-                                "uCode init instr len %d too large to fit in\n",
-                                init_size);
-                ret = -EINVAL;
-                goto err_release;
-        }
-        if (init_data_size > IWL39_MAX_DATA_SIZE) {
-                IWL_DEBUG_INFO(priv,
-                                "uCode init data len %d too large to fit in\n",
-                                init_data_size);
-                ret = -EINVAL;
-                goto err_release;
-        }
-        if (boot_size > IWL39_MAX_BSM_SIZE) {
-                IWL_DEBUG_INFO(priv,
-                                "uCode boot instr len %d too large to fit in\n",
-                                boot_size);
-                ret = -EINVAL;
-                goto err_release;
-        }
-
-        /* Allocate ucode buffers for card's bus-master loading ... */
-
-        /* Runtime instructions and 2 copies of data:
-         * 1) unmodified from disk
-         * 2) backup cache for save/restore during power-downs */
-        priv->ucode_code.len = inst_size;
-        iwl_legacy_alloc_fw_desc(priv->pci_dev, &priv->ucode_code);
-
-        priv->ucode_data.len = data_size;
-        iwl_legacy_alloc_fw_desc(priv->pci_dev, &priv->ucode_data);
-
-        priv->ucode_data_backup.len = data_size;
-        iwl_legacy_alloc_fw_desc(priv->pci_dev, &priv->ucode_data_backup);
-
-        if (!priv->ucode_code.v_addr || !priv->ucode_data.v_addr ||
-            !priv->ucode_data_backup.v_addr)
-                goto err_pci_alloc;
-
-        /* Initialization instructions and data */
-        if (init_size && init_data_size) {
-                priv->ucode_init.len = init_size;
-                iwl_legacy_alloc_fw_desc(priv->pci_dev, &priv->ucode_init);
-
-                priv->ucode_init_data.len = init_data_size;
-                iwl_legacy_alloc_fw_desc(priv->pci_dev, &priv->ucode_init_data);
-
-                if (!priv->ucode_init.v_addr || !priv->ucode_init_data.v_addr)
-                        goto err_pci_alloc;
-        }
-
-        /* Bootstrap (instructions only, no data) */
-        if (boot_size) {
-                priv->ucode_boot.len = boot_size;
-                iwl_legacy_alloc_fw_desc(priv->pci_dev, &priv->ucode_boot);
-
-                if (!priv->ucode_boot.v_addr)
-                        goto err_pci_alloc;
-        }
-
-        /* Copy images into buffers for card's bus-master reads ... */
-
-        /* Runtime instructions (first block of data in file) */
-        len = inst_size;
-        IWL_DEBUG_INFO(priv,
-                "Copying (but not loading) uCode instr len %zd\n", len);
-        memcpy(priv->ucode_code.v_addr, src, len);
-        src += len;
-
-        IWL_DEBUG_INFO(priv, "uCode instr buf vaddr = 0x%p, paddr = 0x%08x\n",
-                priv->ucode_code.v_addr, (u32)priv->ucode_code.p_addr);
-
-        /* Runtime data (2nd block)
-         * NOTE:  Copy into backup buffer will be done in iwl3945_up()  */
-        len = data_size;
-        IWL_DEBUG_INFO(priv,
-                "Copying (but not loading) uCode data len %zd\n", len);
-        memcpy(priv->ucode_data.v_addr, src, len);
-        memcpy(priv->ucode_data_backup.v_addr, src, len);
-        src += len;
-
-        /* Initialization instructions (3rd block) */
-        if (init_size) {
-                len = init_size;
-                IWL_DEBUG_INFO(priv,
-                        "Copying (but not loading) init instr len %zd\n", len);
-                memcpy(priv->ucode_init.v_addr, src, len);
-                src += len;
-        }
-
-        /* Initialization data (4th block) */
-        if (init_data_size) {
-                len = init_data_size;
-                IWL_DEBUG_INFO(priv,
-                        "Copying (but not loading) init data len %zd\n", len);
-                memcpy(priv->ucode_init_data.v_addr, src, len);
-                src += len;
-        }
-
-        /* Bootstrap instructions (5th block) */
-        len = boot_size;
-        IWL_DEBUG_INFO(priv,
-                "Copying (but not loading) boot instr len %zd\n", len);
-        memcpy(priv->ucode_boot.v_addr, src, len);
-
-        /* We have our copies now, allow OS release its copies */
-        release_firmware(ucode_raw);
-        return 0;
-
- err_pci_alloc:
-        IWL_ERR(priv, "failed to allocate pci memory\n");
-        ret = -ENOMEM;
-        iwl3945_dealloc_ucode_pci(priv);
-
- err_release:
-        release_firmware(ucode_raw);
-
- error:
-        return ret;
-}
-
-
-/**
- * iwl3945_set_ucode_ptrs - Set uCode address location
- *
- * Tell initialization uCode where to find runtime uCode.
- *
- * BSM registers initially contain pointers to initialization uCode.
- * We need to replace them to load runtime uCode inst and data,
- * and to save runtime data when powering down.
- */
-static int iwl3945_set_ucode_ptrs(struct iwl_priv *priv)
-{
-        dma_addr_t pinst;
-        dma_addr_t pdata;
-
-        /* bits 31:0 for 3945 */
-        pinst = priv->ucode_code.p_addr;
-        pdata = priv->ucode_data_backup.p_addr;
-
-        /* Tell bootstrap uCode where to find image to load */
-        iwl_legacy_write_prph(priv, BSM_DRAM_INST_PTR_REG, pinst);
-        iwl_legacy_write_prph(priv, BSM_DRAM_DATA_PTR_REG, pdata);
-        iwl_legacy_write_prph(priv, BSM_DRAM_DATA_BYTECOUNT_REG,
-                                 priv->ucode_data.len);
-
-        /* Inst byte count must be last to set up, bit 31 signals uCode
-         *   that all new ptr/size info is in place */
-        iwl_legacy_write_prph(priv, BSM_DRAM_INST_BYTECOUNT_REG,
-                                 priv->ucode_code.len | BSM_DRAM_INST_LOAD);
-
-        IWL_DEBUG_INFO(priv, "Runtime uCode pointers are set.\n");
-
-        return 0;
-}
-
-/**
- * iwl3945_init_alive_start - Called after REPLY_ALIVE notification received
- *
- * Called after REPLY_ALIVE notification received from "initialize" uCode.
- *
- * Tell "initialize" uCode to go ahead and load the runtime uCode.
- */
-static void iwl3945_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) {
-                /* We had an error bringing up the hardware, so take it
-                 * all the way back down so we can try again */
-                IWL_DEBUG_INFO(priv, "Initialize Alive failed.\n");
-                goto restart;
-        }
-
-        /* Bootstrap uCode has loaded initialize uCode ... verify inst image.
-         * This is a paranoid check, because we would not have gotten the
-         * "initialize" alive if code weren't properly loaded.  */
-        if (iwl3945_verify_ucode(priv)) {
-                /* Runtime instruction load was bad;
-                 * take it all the way back down so we can try again */
-                IWL_DEBUG_INFO(priv, "Bad \"initialize\" uCode load.\n");
-                goto restart;
-        }
-
-        /* Send pointers to protocol/runtime uCode image ... init code will
-         * load and launch runtime uCode, which will send us another "Alive"
-         * notification. */
-        IWL_DEBUG_INFO(priv, "Initialization Alive received.\n");
-        if (iwl3945_set_ucode_ptrs(priv)) {
-                /* Runtime instruction load won't happen;
-                 * take it all the way back down so we can try again */
-                IWL_DEBUG_INFO(priv, "Couldn't set up uCode pointers.\n");
-                goto restart;
-        }
-        return;
-
- restart:
-        queue_work(priv->workqueue, &priv->restart);
-}
-
-/**
- * iwl3945_alive_start - called after REPLY_ALIVE notification received
- *                   from protocol/runtime uCode (initialization uCode's
- *                   Alive gets handled by iwl3945_init_alive_start()).
- */
-static void iwl3945_alive_start(struct iwl_priv *priv)
-{
-        int thermal_spin = 0;
-        u32 rfkill;
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-        IWL_DEBUG_INFO(priv, "Runtime Alive received.\n");
-
-        if (priv->card_alive.is_valid != UCODE_VALID_OK) {
-                /* We had an error bringing up the hardware, so take it
-                 * all the way back down so we can try again */
-                IWL_DEBUG_INFO(priv, "Alive failed.\n");
-                goto restart;
-        }
-
-        /* Initialize uCode has loaded Runtime uCode ... verify inst image.
-         * This is a paranoid check, because we would not have gotten the
-         * "runtime" alive if code weren't properly loaded.  */
-        if (iwl3945_verify_ucode(priv)) {
-                /* Runtime instruction load was bad;
-                 * take it all the way back down so we can try again */
-                IWL_DEBUG_INFO(priv, "Bad runtime uCode load.\n");
-                goto restart;
-        }
-
-        rfkill = iwl_legacy_read_prph(priv, APMG_RFKILL_REG);
-        IWL_DEBUG_INFO(priv, "RFKILL status: 0x%x\n", rfkill);
-
-        if (rfkill & 0x1) {
-                clear_bit(STATUS_RF_KILL_HW, &priv->status);
-                /* if RFKILL is not on, then wait for thermal
-                 * sensor in adapter to kick in */
-                while (iwl3945_hw_get_temperature(priv) == 0) {
-                        thermal_spin++;
-                        udelay(10);
-                }
-
-                if (thermal_spin)
-                        IWL_DEBUG_INFO(priv, "Thermal calibration took %dus\n",
-                                       thermal_spin * 10);
-        } else
-                set_bit(STATUS_RF_KILL_HW, &priv->status);
-
-        /* After the ALIVE response, we can send commands to 3945 uCode */
-        set_bit(STATUS_ALIVE, &priv->status);
-
-        /* Enable watchdog to monitor the driver tx queues */
-        iwl_legacy_setup_watchdog(priv);
-
-        if (iwl_legacy_is_rfkill(priv))
-                return;
-
-        ieee80211_wake_queues(priv->hw);
-
-        priv->active_rate = IWL_RATES_MASK_3945;
-
-        iwl_legacy_power_update_mode(priv, true);
-
-        if (iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS)) {
-                struct iwl3945_rxon_cmd *active_rxon =
-                                (struct iwl3945_rxon_cmd *)(&ctx->active);
-
-                ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
-                active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
-        } else {
-                /* Initialize our rx_config data */
-                iwl_legacy_connection_init_rx_config(priv, ctx);
-        }
-
-        /* Configure Bluetooth device coexistence support */
-        iwl_legacy_send_bt_config(priv);
-
-        set_bit(STATUS_READY, &priv->status);
-
-        /* Configure the adapter for unassociated operation */
-        iwl3945_commit_rxon(priv, ctx);
-
-        iwl3945_reg_txpower_periodic(priv);
-
-        IWL_DEBUG_INFO(priv, "ALIVE processing complete.\n");
-        wake_up(&priv->wait_command_queue);
-
-        return;
-
- restart:
-        queue_work(priv->workqueue, &priv->restart);
-}
-
-static void iwl3945_cancel_deferred_work(struct iwl_priv *priv);
-
-static void __iwl3945_down(struct iwl_priv *priv)
-{
-        unsigned long flags;
-        int exit_pending;
-
-        IWL_DEBUG_INFO(priv, DRV_NAME " is going down\n");
-
-        iwl_legacy_scan_cancel_timeout(priv, 200);
-
-        exit_pending = test_and_set_bit(STATUS_EXIT_PENDING, &priv->status);
-
-        /* Stop TX queues watchdog. We need to have STATUS_EXIT_PENDING bit set
-         * to prevent rearm timer */
-        del_timer_sync(&priv->watchdog);
-
-        /* Station information will now be cleared in device */
-        iwl_legacy_clear_ucode_stations(priv, NULL);
-        iwl_legacy_dealloc_bcast_stations(priv);
-        iwl_legacy_clear_driver_stations(priv);
-
-        /* Unblock any waiting calls */
-        wake_up_all(&priv->wait_command_queue);
-
-        /* Wipe out the EXIT_PENDING status bit if we are not actually
-         * exiting the module */
-        if (!exit_pending)
-                clear_bit(STATUS_EXIT_PENDING, &priv->status);
-
-        /* stop and reset the on-board processor */
-        iwl_write32(priv, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
-
-        /* tell the device to stop sending interrupts */
-        spin_lock_irqsave(&priv->lock, flags);
-        iwl_legacy_disable_interrupts(priv);
-        spin_unlock_irqrestore(&priv->lock, flags);
-        iwl3945_synchronize_irq(priv);
-
-        if (priv->mac80211_registered)
-                ieee80211_stop_queues(priv->hw);
-
-        /* If we have not previously called iwl3945_init() then
-         * clear all bits but the RF Kill bits and return */
-        if (!iwl_legacy_is_init(priv)) {
-                priv->status = test_bit(STATUS_RF_KILL_HW, &priv->status) <<
-                                        STATUS_RF_KILL_HW |
-                               test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<
-                                        STATUS_GEO_CONFIGURED |
-                                test_bit(STATUS_EXIT_PENDING, &priv->status) <<
-                                        STATUS_EXIT_PENDING;
-                goto exit;
-        }
-
-        /* ...otherwise clear out all the status bits but the RF Kill
-         * bit and continue taking the NIC down. */
-        priv->status &= test_bit(STATUS_RF_KILL_HW, &priv->status) <<
-                                STATUS_RF_KILL_HW |
-                        test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<
-                                STATUS_GEO_CONFIGURED |
-                        test_bit(STATUS_FW_ERROR, &priv->status) <<
-                                STATUS_FW_ERROR |
-                        test_bit(STATUS_EXIT_PENDING, &priv->status) <<
-                                STATUS_EXIT_PENDING;
-
-        iwl3945_hw_txq_ctx_stop(priv);
-        iwl3945_hw_rxq_stop(priv);
-
-        /* Power-down device's busmaster DMA clocks */
-        iwl_legacy_write_prph(priv, APMG_CLK_DIS_REG, APMG_CLK_VAL_DMA_CLK_RQT);
-        udelay(5);
-
-        /* Stop the device, and put it in low power state */
-        iwl_legacy_apm_stop(priv);
-
- exit:
-        memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp));
-
-        if (priv->beacon_skb)
-                dev_kfree_skb(priv->beacon_skb);
-        priv->beacon_skb = NULL;
-
-        /* clear out any free frames */
-        iwl3945_clear_free_frames(priv);
-}
-
-static void iwl3945_down(struct iwl_priv *priv)
-{
-        mutex_lock(&priv->mutex);
-        __iwl3945_down(priv);
-        mutex_unlock(&priv->mutex);
-
-        iwl3945_cancel_deferred_work(priv);
-}
-
-#define MAX_HW_RESTARTS 5
-
-static int iwl3945_alloc_bcast_station(struct iwl_priv *priv)
-{
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        unsigned long flags;
-        u8 sta_id;
-
-        spin_lock_irqsave(&priv->sta_lock, flags);
-        sta_id = iwl_legacy_prep_station(priv, ctx,
-                                        iwlegacy_bcast_addr, false, NULL);
-        if (sta_id == IWL_INVALID_STATION) {
-                IWL_ERR(priv, "Unable to prepare broadcast station\n");
-                spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-                return -EINVAL;
-        }
-
-        priv->stations[sta_id].used |= IWL_STA_DRIVER_ACTIVE;
-        priv->stations[sta_id].used |= IWL_STA_BCAST;
-        spin_unlock_irqrestore(&priv->sta_lock, flags);
-
-        return 0;
-}
-
-static int __iwl3945_up(struct iwl_priv *priv)
-{
-        int rc, i;
-
-        rc = iwl3945_alloc_bcast_station(priv);
-        if (rc)
-                return rc;
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
-                IWL_WARN(priv, "Exit pending; will not bring the NIC up\n");
-                return -EIO;
-        }
-
-        if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) {
-                IWL_ERR(priv, "ucode not available for device bring up\n");
-                return -EIO;
-        }
-
-        /* If platform's RF_KILL switch is NOT set to KILL */
-        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);
-                IWL_WARN(priv, "Radio disabled by HW RF Kill switch\n");
-                return -ENODEV;
-        }
-
-        iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
-
-        rc = iwl3945_hw_nic_init(priv);
-        if (rc) {
-                IWL_ERR(priv, "Unable to int nic\n");
-                return rc;
-        }
-
-        /* make sure rfkill handshake bits are cleared */
-        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 */
-        iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
-        iwl_legacy_enable_interrupts(priv);
-
-        /* really make sure rfkill handshake bits are cleared */
-        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
-         * data SRAM for a clean start when the runtime program first loads. */
-        memcpy(priv->ucode_data_backup.v_addr, priv->ucode_data.v_addr,
-               priv->ucode_data.len);
-
-        /* We return success when we resume from suspend and rf_kill is on. */
-        if (test_bit(STATUS_RF_KILL_HW, &priv->status))
-                return 0;
-
-        for (i = 0; i < MAX_HW_RESTARTS; i++) {
-
-                /* load bootstrap state machine,
-                 * load bootstrap program into processor's memory,
-                 * prepare to load the "initialize" uCode */
-                rc = priv->cfg->ops->lib->load_ucode(priv);
-
-                if (rc) {
-                        IWL_ERR(priv,
-                                "Unable to set up bootstrap uCode: %d\n", rc);
-                        continue;
-                }
-
-                /* start card; "initialize" will load runtime ucode */
-                iwl3945_nic_start(priv);
-
-                IWL_DEBUG_INFO(priv, DRV_NAME " is coming up\n");
-
-                return 0;
-        }
-
-        set_bit(STATUS_EXIT_PENDING, &priv->status);
-        __iwl3945_down(priv);
-        clear_bit(STATUS_EXIT_PENDING, &priv->status);
-
-        /* tried to restart and config the device for as long as our
-         * patience could withstand */
-        IWL_ERR(priv, "Unable to initialize device after %d attempts.\n", i);
-        return -EIO;
-}
-
-
-/*****************************************************************************
- *
- * Workqueue callbacks
- *
- *****************************************************************************/
-
-static void iwl3945_bg_init_alive_start(struct work_struct *data)
-{
-        struct iwl_priv *priv =
-            container_of(data, struct iwl_priv, init_alive_start.work);
-
-        mutex_lock(&priv->mutex);
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                goto out;
-
-        iwl3945_init_alive_start(priv);
-out:
-        mutex_unlock(&priv->mutex);
-}
-
-static void iwl3945_bg_alive_start(struct work_struct *data)
-{
-        struct iwl_priv *priv =
-            container_of(data, struct iwl_priv, alive_start.work);
-
-        mutex_lock(&priv->mutex);
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                goto out;
-
-        iwl3945_alive_start(priv);
-out:
-        mutex_unlock(&priv->mutex);
-}
-
-/*
- * 3945 cannot interrupt driver when hardware rf kill switch toggles;
- * driver must poll CSR_GP_CNTRL_REG register for change.  This register
- * *is* readable even when device has been SW_RESET into low power mode
- * (e.g. during RF KILL).
- */
-static void iwl3945_rfkill_poll(struct work_struct *data)
-{
-        struct iwl_priv *priv =
-            container_of(data, struct iwl_priv, _3945.rfkill_poll.work);
-        bool old_rfkill = test_bit(STATUS_RF_KILL_HW, &priv->status);
-        bool new_rfkill = !(iwl_read32(priv, CSR_GP_CNTRL)
-                        & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW);
-
-        if (new_rfkill != old_rfkill) {
-                if (new_rfkill)
-                        set_bit(STATUS_RF_KILL_HW, &priv->status);
-                else
-                        clear_bit(STATUS_RF_KILL_HW, &priv->status);
-
-                wiphy_rfkill_set_hw_state(priv->hw->wiphy, new_rfkill);
-
-                IWL_DEBUG_RF_KILL(priv, "RF_KILL bit toggled to %s.\n",
-                                new_rfkill ? "disable radio" : "enable radio");
-        }
-
-        /* Keep this running, even if radio now enabled.  This will be
-         * cancelled in mac_start() if system decides to start again */
-        queue_delayed_work(priv->workqueue, &priv->_3945.rfkill_poll,
-                           round_jiffies_relative(2 * HZ));
-
-}
-
-int iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
-{
-        struct iwl_host_cmd cmd = {
-                .id = REPLY_SCAN_CMD,
-                .len = sizeof(struct iwl3945_scan_cmd),
-                .flags = CMD_SIZE_HUGE,
-        };
-        struct iwl3945_scan_cmd *scan;
-        u8 n_probes = 0;
-        enum ieee80211_band band;
-        bool is_active = false;
-        int ret;
-        u16 len;
-
-        lockdep_assert_held(&priv->mutex);
-
-        if (!priv->scan_cmd) {
-                priv->scan_cmd = kmalloc(sizeof(struct iwl3945_scan_cmd) +
-                                         IWL_MAX_SCAN_SIZE, GFP_KERNEL);
-                if (!priv->scan_cmd) {
-                        IWL_DEBUG_SCAN(priv, "Fail to allocate scan memory\n");
-                        return -ENOMEM;
-                }
-        }
-        scan = priv->scan_cmd;
-        memset(scan, 0, sizeof(struct iwl3945_scan_cmd) + IWL_MAX_SCAN_SIZE);
-
-        scan->quiet_plcp_th = IWL_PLCP_QUIET_THRESH;
-        scan->quiet_time = IWL_ACTIVE_QUIET_TIME;
-
-        if (iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS)) {
-                u16 interval;
-                u32 extra;
-                u32 suspend_time = 100;
-                u32 scan_suspend_time = 100;
-
-                IWL_DEBUG_INFO(priv, "Scanning while associated...\n");
-
-                interval = vif->bss_conf.beacon_int;
-
-                scan->suspend_time = 0;
-                scan->max_out_time = cpu_to_le32(200 * 1024);
-                if (!interval)
-                        interval = suspend_time;
-                /*
-                 * suspend time format:
-                 *  0-19: beacon interval in usec (time before exec.)
-                 * 20-23: 0
-                 * 24-31: number of beacons (suspend between channels)
-                 */
-
-                extra = (suspend_time / interval) << 24;
-                scan_suspend_time = 0xFF0FFFFF &
-                    (extra | ((suspend_time % interval) * 1024));
-
-                scan->suspend_time = cpu_to_le32(scan_suspend_time);
-                IWL_DEBUG_SCAN(priv, "suspend_time 0x%X beacon interval %d\n",
-                               scan_suspend_time, interval);
-        }
-
-        if (priv->scan_request->n_ssids) {
-                int i, p = 0;
-                IWL_DEBUG_SCAN(priv, "Kicking off active scan\n");
-                for (i = 0; i < priv->scan_request->n_ssids; i++) {
-                        /* always does wildcard anyway */
-                        if (!priv->scan_request->ssids[i].ssid_len)
-                                continue;
-                        scan->direct_scan[p].id = WLAN_EID_SSID;
-                        scan->direct_scan[p].len =
-                                priv->scan_request->ssids[i].ssid_len;
-                        memcpy(scan->direct_scan[p].ssid,
-                               priv->scan_request->ssids[i].ssid,
-                               priv->scan_request->ssids[i].ssid_len);
-                        n_probes++;
-                        p++;
-                }
-                is_active = true;
-        } else
-                IWL_DEBUG_SCAN(priv, "Kicking off passive scan.\n");
-
-        /* 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.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK;
-        scan->tx_cmd.sta_id = priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id;
-        scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
-
-        /* flags + rate selection */
-
-        switch (priv->scan_band) {
-        case IEEE80211_BAND_2GHZ:
-                scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK;
-                scan->tx_cmd.rate = IWL_RATE_1M_PLCP;
-                band = IEEE80211_BAND_2GHZ;
-                break;
-        case IEEE80211_BAND_5GHZ:
-                scan->tx_cmd.rate = IWL_RATE_6M_PLCP;
-                band = IEEE80211_BAND_5GHZ;
-                break;
-        default:
-                IWL_WARN(priv, "Invalid scan band\n");
-                return -EIO;
-        }
-
-        /*
-         * If active scaning is requested but a certain channel
-         * is marked passive, we can do active scanning if we
-         * detect transmissions.
-         */
-        scan->good_CRC_th = is_active ? IWL_GOOD_CRC_TH_DEFAULT :
-                                        IWL_GOOD_CRC_TH_DISABLED;
-
-        len = iwl_legacy_fill_probe_req(priv, (struct ieee80211_mgmt *)scan->data,
-                                        vif->addr, priv->scan_request->ie,
-                                        priv->scan_request->ie_len,
-                                        IWL_MAX_SCAN_SIZE - sizeof(*scan));
-        scan->tx_cmd.len = cpu_to_le16(len);
-
-        /* select Rx antennas */
-        scan->flags |= iwl3945_get_antenna_flags(priv);
-
-        scan->channel_count = iwl3945_get_channels_for_scan(priv, band, is_active, n_probes,
-                                                            (void *)&scan->data[len], vif);
-        if (scan->channel_count == 0) {
-                IWL_DEBUG_SCAN(priv, "channel count %d\n", scan->channel_count);
-                return -EIO;
-        }
-
-        cmd.len += le16_to_cpu(scan->tx_cmd.len) +
-            scan->channel_count * sizeof(struct iwl3945_scan_channel);
-        cmd.data = scan;
-        scan->len = cpu_to_le16(cmd.len);
-
-        set_bit(STATUS_SCAN_HW, &priv->status);
-        ret = iwl_legacy_send_cmd_sync(priv, &cmd);
-        if (ret)
-                clear_bit(STATUS_SCAN_HW, &priv->status);
-        return ret;
-}
-
-void iwl3945_post_scan(struct iwl_priv *priv)
-{
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-        /*
-         * Since setting the RXON may have been deferred while
-         * performing the scan, fire one off if needed
-         */
-        if (memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging)))
-                iwl3945_commit_rxon(priv, ctx);
-}
-
-static void iwl3945_bg_restart(struct work_struct *data)
-{
-        struct iwl_priv *priv = container_of(data, struct iwl_priv, restart);
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
-
-        if (test_and_clear_bit(STATUS_FW_ERROR, &priv->status)) {
-                struct iwl_rxon_context *ctx;
-                mutex_lock(&priv->mutex);
-                for_each_context(priv, ctx)
-                        ctx->vif = NULL;
-                priv->is_open = 0;
-                mutex_unlock(&priv->mutex);
-                iwl3945_down(priv);
-                ieee80211_restart_hw(priv->hw);
-        } else {
-                iwl3945_down(priv);
-
-                mutex_lock(&priv->mutex);
-                if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
-                        mutex_unlock(&priv->mutex);
-                        return;
-                }
-
-                __iwl3945_up(priv);
-                mutex_unlock(&priv->mutex);
-        }
-}
-
-static void iwl3945_bg_rx_replenish(struct work_struct *data)
-{
-        struct iwl_priv *priv =
-            container_of(data, struct iwl_priv, rx_replenish);
-
-        mutex_lock(&priv->mutex);
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                goto out;
-
-        iwl3945_rx_replenish(priv);
-out:
-        mutex_unlock(&priv->mutex);
-}
-
-void iwl3945_post_associate(struct iwl_priv *priv)
-{
-        int rc = 0;
-        struct ieee80211_conf *conf = NULL;
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-        if (!ctx->vif || !priv->is_open)
-                return;
-
-        IWL_DEBUG_ASSOC(priv, "Associated as %d to: %pM\n",
-                        ctx->vif->bss_conf.aid, ctx->active.bssid_addr);
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
-
-        iwl_legacy_scan_cancel_timeout(priv, 200);
-
-        conf = iwl_legacy_ieee80211_get_hw_conf(priv->hw);
-
-        ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
-        iwl3945_commit_rxon(priv, ctx);
-
-        rc = iwl_legacy_send_rxon_timing(priv, ctx);
-        if (rc)
-                IWL_WARN(priv, "REPLY_RXON_TIMING failed - "
-                            "Attempting to continue.\n");
-
-        ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
-
-        ctx->staging.assoc_id = cpu_to_le16(ctx->vif->bss_conf.aid);
-
-        IWL_DEBUG_ASSOC(priv, "assoc id %d beacon interval %d\n",
-                        ctx->vif->bss_conf.aid, ctx->vif->bss_conf.beacon_int);
-
-        if (ctx->vif->bss_conf.use_short_preamble)
-                ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
-        else
-                ctx->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
-
-        if (ctx->staging.flags & RXON_FLG_BAND_24G_MSK) {
-                if (ctx->vif->bss_conf.use_short_slot)
-                        ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
-                else
-                        ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;
-        }
-
-        iwl3945_commit_rxon(priv, ctx);
-
-        switch (ctx->vif->type) {
-        case NL80211_IFTYPE_STATION:
-                iwl3945_rate_scale_init(priv->hw, IWL_AP_ID);
-                break;
-        case NL80211_IFTYPE_ADHOC:
-                iwl3945_send_beacon_cmd(priv);
-                break;
-        default:
-                IWL_ERR(priv, "%s Should not be called in %d mode\n",
-                        __func__, ctx->vif->type);
-                break;
-        }
-}
-
-/*****************************************************************************
- *
- * mac80211 entry point functions
- *
- *****************************************************************************/
-
-#define UCODE_READY_TIMEOUT     (2 * HZ)
-
-static int iwl3945_mac_start(struct ieee80211_hw *hw)
-{
-        struct iwl_priv *priv = hw->priv;
-        int ret;
-
-        IWL_DEBUG_MAC80211(priv, "enter\n");
-
-        /* we should be verifying the device is ready to be opened */
-        mutex_lock(&priv->mutex);
-
-        /* fetch ucode file from disk, alloc and copy to bus-master buffers ...
-         * ucode filename and max sizes are card-specific. */
-
-        if (!priv->ucode_code.len) {
-                ret = iwl3945_read_ucode(priv);
-                if (ret) {
-                        IWL_ERR(priv, "Could not read microcode: %d\n", ret);
-                        mutex_unlock(&priv->mutex);
-                        goto out_release_irq;
-                }
-        }
-
-        ret = __iwl3945_up(priv);
-
-        mutex_unlock(&priv->mutex);
-
-        if (ret)
-                goto out_release_irq;
-
-        IWL_DEBUG_INFO(priv, "Start UP work.\n");
-
-        /* Wait for START_ALIVE from ucode. Otherwise callbacks from
-         * mac80211 will not be run successfully. */
-        ret = wait_event_timeout(priv->wait_command_queue,
-                        test_bit(STATUS_READY, &priv->status),
-                        UCODE_READY_TIMEOUT);
-        if (!ret) {
-                if (!test_bit(STATUS_READY, &priv->status)) {
-                        IWL_ERR(priv,
-                                "Wait for START_ALIVE timeout after %dms.\n",
-                                jiffies_to_msecs(UCODE_READY_TIMEOUT));
-                        ret = -ETIMEDOUT;
-                        goto out_release_irq;
-                }
-        }
-
-        /* ucode is running and will send rfkill notifications,
-         * no need to poll the killswitch state anymore */
-        cancel_delayed_work(&priv->_3945.rfkill_poll);
-
-        priv->is_open = 1;
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-        return 0;
-
-out_release_irq:
-        priv->is_open = 0;
-        IWL_DEBUG_MAC80211(priv, "leave - failed\n");
-        return ret;
-}
-
-static void iwl3945_mac_stop(struct ieee80211_hw *hw)
-{
-        struct iwl_priv *priv = hw->priv;
-
-        IWL_DEBUG_MAC80211(priv, "enter\n");
-
-        if (!priv->is_open) {
-                IWL_DEBUG_MAC80211(priv, "leave - skip\n");
-                return;
-        }
-
-        priv->is_open = 0;
-
-        iwl3945_down(priv);
-
-        flush_workqueue(priv->workqueue);
-
-        /* start polling the killswitch state again */
-        queue_delayed_work(priv->workqueue, &priv->_3945.rfkill_poll,
-                           round_jiffies_relative(2 * HZ));
-
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-}
-
-static void iwl3945_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
-{
-        struct iwl_priv *priv = hw->priv;
-
-        IWL_DEBUG_MAC80211(priv, "enter\n");
-
-        IWL_DEBUG_TX(priv, "dev->xmit(%d bytes) at rate 0x%02x\n", skb->len,
-                     ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate);
-
-        if (iwl3945_tx_skb(priv, skb))
-                dev_kfree_skb_any(skb);
-
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-}
-
-void iwl3945_config_ap(struct iwl_priv *priv)
-{
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        struct ieee80211_vif *vif = ctx->vif;
-        int rc = 0;
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
-
-        /* The following should be done only at AP bring up */
-        if (!(iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS))) {
-
-                /* RXON - unassoc (to set timing command) */
-                ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
-                iwl3945_commit_rxon(priv, ctx);
-
-                /* RXON Timing */
-                rc = iwl_legacy_send_rxon_timing(priv, ctx);
-                if (rc)
-                        IWL_WARN(priv, "REPLY_RXON_TIMING failed - "
-                                        "Attempting to continue.\n");
-
-                ctx->staging.assoc_id = 0;
-
-                if (vif->bss_conf.use_short_preamble)
-                        ctx->staging.flags |=
-                                RXON_FLG_SHORT_PREAMBLE_MSK;
-                else
-                        ctx->staging.flags &=
-                                ~RXON_FLG_SHORT_PREAMBLE_MSK;
-
-                if (ctx->staging.flags & RXON_FLG_BAND_24G_MSK) {
-                        if (vif->bss_conf.use_short_slot)
-                                ctx->staging.flags |=
-                                        RXON_FLG_SHORT_SLOT_MSK;
-                        else
-                                ctx->staging.flags &=
-                                        ~RXON_FLG_SHORT_SLOT_MSK;
-                }
-                /* restore RXON assoc */
-                ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
-                iwl3945_commit_rxon(priv, ctx);
-        }
-        iwl3945_send_beacon_cmd(priv);
-}
-
-static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
-                               struct ieee80211_vif *vif,
-                               struct ieee80211_sta *sta,
-                               struct ieee80211_key_conf *key)
-{
-        struct iwl_priv *priv = hw->priv;
-        int ret = 0;
-        u8 sta_id = IWL_INVALID_STATION;
-        u8 static_key;
-
-        IWL_DEBUG_MAC80211(priv, "enter\n");
-
-        if (iwl3945_mod_params.sw_crypto) {
-                IWL_DEBUG_MAC80211(priv, "leave - hwcrypto disabled\n");
-                return -EOPNOTSUPP;
-        }
-
-        /*
-         * To support IBSS RSN, don't program group keys in IBSS, the
-         * hardware will then not attempt to decrypt the frames.
-         */
-        if (vif->type == NL80211_IFTYPE_ADHOC &&
-            !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))
-                return -EOPNOTSUPP;
-
-        static_key = !iwl_legacy_is_associated(priv, IWL_RXON_CTX_BSS);
-
-        if (!static_key) {
-                sta_id = iwl_legacy_sta_id_or_broadcast(
-                                priv, &priv->contexts[IWL_RXON_CTX_BSS], sta);
-                if (sta_id == IWL_INVALID_STATION)
-                        return -EINVAL;
-        }
-
-        mutex_lock(&priv->mutex);
-        iwl_legacy_scan_cancel_timeout(priv, 100);
-
-        switch (cmd) {
-        case SET_KEY:
-                if (static_key)
-                        ret = iwl3945_set_static_key(priv, key);
-                else
-                        ret = iwl3945_set_dynamic_key(priv, key, sta_id);
-                IWL_DEBUG_MAC80211(priv, "enable hwcrypto key\n");
-                break;
-        case DISABLE_KEY:
-                if (static_key)
-                        ret = iwl3945_remove_static_key(priv);
-                else
-                        ret = iwl3945_clear_sta_key_info(priv, sta_id);
-                IWL_DEBUG_MAC80211(priv, "disable hwcrypto key\n");
-                break;
-        default:
-                ret = -EINVAL;
-        }
-
-        mutex_unlock(&priv->mutex);
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-
-        return ret;
-}
-
-static int iwl3945_mac_sta_add(struct ieee80211_hw *hw,
-                               struct ieee80211_vif *vif,
-                               struct ieee80211_sta *sta)
-{
-        struct iwl_priv *priv = hw->priv;
-        struct iwl3945_sta_priv *sta_priv = (void *)sta->drv_priv;
-        int ret;
-        bool is_ap = vif->type == NL80211_IFTYPE_STATION;
-        u8 sta_id;
-
-        IWL_DEBUG_INFO(priv, "received request to add station %pM\n",
-                        sta->addr);
-        mutex_lock(&priv->mutex);
-        IWL_DEBUG_INFO(priv, "proceeding to add station %pM\n",
-                        sta->addr);
-        sta_priv->common.sta_id = IWL_INVALID_STATION;
-
-
-        ret = iwl_legacy_add_station_common(priv,
-                                &priv->contexts[IWL_RXON_CTX_BSS],
-                                     sta->addr, is_ap, sta, &sta_id);
-        if (ret) {
-                IWL_ERR(priv, "Unable to add station %pM (%d)\n",
-                        sta->addr, ret);
-                /* Should we return success if return code is EEXIST ? */
-                mutex_unlock(&priv->mutex);
-                return ret;
-        }
-
-        sta_priv->common.sta_id = sta_id;
-
-        /* Initialize rate scaling */
-        IWL_DEBUG_INFO(priv, "Initializing rate scaling for station %pM\n",
-                       sta->addr);
-        iwl3945_rs_rate_init(priv, sta, sta_id);
-        mutex_unlock(&priv->mutex);
-
-        return 0;
-}
-
-static void iwl3945_configure_filter(struct ieee80211_hw *hw,
-                                     unsigned int changed_flags,
-                                     unsigned int *total_flags,
-                                     u64 multicast)
-{
-        struct iwl_priv *priv = hw->priv;
-        __le32 filter_or = 0, filter_nand = 0;
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-#define CHK(test, flag) do { \
-        if (*total_flags & (test))              \
-                filter_or |= (flag);            \
-        else                                    \
-                filter_nand |= (flag);          \
-        } while (0)
-
-        IWL_DEBUG_MAC80211(priv, "Enter: changed: 0x%x, total: 0x%x\n",
-                        changed_flags, *total_flags);
-
-        CHK(FIF_OTHER_BSS | FIF_PROMISC_IN_BSS, RXON_FILTER_PROMISC_MSK);
-        CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK);
-        CHK(FIF_BCN_PRBRESP_PROMISC, RXON_FILTER_BCON_AWARE_MSK);
-
-#undef CHK
-
-        mutex_lock(&priv->mutex);
-
-        ctx->staging.filter_flags &= ~filter_nand;
-        ctx->staging.filter_flags |= filter_or;
-
-        /*
-         * Not committing directly because hardware can perform a scan,
-         * but even if hw is ready, committing here breaks for some reason,
-         * we'll eventually commit the filter flags change anyway.
-         */
-
-        mutex_unlock(&priv->mutex);
-
-        /*
-         * Receiving all multicast frames is always enabled by the
-         * default flags setup in iwl_legacy_connection_init_rx_config()
-         * since we currently do not support programming multicast
-         * filters into the device.
-         */
-        *total_flags &= FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |
-                        FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
-}
-
-
-/*****************************************************************************
- *
- * sysfs attributes
- *
- *****************************************************************************/
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-
-/*
- * The following adds a new attribute to the sysfs representation
- * of this device driver (i.e. a new file in /sys/bus/pci/drivers/iwl/)
- * used for controlling the debug level.
- *
- * See the level definitions in iwl for details.
- *
- * The debug_level being managed using sysfs below is a per device debug
- * level that is used instead of the global debug level if it (the per
- * device debug level) is set.
- */
-static ssize_t iwl3945_show_debug_level(struct device *d,
-                                struct device_attribute *attr, char *buf)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-        return sprintf(buf, "0x%08X\n", iwl_legacy_get_debug_level(priv));
-}
-static ssize_t iwl3945_store_debug_level(struct device *d,
-                                struct device_attribute *attr,
-                                 const char *buf, size_t count)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-        unsigned long val;
-        int ret;
-
-        ret = strict_strtoul(buf, 0, &val);
-        if (ret)
-                IWL_INFO(priv, "%s is not in hex or decimal form.\n", buf);
-        else {
-                priv->debug_level = val;
-                if (iwl_legacy_alloc_traffic_mem(priv))
-                        IWL_ERR(priv,
-                                "Not enough memory to generate traffic log\n");
-        }
-        return strnlen(buf, count);
-}
-
-static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO,
-                        iwl3945_show_debug_level, iwl3945_store_debug_level);
-
-#endif /* CONFIG_IWLWIFI_LEGACY_DEBUG */
-
-static ssize_t iwl3945_show_temperature(struct device *d,
-                                struct device_attribute *attr, char *buf)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-
-        if (!iwl_legacy_is_alive(priv))
-                return -EAGAIN;
-
-        return sprintf(buf, "%d\n", iwl3945_hw_get_temperature(priv));
-}
-
-static DEVICE_ATTR(temperature, S_IRUGO, iwl3945_show_temperature, NULL);
-
-static ssize_t iwl3945_show_tx_power(struct device *d,
-                             struct device_attribute *attr, char *buf)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-        return sprintf(buf, "%d\n", priv->tx_power_user_lmt);
-}
-
-static ssize_t iwl3945_store_tx_power(struct device *d,
-                              struct device_attribute *attr,
-                              const char *buf, size_t count)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-        char *p = (char *)buf;
-        u32 val;
-
-        val = simple_strtoul(p, &p, 10);
-        if (p == buf)
-                IWL_INFO(priv, ": %s is not in decimal form.\n", buf);
-        else
-                iwl3945_hw_reg_set_txpower(priv, val);
-
-        return count;
-}
-
-static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO, iwl3945_show_tx_power, iwl3945_store_tx_power);
-
-static ssize_t iwl3945_show_flags(struct device *d,
-                          struct device_attribute *attr, char *buf)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-        return sprintf(buf, "0x%04X\n", ctx->active.flags);
-}
-
-static ssize_t iwl3945_store_flags(struct device *d,
-                           struct device_attribute *attr,
-                           const char *buf, size_t count)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-        u32 flags = simple_strtoul(buf, NULL, 0);
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-        mutex_lock(&priv->mutex);
-        if (le32_to_cpu(ctx->staging.flags) != flags) {
-                /* Cancel any currently running scans... */
-                if (iwl_legacy_scan_cancel_timeout(priv, 100))
-                        IWL_WARN(priv, "Could not cancel scan.\n");
-                else {
-                        IWL_DEBUG_INFO(priv, "Committing rxon.flags = 0x%04X\n",
-                                       flags);
-                        ctx->staging.flags = cpu_to_le32(flags);
-                        iwl3945_commit_rxon(priv, ctx);
-                }
-        }
-        mutex_unlock(&priv->mutex);
-
-        return count;
-}
-
-static DEVICE_ATTR(flags, S_IWUSR | S_IRUGO, iwl3945_show_flags, iwl3945_store_flags);
-
-static ssize_t iwl3945_show_filter_flags(struct device *d,
-                                 struct device_attribute *attr, char *buf)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-        return sprintf(buf, "0x%04X\n",
-                le32_to_cpu(ctx->active.filter_flags));
-}
-
-static ssize_t iwl3945_store_filter_flags(struct device *d,
-                                  struct device_attribute *attr,
-                                  const char *buf, size_t count)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        u32 filter_flags = simple_strtoul(buf, NULL, 0);
-
-        mutex_lock(&priv->mutex);
-        if (le32_to_cpu(ctx->staging.filter_flags) != filter_flags) {
-                /* Cancel any currently running scans... */
-                if (iwl_legacy_scan_cancel_timeout(priv, 100))
-                        IWL_WARN(priv, "Could not cancel scan.\n");
-                else {
-                        IWL_DEBUG_INFO(priv, "Committing rxon.filter_flags = "
-                                       "0x%04X\n", filter_flags);
-                        ctx->staging.filter_flags =
-                                cpu_to_le32(filter_flags);
-                        iwl3945_commit_rxon(priv, ctx);
-                }
-        }
-        mutex_unlock(&priv->mutex);
-
-        return count;
-}
-
-static DEVICE_ATTR(filter_flags, S_IWUSR | S_IRUGO, iwl3945_show_filter_flags,
-                   iwl3945_store_filter_flags);
-
-static ssize_t iwl3945_show_measurement(struct device *d,
-                                struct device_attribute *attr, char *buf)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-        struct iwl_spectrum_notification measure_report;
-        u32 size = sizeof(measure_report), len = 0, ofs = 0;
-        u8 *data = (u8 *)&measure_report;
-        unsigned long flags;
-
-        spin_lock_irqsave(&priv->lock, flags);
-        if (!(priv->measurement_status & MEASUREMENT_READY)) {
-                spin_unlock_irqrestore(&priv->lock, flags);
-                return 0;
-        }
-        memcpy(&measure_report, &priv->measure_report, size);
-        priv->measurement_status = 0;
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        while (size && (PAGE_SIZE - len)) {
-                hex_dump_to_buffer(data + ofs, size, 16, 1, buf + len,
-                                   PAGE_SIZE - len, 1);
-                len = strlen(buf);
-                if (PAGE_SIZE - len)
-                        buf[len++] = '\n';
-
-                ofs += 16;
-                size -= min(size, 16U);
-        }
-
-        return len;
-}
-
-static ssize_t iwl3945_store_measurement(struct device *d,
-                                 struct device_attribute *attr,
-                                 const char *buf, size_t count)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        struct ieee80211_measurement_params params = {
-                .channel = le16_to_cpu(ctx->active.channel),
-                .start_time = cpu_to_le64(priv->_3945.last_tsf),
-                .duration = cpu_to_le16(1),
-        };
-        u8 type = IWL_MEASURE_BASIC;
-        u8 buffer[32];
-        u8 channel;
-
-        if (count) {
-                char *p = buffer;
-                strncpy(buffer, buf, min(sizeof(buffer), count));
-                channel = simple_strtoul(p, NULL, 0);
-                if (channel)
-                        params.channel = channel;
-
-                p = buffer;
-                while (*p && *p != ' ')
-                        p++;
-                if (*p)
-                        type = simple_strtoul(p + 1, NULL, 0);
-        }
-
-        IWL_DEBUG_INFO(priv, "Invoking measurement of type %d on "
-                       "channel %d (for '%s')\n", type, params.channel, buf);
-        iwl3945_get_measurement(priv, &params, type);
-
-        return count;
-}
-
-static DEVICE_ATTR(measurement, S_IRUSR | S_IWUSR,
-                   iwl3945_show_measurement, iwl3945_store_measurement);
-
-static ssize_t iwl3945_store_retry_rate(struct device *d,
-                                struct device_attribute *attr,
-                                const char *buf, size_t count)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-
-        priv->retry_rate = simple_strtoul(buf, NULL, 0);
-        if (priv->retry_rate <= 0)
-                priv->retry_rate = 1;
-
-        return count;
-}
-
-static ssize_t iwl3945_show_retry_rate(struct device *d,
-                               struct device_attribute *attr, char *buf)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-        return sprintf(buf, "%d", priv->retry_rate);
-}
-
-static DEVICE_ATTR(retry_rate, S_IWUSR | S_IRUSR, iwl3945_show_retry_rate,
-                   iwl3945_store_retry_rate);
-
-
-static ssize_t iwl3945_show_channels(struct device *d,
-                             struct device_attribute *attr, char *buf)
-{
-        /* all this shit doesn't belong into sysfs anyway */
-        return 0;
-}
-
-static DEVICE_ATTR(channels, S_IRUSR, iwl3945_show_channels, NULL);
-
-static ssize_t iwl3945_show_antenna(struct device *d,
-                            struct device_attribute *attr, char *buf)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-
-        if (!iwl_legacy_is_alive(priv))
-                return -EAGAIN;
-
-        return sprintf(buf, "%d\n", iwl3945_mod_params.antenna);
-}
-
-static ssize_t iwl3945_store_antenna(struct device *d,
-                             struct device_attribute *attr,
-                             const char *buf, size_t count)
-{
-        struct iwl_priv *priv __maybe_unused = dev_get_drvdata(d);
-        int ant;
-
-        if (count == 0)
-                return 0;
-
-        if (sscanf(buf, "%1i", &ant) != 1) {
-                IWL_DEBUG_INFO(priv, "not in hex or decimal form.\n");
-                return count;
-        }
-
-        if ((ant >= 0) && (ant <= 2)) {
-                IWL_DEBUG_INFO(priv, "Setting antenna select to %d.\n", ant);
-                iwl3945_mod_params.antenna = (enum iwl3945_antenna)ant;
-        } else
-                IWL_DEBUG_INFO(priv, "Bad antenna select value %d.\n", ant);
-
-
-        return count;
-}
-
-static DEVICE_ATTR(antenna, S_IWUSR | S_IRUGO, iwl3945_show_antenna, iwl3945_store_antenna);
-
-static ssize_t iwl3945_show_status(struct device *d,
-                           struct device_attribute *attr, char *buf)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-        if (!iwl_legacy_is_alive(priv))
-                return -EAGAIN;
-        return sprintf(buf, "0x%08x\n", (int)priv->status);
-}
-
-static DEVICE_ATTR(status, S_IRUGO, iwl3945_show_status, NULL);
-
-static ssize_t iwl3945_dump_error_log(struct device *d,
-                              struct device_attribute *attr,
-                              const char *buf, size_t count)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-        char *p = (char *)buf;
-
-        if (p[0] == '1')
-                iwl3945_dump_nic_error_log(priv);
-
-        return strnlen(buf, count);
-}
-
-static DEVICE_ATTR(dump_errors, S_IWUSR, NULL, iwl3945_dump_error_log);
-
-/*****************************************************************************
- *
- * driver setup and tear down
- *
- *****************************************************************************/
-
-static void iwl3945_setup_deferred_work(struct iwl_priv *priv)
-{
-        priv->workqueue = create_singlethread_workqueue(DRV_NAME);
-
-        init_waitqueue_head(&priv->wait_command_queue);
-
-        INIT_WORK(&priv->restart, iwl3945_bg_restart);
-        INIT_WORK(&priv->rx_replenish, iwl3945_bg_rx_replenish);
-        INIT_DELAYED_WORK(&priv->init_alive_start, iwl3945_bg_init_alive_start);
-        INIT_DELAYED_WORK(&priv->alive_start, iwl3945_bg_alive_start);
-        INIT_DELAYED_WORK(&priv->_3945.rfkill_poll, iwl3945_rfkill_poll);
-
-        iwl_legacy_setup_scan_deferred_work(priv);
-
-        iwl3945_hw_setup_deferred_work(priv);
-
-        init_timer(&priv->watchdog);
-        priv->watchdog.data = (unsigned long)priv;
-        priv->watchdog.function = iwl_legacy_bg_watchdog;
-
-        tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long))
-                     iwl3945_irq_tasklet, (unsigned long)priv);
-}
-
-static void iwl3945_cancel_deferred_work(struct iwl_priv *priv)
-{
-        iwl3945_hw_cancel_deferred_work(priv);
-
-        cancel_delayed_work_sync(&priv->init_alive_start);
-        cancel_delayed_work(&priv->alive_start);
-
-        iwl_legacy_cancel_scan_deferred_work(priv);
-}
-
-static struct attribute *iwl3945_sysfs_entries[] = {
-        &dev_attr_antenna.attr,
-        &dev_attr_channels.attr,
-        &dev_attr_dump_errors.attr,
-        &dev_attr_flags.attr,
-        &dev_attr_filter_flags.attr,
-        &dev_attr_measurement.attr,
-        &dev_attr_retry_rate.attr,
-        &dev_attr_status.attr,
-        &dev_attr_temperature.attr,
-        &dev_attr_tx_power.attr,
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        &dev_attr_debug_level.attr,
-#endif
-        NULL
-};
-
-static struct attribute_group iwl3945_attribute_group = {
-        .name = NULL,           /* put in device directory */
-        .attrs = iwl3945_sysfs_entries,
-};
-
-struct ieee80211_ops iwl3945_hw_ops = {
-        .tx = iwl3945_mac_tx,
-        .start = iwl3945_mac_start,
-        .stop = iwl3945_mac_stop,
-        .add_interface = iwl_legacy_mac_add_interface,
-        .remove_interface = iwl_legacy_mac_remove_interface,
-        .change_interface = iwl_legacy_mac_change_interface,
-        .config = iwl_legacy_mac_config,
-        .configure_filter = iwl3945_configure_filter,
-        .set_key = iwl3945_mac_set_key,
-        .conf_tx = iwl_legacy_mac_conf_tx,
-        .reset_tsf = iwl_legacy_mac_reset_tsf,
-        .bss_info_changed = iwl_legacy_mac_bss_info_changed,
-        .hw_scan = iwl_legacy_mac_hw_scan,
-        .sta_add = iwl3945_mac_sta_add,
-        .sta_remove = iwl_legacy_mac_sta_remove,
-        .tx_last_beacon = iwl_legacy_mac_tx_last_beacon,
-};
-
-static int iwl3945_init_drv(struct iwl_priv *priv)
-{
-        int ret;
-        struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom;
-
-        priv->retry_rate = 1;
-        priv->beacon_skb = NULL;
-
-        spin_lock_init(&priv->sta_lock);
-        spin_lock_init(&priv->hcmd_lock);
-
-        INIT_LIST_HEAD(&priv->free_frames);
-
-        mutex_init(&priv->mutex);
-
-        priv->ieee_channels = NULL;
-        priv->ieee_rates = NULL;
-        priv->band = IEEE80211_BAND_2GHZ;
-
-        priv->iw_mode = NL80211_IFTYPE_STATION;
-        priv->missed_beacon_threshold = IWL_MISSED_BEACON_THRESHOLD_DEF;
-
-        /* initialize force reset */
-        priv->force_reset.reset_duration = IWL_DELAY_NEXT_FORCE_FW_RELOAD;
-
-        if (eeprom->version < EEPROM_3945_EEPROM_VERSION) {
-                IWL_WARN(priv, "Unsupported EEPROM version: 0x%04X\n",
-                         eeprom->version);
-                ret = -EINVAL;
-                goto err;
-        }
-        ret = iwl_legacy_init_channel_map(priv);
-        if (ret) {
-                IWL_ERR(priv, "initializing regulatory failed: %d\n", ret);
-                goto err;
-        }
-
-        /* Set up txpower settings in driver for all channels */
-        if (iwl3945_txpower_set_from_eeprom(priv)) {
-                ret = -EIO;
-                goto err_free_channel_map;
-        }
-
-        ret = iwl_legacy_init_geos(priv);
-        if (ret) {
-                IWL_ERR(priv, "initializing geos failed: %d\n", ret);
-                goto err_free_channel_map;
-        }
-        iwl3945_init_hw_rates(priv, priv->ieee_rates);
-
-        return 0;
-
-err_free_channel_map:
-        iwl_legacy_free_channel_map(priv);
-err:
-        return ret;
-}
-
-#define IWL3945_MAX_PROBE_REQUEST       200
-
-static int iwl3945_setup_mac(struct iwl_priv *priv)
-{
-        int ret;
-        struct ieee80211_hw *hw = priv->hw;
-
-        hw->rate_control_algorithm = "iwl-3945-rs";
-        hw->sta_data_size = sizeof(struct iwl3945_sta_priv);
-        hw->vif_data_size = sizeof(struct iwl_vif_priv);
-
-        /* Tell mac80211 our characteristics */
-        hw->flags = IEEE80211_HW_SIGNAL_DBM |
-                    IEEE80211_HW_SPECTRUM_MGMT;
-
-        hw->wiphy->interface_modes =
-                priv->contexts[IWL_RXON_CTX_BSS].interface_modes;
-
-        hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
-                            WIPHY_FLAG_DISABLE_BEACON_HINTS |
-                            WIPHY_FLAG_IBSS_RSN;
-
-        hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX_3945;
-        /* we create the 802.11 header and a zero-length SSID element */
-        hw->wiphy->max_scan_ie_len = IWL3945_MAX_PROBE_REQUEST - 24 - 2;
-
-        /* Default value; 4 EDCA QOS priorities */
-        hw->queues = 4;
-
-        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];
-
-        iwl_legacy_leds_init(priv);
-
-        ret = ieee80211_register_hw(priv->hw);
-        if (ret) {
-                IWL_ERR(priv, "Failed to register hw (error %d)\n", ret);
-                return ret;
-        }
-        priv->mac80211_registered = 1;
-
-        return 0;
-}
-
-static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-        int err = 0, i;
-        struct iwl_priv *priv;
-        struct ieee80211_hw *hw;
-        struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
-        struct iwl3945_eeprom *eeprom;
-        unsigned long flags;
-
-        /***********************
-         * 1. Allocating HW data
-         * ********************/
-
-        /* mac80211 allocates memory for this device instance, including
-         *   space for this driver's private structure */
-        hw = iwl_legacy_alloc_all(cfg);
-        if (hw == NULL) {
-                pr_err("Can not allocate network device\n");
-                err = -ENOMEM;
-                goto out;
-        }
-        priv = hw->priv;
-        SET_IEEE80211_DEV(hw, &pdev->dev);
-
-        priv->cmd_queue = IWL39_CMD_QUEUE_NUM;
-
-        /* 3945 has only one valid context */
-        priv->valid_contexts = BIT(IWL_RXON_CTX_BSS);
-
-        for (i = 0; i < NUM_IWL_RXON_CTX; i++)
-                priv->contexts[i].ctxid = i;
-
-        priv->contexts[IWL_RXON_CTX_BSS].rxon_cmd = REPLY_RXON;
-        priv->contexts[IWL_RXON_CTX_BSS].rxon_timing_cmd = REPLY_RXON_TIMING;
-        priv->contexts[IWL_RXON_CTX_BSS].rxon_assoc_cmd = REPLY_RXON_ASSOC;
-        priv->contexts[IWL_RXON_CTX_BSS].qos_cmd = REPLY_QOS_PARAM;
-        priv->contexts[IWL_RXON_CTX_BSS].ap_sta_id = IWL_AP_ID;
-        priv->contexts[IWL_RXON_CTX_BSS].wep_key_cmd = REPLY_WEPKEY;
-        priv->contexts[IWL_RXON_CTX_BSS].interface_modes =
-                BIT(NL80211_IFTYPE_STATION) |
-                BIT(NL80211_IFTYPE_ADHOC);
-        priv->contexts[IWL_RXON_CTX_BSS].ibss_devtype = RXON_DEV_TYPE_IBSS;
-        priv->contexts[IWL_RXON_CTX_BSS].station_devtype = RXON_DEV_TYPE_ESS;
-        priv->contexts[IWL_RXON_CTX_BSS].unused_devtype = RXON_DEV_TYPE_ESS;
-
-        /*
-         * Disabling hardware scan means that mac80211 will perform scans
-         * "the hard way", rather than using device's scan.
-         */
-        if (iwl3945_mod_params.disable_hw_scan) {
-                IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
-                iwl3945_hw_ops.hw_scan = NULL;
-        }
-
-        IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
-        priv->cfg = cfg;
-        priv->pci_dev = pdev;
-        priv->inta_mask = CSR_INI_SET_MASK;
-
-        if (iwl_legacy_alloc_traffic_mem(priv))
-                IWL_ERR(priv, "Not enough memory to generate traffic log\n");
-
-        /***************************
-         * 2. Initializing PCI bus
-         * *************************/
-        pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
-                                PCIE_LINK_STATE_CLKPM);
-
-        if (pci_enable_device(pdev)) {
-                err = -ENODEV;
-                goto out_ieee80211_free_hw;
-        }
-
-        pci_set_master(pdev);
-
-        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
-        if (!err)
-                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
-        if (err) {
-                IWL_WARN(priv, "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;
-
-        /***********************
-         * 3. Read REV Register
-         * ********************/
-        priv->hw_base = pci_iomap(pdev, 0, 0);
-        if (!priv->hw_base) {
-                err = -ENODEV;
-                goto out_pci_release_regions;
-        }
-
-        IWL_DEBUG_INFO(priv, "pci_resource_len = 0x%08llx\n",
-                        (unsigned long long) pci_resource_len(pdev, 0));
-        IWL_DEBUG_INFO(priv, "pci_resource_base = %p\n", priv->hw_base);
-
-        /* 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);
-
-        /* these spin locks will be used in apm_ops.init and EEPROM access
-         * we should init now
-         */
-        spin_lock_init(&priv->reg_lock);
-        spin_lock_init(&priv->lock);
-
-        /*
-         * stop and reset the on-board processor just in case it is in a
-         * strange state ... like being left stranded by a primary kernel
-         * and this is now the kdump kernel trying to start up
-         */
-        iwl_write32(priv, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
-
-        /***********************
-         * 4. Read EEPROM
-         * ********************/
-
-        /* Read the EEPROM */
-        err = iwl_legacy_eeprom_init(priv);
-        if (err) {
-                IWL_ERR(priv, "Unable to init EEPROM\n");
-                goto out_iounmap;
-        }
-        /* MAC Address location in EEPROM same for 3945/4965 */
-        eeprom = (struct iwl3945_eeprom *)priv->eeprom;
-        IWL_DEBUG_INFO(priv, "MAC address: %pM\n", eeprom->mac_address);
-        SET_IEEE80211_PERM_ADDR(priv->hw, eeprom->mac_address);
-
-        /***********************
-         * 5. Setup HW Constants
-         * ********************/
-        /* Device-specific setup */
-        if (iwl3945_hw_set_hw_params(priv)) {
-                IWL_ERR(priv, "failed to set hw settings\n");
-                goto out_eeprom_free;
-        }
-
-        /***********************
-         * 6. Setup priv
-         * ********************/
-
-        err = iwl3945_init_drv(priv);
-        if (err) {
-                IWL_ERR(priv, "initializing driver failed\n");
-                goto out_unset_hw_params;
-        }
-
-        IWL_INFO(priv, "Detected Intel Wireless WiFi Link %s\n",
-                priv->cfg->name);
-
-        /***********************
-         * 7. Setup Services
-         * ********************/
-
-        spin_lock_irqsave(&priv->lock, flags);
-        iwl_legacy_disable_interrupts(priv);
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        pci_enable_msi(priv->pci_dev);
-
-        err = request_irq(priv->pci_dev->irq, iwl_legacy_isr,
-                          IRQF_SHARED, DRV_NAME, priv);
-        if (err) {
-                IWL_ERR(priv, "Error allocating IRQ %d\n", priv->pci_dev->irq);
-                goto out_disable_msi;
-        }
-
-        err = sysfs_create_group(&pdev->dev.kobj, &iwl3945_attribute_group);
-        if (err) {
-                IWL_ERR(priv, "failed to create sysfs device attributes\n");
-                goto out_release_irq;
-        }
-
-        iwl_legacy_set_rxon_channel(priv,
-                             &priv->bands[IEEE80211_BAND_2GHZ].channels[5],
-                             &priv->contexts[IWL_RXON_CTX_BSS]);
-        iwl3945_setup_deferred_work(priv);
-        iwl3945_setup_rx_handlers(priv);
-        iwl_legacy_power_initialize(priv);
-
-        /*********************************
-         * 8. Setup and Register mac80211
-         * *******************************/
-
-        iwl_legacy_enable_interrupts(priv);
-
-        err = iwl3945_setup_mac(priv);
-        if (err)
-                goto  out_remove_sysfs;
-
-        err = iwl_legacy_dbgfs_register(priv, DRV_NAME);
-        if (err)
-                IWL_ERR(priv, "failed to create debugfs files. Ignoring error: %d\n", err);
-
-        /* Start monitoring the killswitch */
-        queue_delayed_work(priv->workqueue, &priv->_3945.rfkill_poll,
-                           2 * HZ);
-
-        return 0;
-
- out_remove_sysfs:
-        destroy_workqueue(priv->workqueue);
-        priv->workqueue = NULL;
-        sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group);
- out_release_irq:
-        free_irq(priv->pci_dev->irq, priv);
- out_disable_msi:
-        pci_disable_msi(priv->pci_dev);
-        iwl_legacy_free_geos(priv);
-        iwl_legacy_free_channel_map(priv);
- out_unset_hw_params:
-        iwl3945_unset_hw_params(priv);
- out_eeprom_free:
-        iwl_legacy_eeprom_free(priv);
- out_iounmap:
-        pci_iounmap(pdev, priv->hw_base);
- out_pci_release_regions:
-        pci_release_regions(pdev);
- out_pci_disable_device:
-        pci_set_drvdata(pdev, NULL);
-        pci_disable_device(pdev);
- out_ieee80211_free_hw:
-        iwl_legacy_free_traffic_mem(priv);
-        ieee80211_free_hw(priv->hw);
- out:
-        return err;
-}
-
-static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
-{
-        struct iwl_priv *priv = pci_get_drvdata(pdev);
-        unsigned long flags;
-
-        if (!priv)
-                return;
-
-        IWL_DEBUG_INFO(priv, "*** UNLOAD DRIVER ***\n");
-
-        iwl_legacy_dbgfs_unregister(priv);
-
-        set_bit(STATUS_EXIT_PENDING, &priv->status);
-
-        iwl_legacy_leds_exit(priv);
-
-        if (priv->mac80211_registered) {
-                ieee80211_unregister_hw(priv->hw);
-                priv->mac80211_registered = 0;
-        } else {
-                iwl3945_down(priv);
-        }
-
-        /*
-         * Make sure device is reset to low power before unloading driver.
-         * This may be redundant with iwl_down(), but there are paths to
-         * run iwl_down() without calling apm_ops.stop(), and there are
-         * paths to avoid running iwl_down() at all before leaving driver.
-         * This (inexpensive) call *makes sure* device is reset.
-         */
-        iwl_legacy_apm_stop(priv);
-
-        /* make sure we flush any pending irq or
-         * tasklet for the driver
-         */
-        spin_lock_irqsave(&priv->lock, flags);
-        iwl_legacy_disable_interrupts(priv);
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        iwl3945_synchronize_irq(priv);
-
-        sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group);
-
-        cancel_delayed_work_sync(&priv->_3945.rfkill_poll);
-
-        iwl3945_dealloc_ucode_pci(priv);
-
-        if (priv->rxq.bd)
-                iwl3945_rx_queue_free(priv, &priv->rxq);
-        iwl3945_hw_txq_ctx_free(priv);
-
-        iwl3945_unset_hw_params(priv);
-
-        /*netif_stop_queue(dev); */
-        flush_workqueue(priv->workqueue);
-
-        /* ieee80211_unregister_hw calls iwl3945_mac_stop, which flushes
-         * priv->workqueue... so we can't take down the workqueue
-         * until now... */
-        destroy_workqueue(priv->workqueue);
-        priv->workqueue = NULL;
-        iwl_legacy_free_traffic_mem(priv);
-
-        free_irq(pdev->irq, priv);
-        pci_disable_msi(pdev);
-
-        pci_iounmap(pdev, priv->hw_base);
-        pci_release_regions(pdev);
-        pci_disable_device(pdev);
-        pci_set_drvdata(pdev, NULL);
-
-        iwl_legacy_free_channel_map(priv);
-        iwl_legacy_free_geos(priv);
-        kfree(priv->scan_cmd);
-        if (priv->beacon_skb)
-                dev_kfree_skb(priv->beacon_skb);
-
-        ieee80211_free_hw(priv->hw);
-}
-
-
-/*****************************************************************************
- *
- * driver and module entry point
- *
- *****************************************************************************/
-
-static struct pci_driver iwl3945_driver = {
-        .name = DRV_NAME,
-        .id_table = iwl3945_hw_card_ids,
-        .probe = iwl3945_pci_probe,
-        .remove = __devexit_p(iwl3945_pci_remove),
-        .driver.pm = IWL_LEGACY_PM_OPS,
-};
-
-static int __init iwl3945_init(void)
-{
-
-        int ret;
-        pr_info(DRV_DESCRIPTION ", " DRV_VERSION "\n");
-        pr_info(DRV_COPYRIGHT "\n");
-
-        ret = iwl3945_rate_control_register();
-        if (ret) {
-                pr_err("Unable to register rate control algorithm: %d\n", ret);
-                return ret;
-        }
-
-        ret = pci_register_driver(&iwl3945_driver);
-        if (ret) {
-                pr_err("Unable to initialize PCI module\n");
-                goto error_register;
-        }
-
-        return ret;
-
-error_register:
-        iwl3945_rate_control_unregister();
-        return ret;
-}
-
-static void __exit iwl3945_exit(void)
-{
-        pci_unregister_driver(&iwl3945_driver);
-        iwl3945_rate_control_unregister();
-}
-
-MODULE_FIRMWARE(IWL3945_MODULE_FIRMWARE(IWL3945_UCODE_API_MAX));
-
-module_param_named(antenna, iwl3945_mod_params.antenna, int, S_IRUGO);
-MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])");
-module_param_named(swcrypto, iwl3945_mod_params.sw_crypto, int, S_IRUGO);
-MODULE_PARM_DESC(swcrypto,
-                "using software crypto (default 1 [software])");
-module_param_named(disable_hw_scan, iwl3945_mod_params.disable_hw_scan,
-                int, S_IRUGO);
-MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 1)");
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-module_param_named(debug, iwlegacy_debug_level, uint, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(debug, "debug output mask");
-#endif
-module_param_named(fw_restart, iwl3945_mod_params.restart_fw, int, S_IRUGO);
-MODULE_PARM_DESC(fw_restart, "restart firmware in case of error");
-
-module_exit(iwl3945_exit);
-module_init(iwl3945_init);
diff --git a/drivers/net/wireless/iwlegacy/iwl4965-base.c b/drivers/net/wireless/iwlegacy/iwl4965-base.c
deleted file mode 100644
index d2fba9eae153..000000000000
--- a/drivers/net/wireless/iwlegacy/iwl4965-base.c
+++ /dev/null
@@ -1,3281 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2003 - 2011 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:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- *****************************************************************************/
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/pci-aspm.h>
-#include <linux/slab.h>
-#include <linux/dma-mapping.h>
-#include <linux/delay.h>
-#include <linux/sched.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <linux/firmware.h>
-#include <linux/etherdevice.h>
-#include <linux/if_arp.h>
-
-#include <net/mac80211.h>
-
-#include <asm/div64.h>
-
-#define DRV_NAME        "iwl4965"
-
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-io.h"
-#include "iwl-helpers.h"
-#include "iwl-sta.h"
-#include "iwl-4965-calib.h"
-#include "iwl-4965.h"
-#include "iwl-4965-led.h"
-
-
-/******************************************************************************
- *
- * module boiler plate
- *
- ******************************************************************************/
-
-/*
- * module name, copyright, version, etc.
- */
-#define DRV_DESCRIPTION "Intel(R) Wireless WiFi 4965 driver for Linux"
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-#define VD "d"
-#else
-#define VD
-#endif
-
-#define DRV_VERSION     IWLWIFI_VERSION VD
-
-
-MODULE_DESCRIPTION(DRV_DESCRIPTION);
-MODULE_VERSION(DRV_VERSION);
-MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("iwl4965");
-
-void iwl4965_update_chain_flags(struct iwl_priv *priv)
-{
-        struct iwl_rxon_context *ctx;
-
-        if (priv->cfg->ops->hcmd->set_rxon_chain) {
-                for_each_context(priv, ctx) {
-                        priv->cfg->ops->hcmd->set_rxon_chain(priv, ctx);
-                        if (ctx->active.rx_chain != ctx->staging.rx_chain)
-                                iwl_legacy_commit_rxon(priv, ctx);
-                }
-        }
-}
-
-static void iwl4965_clear_free_frames(struct iwl_priv *priv)
-{
-        struct list_head *element;
-
-        IWL_DEBUG_INFO(priv, "%d frames on pre-allocated heap on clear.\n",
-                       priv->frames_count);
-
-        while (!list_empty(&priv->free_frames)) {
-                element = priv->free_frames.next;
-                list_del(element);
-                kfree(list_entry(element, struct iwl_frame, list));
-                priv->frames_count--;
-        }
-
-        if (priv->frames_count) {
-                IWL_WARN(priv, "%d frames still in use.  Did we lose one?\n",
-                            priv->frames_count);
-                priv->frames_count = 0;
-        }
-}
-
-static struct iwl_frame *iwl4965_get_free_frame(struct iwl_priv *priv)
-{
-        struct iwl_frame *frame;
-        struct list_head *element;
-        if (list_empty(&priv->free_frames)) {
-                frame = kzalloc(sizeof(*frame), GFP_KERNEL);
-                if (!frame) {
-                        IWL_ERR(priv, "Could not allocate frame!\n");
-                        return NULL;
-                }
-
-                priv->frames_count++;
-                return frame;
-        }
-
-        element = priv->free_frames.next;
-        list_del(element);
-        return list_entry(element, struct iwl_frame, list);
-}
-
-static void iwl4965_free_frame(struct iwl_priv *priv, struct iwl_frame *frame)
-{
-        memset(frame, 0, sizeof(*frame));
-        list_add(&frame->list, &priv->free_frames);
-}
-
-static u32 iwl4965_fill_beacon_frame(struct iwl_priv *priv,
-                                 struct ieee80211_hdr *hdr,
-                                 int left)
-{
-        lockdep_assert_held(&priv->mutex);
-
-        if (!priv->beacon_skb)
-                return 0;
-
-        if (priv->beacon_skb->len > left)
-                return 0;
-
-        memcpy(hdr, priv->beacon_skb->data, priv->beacon_skb->len);
-
-        return priv->beacon_skb->len;
-}
-
-/* Parse the beacon frame to find the TIM element and set tim_idx & tim_size */
-static void iwl4965_set_beacon_tim(struct iwl_priv *priv,
-                               struct iwl_tx_beacon_cmd *tx_beacon_cmd,
-                               u8 *beacon, u32 frame_size)
-{
-        u16 tim_idx;
-        struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)beacon;
-
-        /*
-         * The index is relative to frame start but we start looking at the
-         * variable-length part of the beacon.
-         */
-        tim_idx = mgmt->u.beacon.variable - beacon;
-
-        /* Parse variable-length elements of beacon to find WLAN_EID_TIM */
-        while ((tim_idx < (frame_size - 2)) &&
-                        (beacon[tim_idx] != WLAN_EID_TIM))
-                tim_idx += beacon[tim_idx+1] + 2;
-
-        /* If TIM field was found, set variables */
-        if ((tim_idx < (frame_size - 1)) && (beacon[tim_idx] == WLAN_EID_TIM)) {
-                tx_beacon_cmd->tim_idx = cpu_to_le16(tim_idx);
-                tx_beacon_cmd->tim_size = beacon[tim_idx+1];
-        } else
-                IWL_WARN(priv, "Unable to find TIM Element in beacon\n");
-}
-
-static unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,
-                                       struct iwl_frame *frame)
-{
-        struct iwl_tx_beacon_cmd *tx_beacon_cmd;
-        u32 frame_size;
-        u32 rate_flags;
-        u32 rate;
-        /*
-         * We have to set up the TX command, the TX Beacon command, and the
-         * beacon contents.
-         */
-
-        lockdep_assert_held(&priv->mutex);
-
-        if (!priv->beacon_ctx) {
-                IWL_ERR(priv, "trying to build beacon w/o beacon context!\n");
-                return 0;
-        }
-
-        /* Initialize memory */
-        tx_beacon_cmd = &frame->u.beacon;
-        memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd));
-
-        /* Set up TX beacon contents */
-        frame_size = iwl4965_fill_beacon_frame(priv, tx_beacon_cmd->frame,
-                                sizeof(frame->u) - sizeof(*tx_beacon_cmd));
-        if (WARN_ON_ONCE(frame_size > MAX_MPDU_SIZE))
-                return 0;
-        if (!frame_size)
-                return 0;
-
-        /* Set up TX command fields */
-        tx_beacon_cmd->tx.len = cpu_to_le16((u16)frame_size);
-        tx_beacon_cmd->tx.sta_id = priv->beacon_ctx->bcast_sta_id;
-        tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
-        tx_beacon_cmd->tx.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK |
-                TX_CMD_FLG_TSF_MSK | TX_CMD_FLG_STA_RATE_MSK;
-
-        /* Set up TX beacon command fields */
-        iwl4965_set_beacon_tim(priv, tx_beacon_cmd, (u8 *)tx_beacon_cmd->frame,
-                           frame_size);
-
-        /* Set up packet rate and flags */
-        rate = iwl_legacy_get_lowest_plcp(priv, priv->beacon_ctx);
-        priv->mgmt_tx_ant = iwl4965_toggle_tx_ant(priv, priv->mgmt_tx_ant,
-                                              priv->hw_params.valid_tx_ant);
-        rate_flags = iwl4965_ant_idx_to_flags(priv->mgmt_tx_ant);
-        if ((rate >= IWL_FIRST_CCK_RATE) && (rate <= IWL_LAST_CCK_RATE))
-                rate_flags |= RATE_MCS_CCK_MSK;
-        tx_beacon_cmd->tx.rate_n_flags = iwl4965_hw_set_rate_n_flags(rate,
-                        rate_flags);
-
-        return sizeof(*tx_beacon_cmd) + frame_size;
-}
-
-int iwl4965_send_beacon_cmd(struct iwl_priv *priv)
-{
-        struct iwl_frame *frame;
-        unsigned int frame_size;
-        int rc;
-
-        frame = iwl4965_get_free_frame(priv);
-        if (!frame) {
-                IWL_ERR(priv, "Could not obtain free frame buffer for beacon "
-                          "command.\n");
-                return -ENOMEM;
-        }
-
-        frame_size = iwl4965_hw_get_beacon_cmd(priv, frame);
-        if (!frame_size) {
-                IWL_ERR(priv, "Error configuring the beacon command\n");
-                iwl4965_free_frame(priv, frame);
-                return -EINVAL;
-        }
-
-        rc = iwl_legacy_send_cmd_pdu(priv, REPLY_TX_BEACON, frame_size,
-                              &frame->u.cmd[0]);
-
-        iwl4965_free_frame(priv, frame);
-
-        return rc;
-}
-
-static inline dma_addr_t iwl4965_tfd_tb_get_addr(struct iwl_tfd *tfd, u8 idx)
-{
-        struct iwl_tfd_tb *tb = &tfd->tbs[idx];
-
-        dma_addr_t addr = get_unaligned_le32(&tb->lo);
-        if (sizeof(dma_addr_t) > sizeof(u32))
-                addr |=
-                ((dma_addr_t)(le16_to_cpu(tb->hi_n_len) & 0xF) << 16) << 16;
-
-        return addr;
-}
-
-static inline u16 iwl4965_tfd_tb_get_len(struct iwl_tfd *tfd, u8 idx)
-{
-        struct iwl_tfd_tb *tb = &tfd->tbs[idx];
-
-        return le16_to_cpu(tb->hi_n_len) >> 4;
-}
-
-static inline void iwl4965_tfd_set_tb(struct iwl_tfd *tfd, u8 idx,
-                                  dma_addr_t addr, u16 len)
-{
-        struct iwl_tfd_tb *tb = &tfd->tbs[idx];
-        u16 hi_n_len = len << 4;
-
-        put_unaligned_le32(addr, &tb->lo);
-        if (sizeof(dma_addr_t) > sizeof(u32))
-                hi_n_len |= ((addr >> 16) >> 16) & 0xF;
-
-        tb->hi_n_len = cpu_to_le16(hi_n_len);
-
-        tfd->num_tbs = idx + 1;
-}
-
-static inline u8 iwl4965_tfd_get_num_tbs(struct iwl_tfd *tfd)
-{
-        return tfd->num_tbs & 0x1f;
-}
-
-/**
- * iwl4965_hw_txq_free_tfd - Free all chunks referenced by TFD [txq->q.read_ptr]
- * @priv - driver private data
- * @txq - tx queue
- *
- * Does NOT advance any TFD circular buffer read/write indexes
- * Does NOT free the TFD itself (which is within circular buffer)
- */
-void iwl4965_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)
-{
-        struct iwl_tfd *tfd_tmp = (struct iwl_tfd *)txq->tfds;
-        struct iwl_tfd *tfd;
-        struct pci_dev *dev = priv->pci_dev;
-        int index = txq->q.read_ptr;
-        int i;
-        int num_tbs;
-
-        tfd = &tfd_tmp[index];
-
-        /* Sanity check on number of chunks */
-        num_tbs = iwl4965_tfd_get_num_tbs(tfd);
-
-        if (num_tbs >= IWL_NUM_OF_TBS) {
-                IWL_ERR(priv, "Too many chunks: %i\n", num_tbs);
-                /* @todo issue fatal error, it is quite serious situation */
-                return;
-        }
-
-        /* Unmap tx_cmd */
-        if (num_tbs)
-                pci_unmap_single(dev,
-                                dma_unmap_addr(&txq->meta[index], mapping),
-                                dma_unmap_len(&txq->meta[index], len),
-                                PCI_DMA_BIDIRECTIONAL);
-
-        /* Unmap chunks, if any. */
-        for (i = 1; i < num_tbs; i++)
-                pci_unmap_single(dev, iwl4965_tfd_tb_get_addr(tfd, i),
-                                iwl4965_tfd_tb_get_len(tfd, i),
-                                PCI_DMA_TODEVICE);
-
-        /* free SKB */
-        if (txq->txb) {
-                struct sk_buff *skb;
-
-                skb = txq->txb[txq->q.read_ptr].skb;
-
-                /* can be called from irqs-disabled context */
-                if (skb) {
-                        dev_kfree_skb_any(skb);
-                        txq->txb[txq->q.read_ptr].skb = NULL;
-                }
-        }
-}
-
-int iwl4965_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv,
-                                 struct iwl_tx_queue *txq,
-                                 dma_addr_t addr, u16 len,
-                                 u8 reset, u8 pad)
-{
-        struct iwl_queue *q;
-        struct iwl_tfd *tfd, *tfd_tmp;
-        u32 num_tbs;
-
-        q = &txq->q;
-        tfd_tmp = (struct iwl_tfd *)txq->tfds;
-        tfd = &tfd_tmp[q->write_ptr];
-
-        if (reset)
-                memset(tfd, 0, sizeof(*tfd));
-
-        num_tbs = iwl4965_tfd_get_num_tbs(tfd);
-
-        /* Each TFD can point to a maximum 20 Tx buffers */
-        if (num_tbs >= IWL_NUM_OF_TBS) {
-                IWL_ERR(priv, "Error can not send more than %d chunks\n",
-                          IWL_NUM_OF_TBS);
-                return -EINVAL;
-        }
-
-        BUG_ON(addr & ~DMA_BIT_MASK(36));
-        if (unlikely(addr & ~IWL_TX_DMA_MASK))
-                IWL_ERR(priv, "Unaligned address = %llx\n",
-                          (unsigned long long)addr);
-
-        iwl4965_tfd_set_tb(tfd, num_tbs, addr, len);
-
-        return 0;
-}
-
-/*
- * Tell nic where to find circular buffer of Tx Frame Descriptors for
- * given Tx queue, and enable the DMA channel used for that queue.
- *
- * 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 iwl_priv *priv,
-                         struct iwl_tx_queue *txq)
-{
-        int txq_id = txq->q.id;
-
-        /* Circular buffer (TFD queue in DRAM) physical base address */
-        iwl_legacy_write_direct32(priv, FH_MEM_CBBC_QUEUE(txq_id),
-                             txq->q.dma_addr >> 8);
-
-        return 0;
-}
-
-/******************************************************************************
- *
- * Generic RX handler implementations
- *
- ******************************************************************************/
-static void iwl4965_rx_reply_alive(struct iwl_priv *priv,
-                                struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_alive_resp *palive;
-        struct delayed_work *pwork;
-
-        palive = &pkt->u.alive_frame;
-
-        IWL_DEBUG_INFO(priv, "Alive ucode status 0x%08X revision "
-                       "0x%01X 0x%01X\n",
-                       palive->is_valid, palive->ver_type,
-                       palive->ver_subtype);
-
-        if (palive->ver_subtype == INITIALIZE_SUBTYPE) {
-                IWL_DEBUG_INFO(priv, "Initialization Alive received.\n");
-                memcpy(&priv->card_alive_init,
-                       &pkt->u.alive_frame,
-                       sizeof(struct iwl_init_alive_resp));
-                pwork = &priv->init_alive_start;
-        } else {
-                IWL_DEBUG_INFO(priv, "Runtime Alive received.\n");
-                memcpy(&priv->card_alive, &pkt->u.alive_frame,
-                       sizeof(struct iwl_alive_resp));
-                pwork = &priv->alive_start;
-        }
-
-        /* We delay the ALIVE response by 5ms to
-         * give the HW RF Kill time to activate... */
-        if (palive->is_valid == UCODE_VALID_OK)
-                queue_delayed_work(priv->workqueue, pwork,
-                                   msecs_to_jiffies(5));
-        else
-                IWL_WARN(priv, "uCode did not respond OK.\n");
-}
-
-/**
- * iwl4965_bg_statistics_periodic - Timer callback to queue statistics
- *
- * 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.
- */
-static void iwl4965_bg_statistics_periodic(unsigned long data)
-{
-        struct iwl_priv *priv = (struct iwl_priv *)data;
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
-
-        /* dont send host command if rf-kill is on */
-        if (!iwl_legacy_is_ready_rf(priv))
-                return;
-
-        iwl_legacy_send_statistics_request(priv, CMD_ASYNC, false);
-}
-
-static void iwl4965_rx_beacon_notif(struct iwl_priv *priv,
-                                struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl4965_beacon_notif *beacon =
-                (struct iwl4965_beacon_notif *)pkt->u.raw;
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        u8 rate = iwl4965_hw_get_rate(beacon->beacon_notify_hdr.rate_n_flags);
-
-        IWL_DEBUG_RX(priv, "beacon status %x retries %d iss %d "
-                "tsf %d %d rate %d\n",
-                le32_to_cpu(beacon->beacon_notify_hdr.u.status) & TX_STATUS_MSK,
-                beacon->beacon_notify_hdr.failure_frame,
-                le32_to_cpu(beacon->ibss_mgr_status),
-                le32_to_cpu(beacon->high_tsf),
-                le32_to_cpu(beacon->low_tsf), rate);
-#endif
-
-        priv->ibss_manager = le32_to_cpu(beacon->ibss_mgr_status);
-}
-
-static void iwl4965_perform_ct_kill_task(struct iwl_priv *priv)
-{
-        unsigned long flags;
-
-        IWL_DEBUG_POWER(priv, "Stop all queues\n");
-
-        if (priv->mac80211_registered)
-                ieee80211_stop_queues(priv->hw);
-
-        iwl_write32(priv, CSR_UCODE_DRV_GP1_SET,
-                        CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);
-        iwl_read32(priv, CSR_UCODE_DRV_GP1);
-
-        spin_lock_irqsave(&priv->reg_lock, flags);
-        if (!iwl_grab_nic_access(priv))
-                iwl_release_nic_access(priv);
-        spin_unlock_irqrestore(&priv->reg_lock, flags);
-}
-
-/* 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 iwl_priv *priv,
-                                    struct iwl_rx_mem_buffer *rxb)
-{
-        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags);
-        unsigned long status = priv->status;
-
-        IWL_DEBUG_RF_KILL(priv, "Card state received: HW:%s SW:%s CT:%s\n",
-                          (flags & HW_CARD_DISABLED) ? "Kill" : "On",
-                          (flags & SW_CARD_DISABLED) ? "Kill" : "On",
-                          (flags & CT_CARD_DISABLED) ?
-                          "Reached" : "Not reached");
-
-        if (flags & (SW_CARD_DISABLED | HW_CARD_DISABLED |
-                     CT_CARD_DISABLED)) {
-
-                iwl_write32(priv, CSR_UCODE_DRV_GP1_SET,
-                            CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
-
-                iwl_legacy_write_direct32(priv, HBUS_TARG_MBX_C,
-                                        HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED);
-
-                if (!(flags & RXON_CARD_DISABLED)) {
-                        iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR,
-                                    CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
-                        iwl_legacy_write_direct32(priv, HBUS_TARG_MBX_C,
-                                        HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED);
-                }
-        }
-
-        if (flags & CT_CARD_DISABLED)
-                iwl4965_perform_ct_kill_task(priv);
-
-        if (flags & HW_CARD_DISABLED)
-                set_bit(STATUS_RF_KILL_HW, &priv->status);
-        else
-                clear_bit(STATUS_RF_KILL_HW, &priv->status);
-
-        if (!(flags & RXON_CARD_DISABLED))
-                iwl_legacy_scan_cancel(priv);
-
-        if ((test_bit(STATUS_RF_KILL_HW, &status) !=
-             test_bit(STATUS_RF_KILL_HW, &priv->status)))
-                wiphy_rfkill_set_hw_state(priv->hw->wiphy,
-                        test_bit(STATUS_RF_KILL_HW, &priv->status));
-        else
-                wake_up(&priv->wait_command_queue);
-}
-
-/**
- * iwl4965_setup_rx_handlers - Initialize Rx handler callbacks
- *
- * Setup the RX handlers for each of the reply types sent from the uCode
- * to the host.
- *
- * 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 iwl_priv *priv)
-{
-        priv->rx_handlers[REPLY_ALIVE] = iwl4965_rx_reply_alive;
-        priv->rx_handlers[REPLY_ERROR] = iwl_legacy_rx_reply_error;
-        priv->rx_handlers[CHANNEL_SWITCH_NOTIFICATION] = iwl_legacy_rx_csa;
-        priv->rx_handlers[SPECTRUM_MEASURE_NOTIFICATION] =
-                        iwl_legacy_rx_spectrum_measure_notif;
-        priv->rx_handlers[PM_SLEEP_NOTIFICATION] = iwl_legacy_rx_pm_sleep_notif;
-        priv->rx_handlers[PM_DEBUG_STATISTIC_NOTIFIC] =
-            iwl_legacy_rx_pm_debug_statistics_notif;
-        priv->rx_handlers[BEACON_NOTIFICATION] = iwl4965_rx_beacon_notif;
-
-        /*
-         * The same handler is used for both the REPLY to a discrete
-         * statistics request from the host as well as for the periodic
-         * statistics notifications (after received beacons) from the uCode.
-         */
-        priv->rx_handlers[REPLY_STATISTICS_CMD] = iwl4965_reply_statistics;
-        priv->rx_handlers[STATISTICS_NOTIFICATION] = iwl4965_rx_statistics;
-
-        iwl_legacy_setup_rx_scan_handlers(priv);
-
-        /* status change handler */
-        priv->rx_handlers[CARD_STATE_NOTIFICATION] =
-                                        iwl4965_rx_card_state_notif;
-
-        priv->rx_handlers[MISSED_BEACONS_NOTIFICATION] =
-            iwl4965_rx_missed_beacon_notif;
-        /* Rx handlers */
-        priv->rx_handlers[REPLY_RX_PHY_CMD] = iwl4965_rx_reply_rx_phy;
-        priv->rx_handlers[REPLY_RX_MPDU_CMD] = iwl4965_rx_reply_rx;
-        /* block ack */
-        priv->rx_handlers[REPLY_COMPRESSED_BA] = iwl4965_rx_reply_compressed_ba;
-        /* Set up hardware specific Rx handlers */
-        priv->cfg->ops->lib->rx_handler_setup(priv);
-}
-
-/**
- * iwl4965_rx_handle - Main entry function for receiving responses from uCode
- *
- * Uses the priv->rx_handlers callback function array to invoke
- * the appropriate handlers, including command responses,
- * frame-received notifications, and other notifications.
- */
-void iwl4965_rx_handle(struct iwl_priv *priv)
-{
-        struct iwl_rx_mem_buffer *rxb;
-        struct iwl_rx_packet *pkt;
-        struct iwl_rx_queue *rxq = &priv->rxq;
-        u32 r, i;
-        int reclaim;
-        unsigned long flags;
-        u8 fill_rx = 0;
-        u32 count = 8;
-        int total_empty;
-
-        /* uCode's read index (stored in shared DRAM) indicates the last Rx
-         * buffer that the driver may process (last buffer filled by ucode). */
-        r = le16_to_cpu(rxq->rb_stts->closed_rb_num) &  0x0FFF;
-        i = rxq->read;
-
-        /* Rx interrupt, but nothing sent from uCode */
-        if (i == r)
-                IWL_DEBUG_RX(priv, "r = %d, i = %d\n", r, i);
-
-        /* calculate total frames need to be restock after handling RX */
-        total_empty = r - rxq->write_actual;
-        if (total_empty < 0)
-                total_empty += RX_QUEUE_SIZE;
-
-        if (total_empty > (RX_QUEUE_SIZE / 2))
-                fill_rx = 1;
-
-        while (i != r) {
-                int len;
-
-                rxb = rxq->queue[i];
-
-                /* If an RXB doesn't have a Rx queue slot associated with it,
-                 * then a bug has been introduced in the queue refilling
-                 * routines -- catch it here */
-                BUG_ON(rxb == NULL);
-
-                rxq->queue[i] = NULL;
-
-                pci_unmap_page(priv->pci_dev, rxb->page_dma,
-                               PAGE_SIZE << priv->hw_params.rx_page_order,
-                               PCI_DMA_FROMDEVICE);
-                pkt = rxb_addr(rxb);
-
-                len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
-                len += sizeof(u32); /* account for status word */
-                trace_iwlwifi_legacy_dev_rx(priv, pkt, len);
-
-                /* Reclaim a command buffer only if this packet is a response
-                 *   to a (driver-originated) command.
-                 * If the packet (e.g. Rx frame) originated from uCode,
-                 *   there is no command buffer to reclaim.
-                 * Ucode should set SEQ_RX_FRAME bit if ucode-originated,
-                 *   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_RX) &&
-                        (pkt->hdr.cmd != REPLY_RX_MPDU_CMD) &&
-                        (pkt->hdr.cmd != REPLY_COMPRESSED_BA) &&
-                        (pkt->hdr.cmd != STATISTICS_NOTIFICATION) &&
-                        (pkt->hdr.cmd != REPLY_TX);
-
-                /* Based on type of command response or notification,
-                 *   handle those that need handling via function in
-                 *   rx_handlers table.  See iwl4965_setup_rx_handlers() */
-                if (priv->rx_handlers[pkt->hdr.cmd]) {
-                        IWL_DEBUG_RX(priv, "r = %d, i = %d, %s, 0x%02x\n", r,
-                                i, iwl_legacy_get_cmd_string(pkt->hdr.cmd),
-                                pkt->hdr.cmd);
-                        priv->isr_stats.rx_handlers[pkt->hdr.cmd]++;
-                        priv->rx_handlers[pkt->hdr.cmd] (priv, rxb);
-                } else {
-                        /* No handling needed */
-                        IWL_DEBUG_RX(priv,
-                                "r %d i %d No handler needed for %s, 0x%02x\n",
-                                r, i, iwl_legacy_get_cmd_string(pkt->hdr.cmd),
-                                pkt->hdr.cmd);
-                }
-
-                /*
-                 * XXX: After here, we should always check rxb->page
-                 * against NULL before touching it or its virtual
-                 * memory (pkt). Because some rx_handler might have
-                 * already taken or freed the pages.
-                 */
-
-                if (reclaim) {
-                        /* Invoke any callbacks, transfer the buffer to caller,
-                         * and fire off the (possibly) blocking iwl_legacy_send_cmd()
-                         * as we reclaim the driver command queue */
-                        if (rxb->page)
-                                iwl_legacy_tx_cmd_complete(priv, rxb);
-                        else
-                                IWL_WARN(priv, "Claim null rxb?\n");
-                }
-
-                /* Reuse the page if possible. For notification packets and
-                 * SKBs that fail to Rx correctly, add them back into the
-                 * rx_free list for reuse later. */
-                spin_lock_irqsave(&rxq->lock, flags);
-                if (rxb->page != NULL) {
-                        rxb->page_dma = pci_map_page(priv->pci_dev, rxb->page,
-                                0, PAGE_SIZE << priv->hw_params.rx_page_order,
-                                PCI_DMA_FROMDEVICE);
-                        list_add_tail(&rxb->list, &rxq->rx_free);
-                        rxq->free_count++;
-                } else
-                        list_add_tail(&rxb->list, &rxq->rx_used);
-
-                spin_unlock_irqrestore(&rxq->lock, flags);
-
-                i = (i + 1) & RX_QUEUE_MASK;
-                /* If there are a lot of unused frames,
-                 * restock the Rx queue so ucode wont assert. */
-                if (fill_rx) {
-                        count++;
-                        if (count >= 8) {
-                                rxq->read = i;
-                                iwl4965_rx_replenish_now(priv);
-                                count = 0;
-                        }
-                }
-        }
-
-        /* Backtrack one entry */
-        rxq->read = i;
-        if (fill_rx)
-                iwl4965_rx_replenish_now(priv);
-        else
-                iwl4965_rx_queue_restock(priv);
-}
-
-/* call this function to flush any scheduled tasklet */
-static inline void iwl4965_synchronize_irq(struct iwl_priv *priv)
-{
-        /* wait to make sure we flush pending tasklet*/
-        synchronize_irq(priv->pci_dev->irq);
-        tasklet_kill(&priv->irq_tasklet);
-}
-
-static void iwl4965_irq_tasklet(struct iwl_priv *priv)
-{
-        u32 inta, handled = 0;
-        u32 inta_fh;
-        unsigned long flags;
-        u32 i;
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        u32 inta_mask;
-#endif
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        /* 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 = 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 = iwl_read32(priv, CSR_FH_INT_STATUS);
-        iwl_write32(priv, CSR_FH_INT_STATUS, inta_fh);
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        if (iwl_legacy_get_debug_level(priv) & IWL_DL_ISR) {
-                /* just for debug */
-                inta_mask = iwl_read32(priv, CSR_INT_MASK);
-                IWL_DEBUG_ISR(priv, "inta 0x%08x, enabled 0x%08x, fh 0x%08x\n",
-                              inta, inta_mask, inta_fh);
-        }
-#endif
-
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        /* Since CSR_INT and CSR_FH_INT_STATUS reads and clears are not
-         * 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 & CSR49_FH_INT_RX_MASK)
-                inta |= CSR_INT_BIT_FH_RX;
-        if (inta_fh & CSR49_FH_INT_TX_MASK)
-                inta |= CSR_INT_BIT_FH_TX;
-
-        /* Now service all interrupt bits discovered above. */
-        if (inta & CSR_INT_BIT_HW_ERR) {
-                IWL_ERR(priv, "Hardware error detected.  Restarting.\n");
-
-                /* Tell the device to stop sending interrupts */
-                iwl_legacy_disable_interrupts(priv);
-
-                priv->isr_stats.hw++;
-                iwl_legacy_irq_handle_error(priv);
-
-                handled |= CSR_INT_BIT_HW_ERR;
-
-                return;
-        }
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        if (iwl_legacy_get_debug_level(priv) & (IWL_DL_ISR)) {
-                /* NIC fires this, but we don't use it, redundant with WAKEUP */
-                if (inta & CSR_INT_BIT_SCD) {
-                        IWL_DEBUG_ISR(priv, "Scheduler finished to transmit "
-                                      "the frame/frames.\n");
-                        priv->isr_stats.sch++;
-                }
-
-                /* Alive notification via Rx interrupt will do the real work */
-                if (inta & CSR_INT_BIT_ALIVE) {
-                        IWL_DEBUG_ISR(priv, "Alive interrupt\n");
-                        priv->isr_stats.alive++;
-                }
-        }
-#endif
-        /* Safely ignore these bits for debug checks below */
-        inta &= ~(CSR_INT_BIT_SCD | CSR_INT_BIT_ALIVE);
-
-        /* HW RF KILL switch toggled */
-        if (inta & CSR_INT_BIT_RF_KILL) {
-                int hw_rf_kill = 0;
-                if (!(iwl_read32(priv, CSR_GP_CNTRL) &
-                                CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW))
-                        hw_rf_kill = 1;
-
-                IWL_WARN(priv, "RF_KILL bit toggled to %s.\n",
-                                hw_rf_kill ? "disable radio" : "enable radio");
-
-                priv->isr_stats.rfkill++;
-
-                /* driver only loads ucode once setting the interface up.
-                 * the driver allows loading the ucode even if the radio
-                 * is killed. Hence update the killswitch state here. The
-                 * rfkill handler will care about restarting if needed.
-                 */
-                if (!test_bit(STATUS_ALIVE, &priv->status)) {
-                        if (hw_rf_kill)
-                                set_bit(STATUS_RF_KILL_HW, &priv->status);
-                        else
-                                clear_bit(STATUS_RF_KILL_HW, &priv->status);
-                        wiphy_rfkill_set_hw_state(priv->hw->wiphy, hw_rf_kill);
-                }
-
-                handled |= CSR_INT_BIT_RF_KILL;
-        }
-
-        /* Chip got too hot and stopped itself */
-        if (inta & CSR_INT_BIT_CT_KILL) {
-                IWL_ERR(priv, "Microcode CT kill error detected.\n");
-                priv->isr_stats.ctkill++;
-                handled |= CSR_INT_BIT_CT_KILL;
-        }
-
-        /* Error detected by uCode */
-        if (inta & CSR_INT_BIT_SW_ERR) {
-                IWL_ERR(priv, "Microcode SW error detected. "
-                        " Restarting 0x%X.\n", inta);
-                priv->isr_stats.sw++;
-                iwl_legacy_irq_handle_error(priv);
-                handled |= CSR_INT_BIT_SW_ERR;
-        }
-
-        /*
-         * uCode wakes up after power-down sleep.
-         * Tell device about any new tx or host commands enqueued,
-         * and about any Rx buffers made available while asleep.
-         */
-        if (inta & CSR_INT_BIT_WAKEUP) {
-                IWL_DEBUG_ISR(priv, "Wakeup interrupt\n");
-                iwl_legacy_rx_queue_update_write_ptr(priv, &priv->rxq);
-                for (i = 0; i < priv->hw_params.max_txq_num; i++)
-                        iwl_legacy_txq_update_write_ptr(priv, &priv->txq[i]);
-                priv->isr_stats.wakeup++;
-                handled |= CSR_INT_BIT_WAKEUP;
-        }
-
-        /* All uCode command responses, including Tx command responses,
-         * Rx "responses" (frame-received notification), and other
-         * notifications from uCode come through here*/
-        if (inta & (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX)) {
-                iwl4965_rx_handle(priv);
-                priv->isr_stats.rx++;
-                handled |= (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX);
-        }
-
-        /* This "Tx" DMA channel is used only for loading uCode */
-        if (inta & CSR_INT_BIT_FH_TX) {
-                IWL_DEBUG_ISR(priv, "uCode load interrupt\n");
-                priv->isr_stats.tx++;
-                handled |= CSR_INT_BIT_FH_TX;
-                /* Wake up uCode load routine, now that load is complete */
-                priv->ucode_write_complete = 1;
-                wake_up(&priv->wait_command_queue);
-        }
-
-        if (inta & ~handled) {
-                IWL_ERR(priv, "Unhandled INTA bits 0x%08x\n", inta & ~handled);
-                priv->isr_stats.unhandled++;
-        }
-
-        if (inta & ~(priv->inta_mask)) {
-                IWL_WARN(priv, "Disabled INTA bits 0x%08x were pending\n",
-                         inta & ~priv->inta_mask);
-                IWL_WARN(priv, "   with FH_INT = 0x%08x\n", inta_fh);
-        }
-
-        /* Re-enable all interrupts */
-        /* only Re-enable if disabled by irq */
-        if (test_bit(STATUS_INT_ENABLED, &priv->status))
-                iwl_legacy_enable_interrupts(priv);
-        /* Re-enable RF_KILL if it occurred */
-        else if (handled & CSR_INT_BIT_RF_KILL)
-                iwl_legacy_enable_rfkill_int(priv);
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        if (iwl_legacy_get_debug_level(priv) & (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(priv,
-                        "End inta 0x%08x, enabled 0x%08x, fh 0x%08x, "
-                        "flags 0x%08lx\n", inta, inta_mask, inta_fh, flags);
-        }
-#endif
-}
-
-/*****************************************************************************
- *
- * sysfs attributes
- *
- *****************************************************************************/
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-
-/*
- * The following adds a new attribute to the sysfs representation
- * of this device driver (i.e. a new file in /sys/class/net/wlan0/device/)
- * used for controlling the debug level.
- *
- * See the level definitions in iwl for details.
- *
- * The debug_level being managed using sysfs below is a per device debug
- * level that is used instead of the global debug level if it (the per
- * device debug level) is set.
- */
-static ssize_t iwl4965_show_debug_level(struct device *d,
-                                struct device_attribute *attr, char *buf)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-        return sprintf(buf, "0x%08X\n", iwl_legacy_get_debug_level(priv));
-}
-static ssize_t iwl4965_store_debug_level(struct device *d,
-                                struct device_attribute *attr,
-                                 const char *buf, size_t count)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-        unsigned long val;
-        int ret;
-
-        ret = strict_strtoul(buf, 0, &val);
-        if (ret)
-                IWL_ERR(priv, "%s is not in hex or decimal form.\n", buf);
-        else {
-                priv->debug_level = val;
-                if (iwl_legacy_alloc_traffic_mem(priv))
-                        IWL_ERR(priv,
-                                "Not enough memory to generate traffic log\n");
-        }
-        return strnlen(buf, count);
-}
-
-static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO,
-                        iwl4965_show_debug_level, iwl4965_store_debug_level);
-
-
-#endif /* CONFIG_IWLWIFI_LEGACY_DEBUG */
-
-
-static ssize_t iwl4965_show_temperature(struct device *d,
-                                struct device_attribute *attr, char *buf)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-
-        if (!iwl_legacy_is_alive(priv))
-                return -EAGAIN;
-
-        return sprintf(buf, "%d\n", priv->temperature);
-}
-
-static DEVICE_ATTR(temperature, S_IRUGO, iwl4965_show_temperature, NULL);
-
-static ssize_t iwl4965_show_tx_power(struct device *d,
-                             struct device_attribute *attr, char *buf)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-
-        if (!iwl_legacy_is_ready_rf(priv))
-                return sprintf(buf, "off\n");
-        else
-                return sprintf(buf, "%d\n", priv->tx_power_user_lmt);
-}
-
-static ssize_t iwl4965_store_tx_power(struct device *d,
-                              struct device_attribute *attr,
-                              const char *buf, size_t count)
-{
-        struct iwl_priv *priv = dev_get_drvdata(d);
-        unsigned long val;
-        int ret;
-
-        ret = strict_strtoul(buf, 10, &val);
-        if (ret)
-                IWL_INFO(priv, "%s is not in decimal form.\n", buf);
-        else {
-                ret = iwl_legacy_set_tx_power(priv, val, false);
-                if (ret)
-                        IWL_ERR(priv, "failed setting tx power (0x%d).\n",
-                                ret);
-                else
-                        ret = count;
-        }
-        return ret;
-}
-
-static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO,
-                        iwl4965_show_tx_power, iwl4965_store_tx_power);
-
-static struct attribute *iwl_sysfs_entries[] = {
-        &dev_attr_temperature.attr,
-        &dev_attr_tx_power.attr,
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-        &dev_attr_debug_level.attr,
-#endif
-        NULL
-};
-
-static struct attribute_group iwl_attribute_group = {
-        .name = NULL,           /* put in device directory */
-        .attrs = iwl_sysfs_entries,
-};
-
-/******************************************************************************
- *
- * uCode download functions
- *
- ******************************************************************************/
-
-static void iwl4965_dealloc_ucode_pci(struct iwl_priv *priv)
-{
-        iwl_legacy_free_fw_desc(priv->pci_dev, &priv->ucode_code);
-        iwl_legacy_free_fw_desc(priv->pci_dev, &priv->ucode_data);
-        iwl_legacy_free_fw_desc(priv->pci_dev, &priv->ucode_data_backup);
-        iwl_legacy_free_fw_desc(priv->pci_dev, &priv->ucode_init);
-        iwl_legacy_free_fw_desc(priv->pci_dev, &priv->ucode_init_data);
-        iwl_legacy_free_fw_desc(priv->pci_dev, &priv->ucode_boot);
-}
-
-static void iwl4965_nic_start(struct iwl_priv *priv)
-{
-        /* Remove all resets to allow NIC to operate */
-        iwl_write32(priv, CSR_RESET, 0);
-}
-
-static void iwl4965_ucode_callback(const struct firmware *ucode_raw,
-                                        void *context);
-static int iwl4965_mac_setup_register(struct iwl_priv *priv,
-                                                u32 max_probe_length);
-
-static int __must_check iwl4965_request_firmware(struct iwl_priv *priv, bool first)
-{
-        const char *name_pre = priv->cfg->fw_name_pre;
-        char tag[8];
-
-        if (first) {
-                priv->fw_index = priv->cfg->ucode_api_max;
-                sprintf(tag, "%d", priv->fw_index);
-        } else {
-                priv->fw_index--;
-                sprintf(tag, "%d", priv->fw_index);
-        }
-
-        if (priv->fw_index < priv->cfg->ucode_api_min) {
-                IWL_ERR(priv, "no suitable firmware found!\n");
-                return -ENOENT;
-        }
-
-        sprintf(priv->firmware_name, "%s%s%s", name_pre, tag, ".ucode");
-
-        IWL_DEBUG_INFO(priv, "attempting to load firmware '%s'\n",
-                       priv->firmware_name);
-
-        return request_firmware_nowait(THIS_MODULE, 1, priv->firmware_name,
-                                       &priv->pci_dev->dev, GFP_KERNEL, priv,
-                                       iwl4965_ucode_callback);
-}
-
-struct iwl4965_firmware_pieces {
-        const void *inst, *data, *init, *init_data, *boot;
-        size_t inst_size, data_size, init_size, init_data_size, boot_size;
-};
-
-static int iwl4965_load_firmware(struct iwl_priv *priv,
-                                       const struct firmware *ucode_raw,
-                                       struct iwl4965_firmware_pieces *pieces)
-{
-        struct iwl_ucode_header *ucode = (void *)ucode_raw->data;
-        u32 api_ver, hdr_size;
-        const u8 *src;
-
-        priv->ucode_ver = le32_to_cpu(ucode->ver);
-        api_ver = IWL_UCODE_API(priv->ucode_ver);
-
-        switch (api_ver) {
-        default:
-        case 0:
-        case 1:
-        case 2:
-                hdr_size = 24;
-                if (ucode_raw->size < hdr_size) {
-                        IWL_ERR(priv, "File size too small!\n");
-                        return -EINVAL;
-                }
-                pieces->inst_size = le32_to_cpu(ucode->v1.inst_size);
-                pieces->data_size = le32_to_cpu(ucode->v1.data_size);
-                pieces->init_size = le32_to_cpu(ucode->v1.init_size);
-                pieces->init_data_size =
-                                le32_to_cpu(ucode->v1.init_data_size);
-                pieces->boot_size = le32_to_cpu(ucode->v1.boot_size);
-                src = ucode->v1.data;
-                break;
-        }
-
-        /* Verify size of file vs. image size info in file's header */
-        if (ucode_raw->size != hdr_size + pieces->inst_size +
-                                pieces->data_size + pieces->init_size +
-                                pieces->init_data_size + pieces->boot_size) {
-
-                IWL_ERR(priv,
-                        "uCode file size %d does not match expected size\n",
-                        (int)ucode_raw->size);
-                return -EINVAL;
-        }
-
-        pieces->inst = src;
-        src += pieces->inst_size;
-        pieces->data = src;
-        src += pieces->data_size;
-        pieces->init = src;
-        src += pieces->init_size;
-        pieces->init_data = src;
-        src += pieces->init_data_size;
-        pieces->boot = src;
-        src += pieces->boot_size;
-
-        return 0;
-}
-
-/**
- * iwl4965_ucode_callback - callback when firmware was loaded
- *
- * If loaded successfully, copies the firmware into buffers
- * for the card to fetch (via DMA).
- */
-static void
-iwl4965_ucode_callback(const struct firmware *ucode_raw, void *context)
-{
-        struct iwl_priv *priv = context;
-        struct iwl_ucode_header *ucode;
-        int err;
-        struct iwl4965_firmware_pieces pieces;
-        const unsigned int api_max = priv->cfg->ucode_api_max;
-        const unsigned int api_min = priv->cfg->ucode_api_min;
-        u32 api_ver;
-
-        u32 max_probe_length = 200;
-        u32 standard_phy_calibration_size =
-                        IWL_DEFAULT_STANDARD_PHY_CALIBRATE_TBL_SIZE;
-
-        memset(&pieces, 0, sizeof(pieces));
-
-        if (!ucode_raw) {
-                if (priv->fw_index <= priv->cfg->ucode_api_max)
-                        IWL_ERR(priv,
-                                "request for firmware file '%s' failed.\n",
-                                priv->firmware_name);
-                goto try_again;
-        }
-
-        IWL_DEBUG_INFO(priv, "Loaded firmware file '%s' (%zd bytes).\n",
-                       priv->firmware_name, ucode_raw->size);
-
-        /* Make sure that we got at least the API version number */
-        if (ucode_raw->size < 4) {
-                IWL_ERR(priv, "File size way too small!\n");
-                goto try_again;
-        }
-
-        /* Data from ucode file:  header followed by uCode images */
-        ucode = (struct iwl_ucode_header *)ucode_raw->data;
-
-        err = iwl4965_load_firmware(priv, ucode_raw, &pieces);
-
-        if (err)
-                goto try_again;
-
-        api_ver = IWL_UCODE_API(priv->ucode_ver);
-
-        /*
-         * api_ver should match the api version forming part of the
-         * firmware filename ... but we don't check for that and only rely
-         * on the API version read from firmware header from here on forward
-         */
-        if (api_ver < api_min || api_ver > api_max) {
-                IWL_ERR(priv,
-                        "Driver unable to support your firmware API. "
-                        "Driver supports v%u, firmware is v%u.\n",
-                        api_max, api_ver);
-                goto try_again;
-        }
-
-        if (api_ver != api_max)
-                IWL_ERR(priv,
-                        "Firmware has old API version. Expected v%u, "
-                        "got v%u. New firmware can be obtained "
-                        "from http://www.intellinuxwireless.org.\n",
-                        api_max, api_ver);
-
-        IWL_INFO(priv, "loaded firmware version %u.%u.%u.%u\n",
-                 IWL_UCODE_MAJOR(priv->ucode_ver),
-                 IWL_UCODE_MINOR(priv->ucode_ver),
-                 IWL_UCODE_API(priv->ucode_ver),
-                 IWL_UCODE_SERIAL(priv->ucode_ver));
-
-        snprintf(priv->hw->wiphy->fw_version,
-                 sizeof(priv->hw->wiphy->fw_version),
-                 "%u.%u.%u.%u",
-                 IWL_UCODE_MAJOR(priv->ucode_ver),
-                 IWL_UCODE_MINOR(priv->ucode_ver),
-                 IWL_UCODE_API(priv->ucode_ver),
-                 IWL_UCODE_SERIAL(priv->ucode_ver));
-
-        /*
-         * For any of the failures below (before allocating pci memory)
-         * we will try to load a version with a smaller API -- maybe the
-         * user just got a corrupted version of the latest API.
-         */
-
-        IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n",
-                       priv->ucode_ver);
-        IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %Zd\n",
-                       pieces.inst_size);
-        IWL_DEBUG_INFO(priv, "f/w package hdr runtime data size = %Zd\n",
-                       pieces.data_size);
-        IWL_DEBUG_INFO(priv, "f/w package hdr init inst size = %Zd\n",
-                       pieces.init_size);
-        IWL_DEBUG_INFO(priv, "f/w package hdr init data size = %Zd\n",
-                       pieces.init_data_size);
-        IWL_DEBUG_INFO(priv, "f/w package hdr boot inst size = %Zd\n",
-                       pieces.boot_size);
-
-        /* Verify that uCode images will fit in card's SRAM */
-        if (pieces.inst_size > priv->hw_params.max_inst_size) {
-                IWL_ERR(priv, "uCode instr len %Zd too large to fit in\n",
-                        pieces.inst_size);
-                goto try_again;
-        }
-
-        if (pieces.data_size > priv->hw_params.max_data_size) {
-                IWL_ERR(priv, "uCode data len %Zd too large to fit in\n",
-                        pieces.data_size);
-                goto try_again;
-        }
-
-        if (pieces.init_size > priv->hw_params.max_inst_size) {
-                IWL_ERR(priv, "uCode init instr len %Zd too large to fit in\n",
-                        pieces.init_size);
-                goto try_again;
-        }
-
-        if (pieces.init_data_size > priv->hw_params.max_data_size) {
-                IWL_ERR(priv, "uCode init data len %Zd too large to fit in\n",
-                        pieces.init_data_size);
-                goto try_again;
-        }
-
-        if (pieces.boot_size > priv->hw_params.max_bsm_size) {
-                IWL_ERR(priv, "uCode boot instr len %Zd too large to fit in\n",
-                        pieces.boot_size);
-                goto try_again;
-        }
-
-        /* Allocate ucode buffers for card's bus-master loading ... */
-
-        /* Runtime instructions and 2 copies of data:
-         * 1) unmodified from disk
-         * 2) backup cache for save/restore during power-downs */
-        priv->ucode_code.len = pieces.inst_size;
-        iwl_legacy_alloc_fw_desc(priv->pci_dev, &priv->ucode_code);
-
-        priv->ucode_data.len = pieces.data_size;
-        iwl_legacy_alloc_fw_desc(priv->pci_dev, &priv->ucode_data);
-
-        priv->ucode_data_backup.len = pieces.data_size;
-        iwl_legacy_alloc_fw_desc(priv->pci_dev, &priv->ucode_data_backup);
-
-        if (!priv->ucode_code.v_addr || !priv->ucode_data.v_addr ||
-            !priv->ucode_data_backup.v_addr)
-                goto err_pci_alloc;
-
-        /* Initialization instructions and data */
-        if (pieces.init_size && pieces.init_data_size) {
-                priv->ucode_init.len = pieces.init_size;
-                iwl_legacy_alloc_fw_desc(priv->pci_dev, &priv->ucode_init);
-
-                priv->ucode_init_data.len = pieces.init_data_size;
-                iwl_legacy_alloc_fw_desc(priv->pci_dev, &priv->ucode_init_data);
-
-                if (!priv->ucode_init.v_addr || !priv->ucode_init_data.v_addr)
-                        goto err_pci_alloc;
-        }
-
-        /* Bootstrap (instructions only, no data) */
-        if (pieces.boot_size) {
-                priv->ucode_boot.len = pieces.boot_size;
-                iwl_legacy_alloc_fw_desc(priv->pci_dev, &priv->ucode_boot);
-
-                if (!priv->ucode_boot.v_addr)
-                        goto err_pci_alloc;
-        }
-
-        /* Now that we can no longer fail, copy information */
-
-        priv->sta_key_max_num = STA_KEY_MAX_NUM;
-
-        /* Copy images into buffers for card's bus-master reads ... */
-
-        /* Runtime instructions (first block of data in file) */
-        IWL_DEBUG_INFO(priv, "Copying (but not loading) uCode instr len %Zd\n",
-                        pieces.inst_size);
-        memcpy(priv->ucode_code.v_addr, pieces.inst, pieces.inst_size);
-
-        IWL_DEBUG_INFO(priv, "uCode instr buf vaddr = 0x%p, paddr = 0x%08x\n",
-                priv->ucode_code.v_addr, (u32)priv->ucode_code.p_addr);
-
-        /*
-         * Runtime data
-         * NOTE:  Copy into backup buffer will be done in iwl_up()
-         */
-        IWL_DEBUG_INFO(priv, "Copying (but not loading) uCode data len %Zd\n",
-                        pieces.data_size);
-        memcpy(priv->ucode_data.v_addr, pieces.data, pieces.data_size);
-        memcpy(priv->ucode_data_backup.v_addr, pieces.data, pieces.data_size);
-
-        /* Initialization instructions */
-        if (pieces.init_size) {
-                IWL_DEBUG_INFO(priv,
-                                "Copying (but not loading) init instr len %Zd\n",
-                                pieces.init_size);
-                memcpy(priv->ucode_init.v_addr, pieces.init, pieces.init_size);
-        }
-
-        /* Initialization data */
-        if (pieces.init_data_size) {
-                IWL_DEBUG_INFO(priv,
-                                "Copying (but not loading) init data len %Zd\n",
-                               pieces.init_data_size);
-                memcpy(priv->ucode_init_data.v_addr, pieces.init_data,
-                       pieces.init_data_size);
-        }
-
-        /* Bootstrap instructions */
-        IWL_DEBUG_INFO(priv, "Copying (but not loading) boot instr len %Zd\n",
-                        pieces.boot_size);
-        memcpy(priv->ucode_boot.v_addr, pieces.boot, pieces.boot_size);
-
-        /*
-         * figure out the offset of chain noise reset and gain commands
-         * base on the size of standard phy calibration commands table size
-         */
-        priv->_4965.phy_calib_chain_noise_reset_cmd =
-                standard_phy_calibration_size;
-        priv->_4965.phy_calib_chain_noise_gain_cmd =
-                standard_phy_calibration_size + 1;
-
-        /**************************************************
-         * This is still part of probe() in a sense...
-         *
-         * 9. Setup and register with mac80211 and debugfs
-         **************************************************/
-        err = iwl4965_mac_setup_register(priv, max_probe_length);
-        if (err)
-                goto out_unbind;
-
-        err = iwl_legacy_dbgfs_register(priv, DRV_NAME);
-        if (err)
-                IWL_ERR(priv,
-                "failed to create debugfs files. Ignoring error: %d\n", err);
-
-        err = sysfs_create_group(&priv->pci_dev->dev.kobj,
-                                        &iwl_attribute_group);
-        if (err) {
-                IWL_ERR(priv, "failed to create sysfs device attributes\n");
-                goto out_unbind;
-        }
-
-        /* We have our copies now, allow OS release its copies */
-        release_firmware(ucode_raw);
-        complete(&priv->_4965.firmware_loading_complete);
-        return;
-
- try_again:
-        /* try next, if any */
-        if (iwl4965_request_firmware(priv, false))
-                goto out_unbind;
-        release_firmware(ucode_raw);
-        return;
-
- err_pci_alloc:
-        IWL_ERR(priv, "failed to allocate pci memory\n");
-        iwl4965_dealloc_ucode_pci(priv);
- out_unbind:
-        complete(&priv->_4965.firmware_loading_complete);
-        device_release_driver(&priv->pci_dev->dev);
-        release_firmware(ucode_raw);
-}
-
-static const char * const desc_lookup_text[] = {
-        "OK",
-        "FAIL",
-        "BAD_PARAM",
-        "BAD_CHECKSUM",
-        "NMI_INTERRUPT_WDG",
-        "SYSASSERT",
-        "FATAL_ERROR",
-        "BAD_COMMAND",
-        "HW_ERROR_TUNE_LOCK",
-        "HW_ERROR_TEMPERATURE",
-        "ILLEGAL_CHAN_FREQ",
-        "VCC_NOT_STABLE",
-        "FH_ERROR",
-        "NMI_INTERRUPT_HOST",
-        "NMI_INTERRUPT_ACTION_PT",
-        "NMI_INTERRUPT_UNKNOWN",
-        "UCODE_VERSION_MISMATCH",
-        "HW_ERROR_ABS_LOCK",
-        "HW_ERROR_CAL_LOCK_FAIL",
-        "NMI_INTERRUPT_INST_ACTION_PT",
-        "NMI_INTERRUPT_DATA_ACTION_PT",
-        "NMI_TRM_HW_ER",
-        "NMI_INTERRUPT_TRM",
-        "NMI_INTERRUPT_BREAK_POINT",
-        "DEBUG_0",
-        "DEBUG_1",
-        "DEBUG_2",
-        "DEBUG_3",
-};
-
-static struct { char *name; u8 num; } advanced_lookup[] = {
-        { "NMI_INTERRUPT_WDG", 0x34 },
-        { "SYSASSERT", 0x35 },
-        { "UCODE_VERSION_MISMATCH", 0x37 },
-        { "BAD_COMMAND", 0x38 },
-        { "NMI_INTERRUPT_DATA_ACTION_PT", 0x3C },
-        { "FATAL_ERROR", 0x3D },
-        { "NMI_TRM_HW_ERR", 0x46 },
-        { "NMI_INTERRUPT_TRM", 0x4C },
-        { "NMI_INTERRUPT_BREAK_POINT", 0x54 },
-        { "NMI_INTERRUPT_WDG_RXF_FULL", 0x5C },
-        { "NMI_INTERRUPT_WDG_NO_RBD_RXF_FULL", 0x64 },
-        { "NMI_INTERRUPT_HOST", 0x66 },
-        { "NMI_INTERRUPT_ACTION_PT", 0x7C },
-        { "NMI_INTERRUPT_UNKNOWN", 0x84 },
-        { "NMI_INTERRUPT_INST_ACTION_PT", 0x86 },
-        { "ADVANCED_SYSASSERT", 0 },
-};
-
-static const char *iwl4965_desc_lookup(u32 num)
-{
-        int i;
-        int max = ARRAY_SIZE(desc_lookup_text);
-
-        if (num < max)
-                return desc_lookup_text[num];
-
-        max = ARRAY_SIZE(advanced_lookup) - 1;
-        for (i = 0; i < max; i++) {
-                if (advanced_lookup[i].num == num)
-                        break;
-        }
-        return advanced_lookup[i].name;
-}
-
-#define ERROR_START_OFFSET  (1 * sizeof(u32))
-#define ERROR_ELEM_SIZE     (7 * sizeof(u32))
-
-void iwl4965_dump_nic_error_log(struct iwl_priv *priv)
-{
-        u32 data2, line;
-        u32 desc, time, count, base, data1;
-        u32 blink1, blink2, ilink1, ilink2;
-        u32 pc, hcmd;
-
-        if (priv->ucode_type == UCODE_INIT) {
-                base = le32_to_cpu(priv->card_alive_init.error_event_table_ptr);
-        } else {
-                base = le32_to_cpu(priv->card_alive.error_event_table_ptr);
-        }
-
-        if (!priv->cfg->ops->lib->is_valid_rtc_data_addr(base)) {
-                IWL_ERR(priv,
-                        "Not valid error log pointer 0x%08X for %s uCode\n",
-                        base, (priv->ucode_type == UCODE_INIT) ? "Init" : "RT");
-                return;
-        }
-
-        count = iwl_legacy_read_targ_mem(priv, base);
-
-        if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) {
-                IWL_ERR(priv, "Start IWL Error Log Dump:\n");
-                IWL_ERR(priv, "Status: 0x%08lX, count: %d\n",
-                        priv->status, count);
-        }
-
-        desc = iwl_legacy_read_targ_mem(priv, base + 1 * sizeof(u32));
-        priv->isr_stats.err_code = desc;
-        pc = iwl_legacy_read_targ_mem(priv, base + 2 * sizeof(u32));
-        blink1 = iwl_legacy_read_targ_mem(priv, base + 3 * sizeof(u32));
-        blink2 = iwl_legacy_read_targ_mem(priv, base + 4 * sizeof(u32));
-        ilink1 = iwl_legacy_read_targ_mem(priv, base + 5 * sizeof(u32));
-        ilink2 = iwl_legacy_read_targ_mem(priv, base + 6 * sizeof(u32));
-        data1 = iwl_legacy_read_targ_mem(priv, base + 7 * sizeof(u32));
-        data2 = iwl_legacy_read_targ_mem(priv, base + 8 * sizeof(u32));
-        line = iwl_legacy_read_targ_mem(priv, base + 9 * sizeof(u32));
-        time = iwl_legacy_read_targ_mem(priv, base + 11 * sizeof(u32));
-        hcmd = iwl_legacy_read_targ_mem(priv, base + 22 * sizeof(u32));
-
-        trace_iwlwifi_legacy_dev_ucode_error(priv, desc,
-                                        time, data1, data2, line,
-                                      blink1, blink2, ilink1, ilink2);
-
-        IWL_ERR(priv, "Desc                                  Time       "
-                "data1      data2      line\n");
-        IWL_ERR(priv, "%-28s (0x%04X) %010u 0x%08X 0x%08X %u\n",
-                iwl4965_desc_lookup(desc), desc, time, data1, data2, line);
-        IWL_ERR(priv, "pc      blink1  blink2  ilink1  ilink2  hcmd\n");
-        IWL_ERR(priv, "0x%05X 0x%05X 0x%05X 0x%05X 0x%05X 0x%05X\n",
-                pc, blink1, blink2, ilink1, ilink2, hcmd);
-}
-
-static void iwl4965_rf_kill_ct_config(struct iwl_priv *priv)
-{
-        struct iwl_ct_kill_config cmd;
-        unsigned long flags;
-        int ret = 0;
-
-        spin_lock_irqsave(&priv->lock, flags);
-        iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR,
-                    CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        cmd.critical_temperature_R =
-                cpu_to_le32(priv->hw_params.ct_kill_threshold);
-
-        ret = iwl_legacy_send_cmd_pdu(priv, REPLY_CT_KILL_CONFIG_CMD,
-                               sizeof(cmd), &cmd);
-        if (ret)
-                IWL_ERR(priv, "REPLY_CT_KILL_CONFIG_CMD failed\n");
-        else
-                IWL_DEBUG_INFO(priv, "REPLY_CT_KILL_CONFIG_CMD "
-                                "succeeded, "
-                                "critical temperature is %d\n",
-                                priv->hw_params.ct_kill_threshold);
-}
-
-static const s8 default_queue_to_tx_fifo[] = {
-        IWL_TX_FIFO_VO,
-        IWL_TX_FIFO_VI,
-        IWL_TX_FIFO_BE,
-        IWL_TX_FIFO_BK,
-        IWL49_CMD_FIFO_NUM,
-        IWL_TX_FIFO_UNUSED,
-        IWL_TX_FIFO_UNUSED,
-};
-
-static int iwl4965_alive_notify(struct iwl_priv *priv)
-{
-        u32 a;
-        unsigned long flags;
-        int i, chan;
-        u32 reg_val;
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        /* Clear 4965's internal Tx Scheduler data base */
-        priv->scd_base_addr = iwl_legacy_read_prph(priv,
-                                        IWL49_SCD_SRAM_BASE_ADDR);
-        a = priv->scd_base_addr + IWL49_SCD_CONTEXT_DATA_OFFSET;
-        for (; a < priv->scd_base_addr + IWL49_SCD_TX_STTS_BITMAP_OFFSET; a += 4)
-                iwl_legacy_write_targ_mem(priv, a, 0);
-        for (; a < priv->scd_base_addr + IWL49_SCD_TRANSLATE_TBL_OFFSET; a += 4)
-                iwl_legacy_write_targ_mem(priv, a, 0);
-        for (; a < priv->scd_base_addr +
-               IWL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(priv->hw_params.max_txq_num); a += 4)
-                iwl_legacy_write_targ_mem(priv, a, 0);
-
-        /* Tel 4965 where to find Tx byte count tables */
-        iwl_legacy_write_prph(priv, IWL49_SCD_DRAM_BASE_ADDR,
-                        priv->scd_bc_tbls.dma >> 10);
-
-        /* Enable DMA channel */
-        for (chan = 0; chan < FH49_TCSR_CHNL_NUM ; chan++)
-                iwl_legacy_write_direct32(priv,
-                                FH_TCSR_CHNL_TX_CONFIG_REG(chan),
-                                FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE |
-                                FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE);
-
-        /* Update FH chicken bits */
-        reg_val = iwl_legacy_read_direct32(priv, FH_TX_CHICKEN_BITS_REG);
-        iwl_legacy_write_direct32(priv, FH_TX_CHICKEN_BITS_REG,
-                           reg_val | FH_TX_CHICKEN_BITS_SCD_AUTO_RETRY_EN);
-
-        /* Disable chain mode for all queues */
-        iwl_legacy_write_prph(priv, IWL49_SCD_QUEUECHAIN_SEL, 0);
-
-        /* Initialize each Tx queue (including the command queue) */
-        for (i = 0; i < priv->hw_params.max_txq_num; i++) {
-
-                /* TFD circular buffer read/write indexes */
-                iwl_legacy_write_prph(priv, IWL49_SCD_QUEUE_RDPTR(i), 0);
-                iwl_legacy_write_direct32(priv, HBUS_TARG_WRPTR, 0 | (i << 8));
-
-                /* Max Tx Window size for Scheduler-ACK mode */
-                iwl_legacy_write_targ_mem(priv, priv->scd_base_addr +
-                                IWL49_SCD_CONTEXT_QUEUE_OFFSET(i),
-                                (SCD_WIN_SIZE <<
-                                IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS) &
-                                IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK);
-
-                /* Frame limit */
-                iwl_legacy_write_targ_mem(priv, priv->scd_base_addr +
-                                IWL49_SCD_CONTEXT_QUEUE_OFFSET(i) +
-                                sizeof(u32),
-                                (SCD_FRAME_LIMIT <<
-                                IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) &
-                                IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK);
-
-        }
-        iwl_legacy_write_prph(priv, IWL49_SCD_INTERRUPT_MASK,
-                                 (1 << priv->hw_params.max_txq_num) - 1);
-
-        /* Activate all Tx DMA/FIFO channels */
-        iwl4965_txq_set_sched(priv, IWL_MASK(0, 6));
-
-        iwl4965_set_wr_ptrs(priv, IWL_DEFAULT_CMD_QUEUE_NUM, 0);
-
-        /* make sure all queue are not stopped */
-        memset(&priv->queue_stopped[0], 0, sizeof(priv->queue_stopped));
-        for (i = 0; i < 4; i++)
-                atomic_set(&priv->queue_stop_count[i], 0);
-
-        /* reset to 0 to enable all the queue first */
-        priv->txq_ctx_active_msk = 0;
-        /* Map each Tx/cmd queue to its corresponding fifo */
-        BUILD_BUG_ON(ARRAY_SIZE(default_queue_to_tx_fifo) != 7);
-
-        for (i = 0; i < ARRAY_SIZE(default_queue_to_tx_fifo); i++) {
-                int ac = default_queue_to_tx_fifo[i];
-
-                iwl_txq_ctx_activate(priv, i);
-
-                if (ac == IWL_TX_FIFO_UNUSED)
-                        continue;
-
-                iwl4965_tx_queue_set_status(priv, &priv->txq[i], ac, 0);
-        }
-
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        return 0;
-}
-
-/**
- * iwl4965_alive_start - called after REPLY_ALIVE notification received
- *                   from protocol/runtime uCode (initialization uCode's
- *                   Alive gets handled by iwl_init_alive_start()).
- */
-static void iwl4965_alive_start(struct iwl_priv *priv)
-{
-        int ret = 0;
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-
-        IWL_DEBUG_INFO(priv, "Runtime Alive received.\n");
-
-        if (priv->card_alive.is_valid != UCODE_VALID_OK) {
-                /* We had an error bringing up the hardware, so take it
-                 * all the way back down so we can try again */
-                IWL_DEBUG_INFO(priv, "Alive failed.\n");
-                goto restart;
-        }
-
-        /* Initialize uCode has loaded Runtime uCode ... verify inst image.
-         * This is a paranoid check, because we would not have gotten the
-         * "runtime" alive if code weren't properly loaded.  */
-        if (iwl4965_verify_ucode(priv)) {
-                /* Runtime instruction load was bad;
-                 * take it all the way back down so we can try again */
-                IWL_DEBUG_INFO(priv, "Bad runtime uCode load.\n");
-                goto restart;
-        }
-
-        ret = iwl4965_alive_notify(priv);
-        if (ret) {
-                IWL_WARN(priv,
-                        "Could not complete ALIVE transition [ntf]: %d\n", ret);
-                goto restart;
-        }
-
-
-        /* After the ALIVE response, we can send host commands to the uCode */
-        set_bit(STATUS_ALIVE, &priv->status);
-
-        /* Enable watchdog to monitor the driver tx queues */
-        iwl_legacy_setup_watchdog(priv);
-
-        if (iwl_legacy_is_rfkill(priv))
-                return;
-
-        ieee80211_wake_queues(priv->hw);
-
-        priv->active_rate = IWL_RATES_MASK;
-
-        if (iwl_legacy_is_associated_ctx(ctx)) {
-                struct iwl_legacy_rxon_cmd *active_rxon =
-                                (struct iwl_legacy_rxon_cmd *)&ctx->active;
-                /* apply any changes in staging */
-                ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
-                active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
-        } else {
-                struct iwl_rxon_context *tmp;
-                /* Initialize our rx_config data */
-                for_each_context(priv, tmp)
-                        iwl_legacy_connection_init_rx_config(priv, tmp);
-
-                if (priv->cfg->ops->hcmd->set_rxon_chain)
-                        priv->cfg->ops->hcmd->set_rxon_chain(priv, ctx);
-        }
-
-        /* Configure bluetooth coexistence if enabled */
-        iwl_legacy_send_bt_config(priv);
-
-        iwl4965_reset_run_time_calib(priv);
-
-        set_bit(STATUS_READY, &priv->status);
-
-        /* Configure the adapter for unassociated operation */
-        iwl_legacy_commit_rxon(priv, ctx);
-
-        /* At this point, the NIC is initialized and operational */
-        iwl4965_rf_kill_ct_config(priv);
-
-        IWL_DEBUG_INFO(priv, "ALIVE processing complete.\n");
-        wake_up(&priv->wait_command_queue);
-
-        iwl_legacy_power_update_mode(priv, true);
-        IWL_DEBUG_INFO(priv, "Updated power mode\n");
-
-        return;
-
- restart:
-        queue_work(priv->workqueue, &priv->restart);
-}
-
-static void iwl4965_cancel_deferred_work(struct iwl_priv *priv);
-
-static void __iwl4965_down(struct iwl_priv *priv)
-{
-        unsigned long flags;
-        int exit_pending;
-
-        IWL_DEBUG_INFO(priv, DRV_NAME " is going down\n");
-
-        iwl_legacy_scan_cancel_timeout(priv, 200);
-
-        exit_pending = test_and_set_bit(STATUS_EXIT_PENDING, &priv->status);
-
-        /* Stop TX queues watchdog. We need to have STATUS_EXIT_PENDING bit set
-         * to prevent rearm timer */
-        del_timer_sync(&priv->watchdog);
-
-        iwl_legacy_clear_ucode_stations(priv, NULL);
-        iwl_legacy_dealloc_bcast_stations(priv);
-        iwl_legacy_clear_driver_stations(priv);
-
-        /* Unblock any waiting calls */
-        wake_up_all(&priv->wait_command_queue);
-
-        /* Wipe out the EXIT_PENDING status bit if we are not actually
-         * exiting the module */
-        if (!exit_pending)
-                clear_bit(STATUS_EXIT_PENDING, &priv->status);
-
-        /* stop and reset the on-board processor */
-        iwl_write32(priv, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
-
-        /* tell the device to stop sending interrupts */
-        spin_lock_irqsave(&priv->lock, flags);
-        iwl_legacy_disable_interrupts(priv);
-        spin_unlock_irqrestore(&priv->lock, flags);
-        iwl4965_synchronize_irq(priv);
-
-        if (priv->mac80211_registered)
-                ieee80211_stop_queues(priv->hw);
-
-        /* If we have not previously called iwl_init() then
-         * clear all bits but the RF Kill bit and return */
-        if (!iwl_legacy_is_init(priv)) {
-                priv->status = test_bit(STATUS_RF_KILL_HW, &priv->status) <<
-                                        STATUS_RF_KILL_HW |
-                               test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<
-                                        STATUS_GEO_CONFIGURED |
-                               test_bit(STATUS_EXIT_PENDING, &priv->status) <<
-                                        STATUS_EXIT_PENDING;
-                goto exit;
-        }
-
-        /* ...otherwise clear out all the status bits but the RF Kill
-         * bit and continue taking the NIC down. */
-        priv->status &= test_bit(STATUS_RF_KILL_HW, &priv->status) <<
-                                STATUS_RF_KILL_HW |
-                        test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<
-                                STATUS_GEO_CONFIGURED |
-                        test_bit(STATUS_FW_ERROR, &priv->status) <<
-                                STATUS_FW_ERROR |
-                       test_bit(STATUS_EXIT_PENDING, &priv->status) <<
-                                STATUS_EXIT_PENDING;
-
-        iwl4965_txq_ctx_stop(priv);
-        iwl4965_rxq_stop(priv);
-
-        /* Power-down device's busmaster DMA clocks */
-        iwl_legacy_write_prph(priv, APMG_CLK_DIS_REG, APMG_CLK_VAL_DMA_CLK_RQT);
-        udelay(5);
-
-        /* Make sure (redundant) we've released our request to stay awake */
-        iwl_legacy_clear_bit(priv, CSR_GP_CNTRL,
-                                CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-
-        /* Stop the device, and put it in low power state */
-        iwl_legacy_apm_stop(priv);
-
- exit:
-        memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp));
-
-        dev_kfree_skb(priv->beacon_skb);
-        priv->beacon_skb = NULL;
-
-        /* clear out any free frames */
-        iwl4965_clear_free_frames(priv);
-}
-
-static void iwl4965_down(struct iwl_priv *priv)
-{
-        mutex_lock(&priv->mutex);
-        __iwl4965_down(priv);
-        mutex_unlock(&priv->mutex);
-
-        iwl4965_cancel_deferred_work(priv);
-}
-
-#define HW_READY_TIMEOUT (50)
-
-static int iwl4965_set_hw_ready(struct iwl_priv *priv)
-{
-        int ret = 0;
-
-        iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                CSR_HW_IF_CONFIG_REG_BIT_NIC_READY);
-
-        /* See if we got it */
-        ret = iwl_poll_bit(priv, CSR_HW_IF_CONFIG_REG,
-                                CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
-                                CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
-                                HW_READY_TIMEOUT);
-        if (ret != -ETIMEDOUT)
-                priv->hw_ready = true;
-        else
-                priv->hw_ready = false;
-
-        IWL_DEBUG_INFO(priv, "hardware %s\n",
-                      (priv->hw_ready == 1) ? "ready" : "not ready");
-        return ret;
-}
-
-static int iwl4965_prepare_card_hw(struct iwl_priv *priv)
-{
-        int ret = 0;
-
-        IWL_DEBUG_INFO(priv, "iwl4965_prepare_card_hw enter\n");
-
-        ret = iwl4965_set_hw_ready(priv);
-        if (priv->hw_ready)
-                return ret;
-
-        /* If HW is not ready, prepare the conditions to check again */
-        iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,
-                        CSR_HW_IF_CONFIG_REG_PREPARE);
-
-        ret = iwl_poll_bit(priv, CSR_HW_IF_CONFIG_REG,
-                        ~CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE,
-                        CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE, 150000);
-
-        /* HW should be ready by now, check again. */
-        if (ret != -ETIMEDOUT)
-                iwl4965_set_hw_ready(priv);
-
-        return ret;
-}
-
-#define MAX_HW_RESTARTS 5
-
-static int __iwl4965_up(struct iwl_priv *priv)
-{
-        struct iwl_rxon_context *ctx;
-        int i;
-        int ret;
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
-                IWL_WARN(priv, "Exit pending; will not bring the NIC up\n");
-                return -EIO;
-        }
-
-        if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) {
-                IWL_ERR(priv, "ucode not available for device bringup\n");
-                return -EIO;
-        }
-
-        for_each_context(priv, ctx) {
-                ret = iwl4965_alloc_bcast_station(priv, ctx);
-                if (ret) {
-                        iwl_legacy_dealloc_bcast_stations(priv);
-                        return ret;
-                }
-        }
-
-        iwl4965_prepare_card_hw(priv);
-
-        if (!priv->hw_ready) {
-                IWL_WARN(priv, "Exit HW not ready\n");
-                return -EIO;
-        }
-
-        /* If platform's RF_KILL switch is NOT set to KILL */
-        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 (iwl_legacy_is_rfkill(priv)) {
-                wiphy_rfkill_set_hw_state(priv->hw->wiphy, true);
-
-                iwl_legacy_enable_interrupts(priv);
-                IWL_WARN(priv, "Radio disabled by HW RF Kill switch\n");
-                return 0;
-        }
-
-        iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
-
-        /* must be initialised before iwl_hw_nic_init */
-        priv->cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;
-
-        ret = iwl4965_hw_nic_init(priv);
-        if (ret) {
-                IWL_ERR(priv, "Unable to init nic\n");
-                return ret;
-        }
-
-        /* make sure rfkill handshake bits are cleared */
-        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 */
-        iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
-        iwl_legacy_enable_interrupts(priv);
-
-        /* really make sure rfkill handshake bits are cleared */
-        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
-         * data SRAM for a clean start when the runtime program first loads. */
-        memcpy(priv->ucode_data_backup.v_addr, priv->ucode_data.v_addr,
-               priv->ucode_data.len);
-
-        for (i = 0; i < MAX_HW_RESTARTS; i++) {
-
-                /* load bootstrap state machine,
-                 * load bootstrap program into processor's memory,
-                 * prepare to load the "initialize" uCode */
-                ret = priv->cfg->ops->lib->load_ucode(priv);
-
-                if (ret) {
-                        IWL_ERR(priv, "Unable to set up bootstrap uCode: %d\n",
-                                ret);
-                        continue;
-                }
-
-                /* start card; "initialize" will load runtime ucode */
-                iwl4965_nic_start(priv);
-
-                IWL_DEBUG_INFO(priv, DRV_NAME " is coming up\n");
-
-                return 0;
-        }
-
-        set_bit(STATUS_EXIT_PENDING, &priv->status);
-        __iwl4965_down(priv);
-        clear_bit(STATUS_EXIT_PENDING, &priv->status);
-
-        /* tried to restart and config the device for as long as our
-         * patience could withstand */
-        IWL_ERR(priv, "Unable to initialize device after %d attempts.\n", i);
-        return -EIO;
-}
-
-
-/*****************************************************************************
- *
- * Workqueue callbacks
- *
- *****************************************************************************/
-
-static void iwl4965_bg_init_alive_start(struct work_struct *data)
-{
-        struct iwl_priv *priv =
-            container_of(data, struct iwl_priv, init_alive_start.work);
-
-        mutex_lock(&priv->mutex);
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                goto out;
-
-        priv->cfg->ops->lib->init_alive_start(priv);
-out:
-        mutex_unlock(&priv->mutex);
-}
-
-static void iwl4965_bg_alive_start(struct work_struct *data)
-{
-        struct iwl_priv *priv =
-            container_of(data, struct iwl_priv, alive_start.work);
-
-        mutex_lock(&priv->mutex);
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                goto out;
-
-        iwl4965_alive_start(priv);
-out:
-        mutex_unlock(&priv->mutex);
-}
-
-static void iwl4965_bg_run_time_calib_work(struct work_struct *work)
-{
-        struct iwl_priv *priv = container_of(work, struct iwl_priv,
-                        run_time_calib_work);
-
-        mutex_lock(&priv->mutex);
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status) ||
-            test_bit(STATUS_SCANNING, &priv->status)) {
-                mutex_unlock(&priv->mutex);
-                return;
-        }
-
-        if (priv->start_calib) {
-                iwl4965_chain_noise_calibration(priv,
-                                (void *)&priv->_4965.statistics);
-                iwl4965_sensitivity_calibration(priv,
-                                (void *)&priv->_4965.statistics);
-        }
-
-        mutex_unlock(&priv->mutex);
-}
-
-static void iwl4965_bg_restart(struct work_struct *data)
-{
-        struct iwl_priv *priv = container_of(data, struct iwl_priv, restart);
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
-
-        if (test_and_clear_bit(STATUS_FW_ERROR, &priv->status)) {
-                struct iwl_rxon_context *ctx;
-
-                mutex_lock(&priv->mutex);
-                for_each_context(priv, ctx)
-                        ctx->vif = NULL;
-                priv->is_open = 0;
-
-                __iwl4965_down(priv);
-
-                mutex_unlock(&priv->mutex);
-                iwl4965_cancel_deferred_work(priv);
-                ieee80211_restart_hw(priv->hw);
-        } else {
-                iwl4965_down(priv);
-
-                mutex_lock(&priv->mutex);
-                if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
-                        mutex_unlock(&priv->mutex);
-                        return;
-                }
-
-                __iwl4965_up(priv);
-                mutex_unlock(&priv->mutex);
-        }
-}
-
-static void iwl4965_bg_rx_replenish(struct work_struct *data)
-{
-        struct iwl_priv *priv =
-            container_of(data, struct iwl_priv, rx_replenish);
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                return;
-
-        mutex_lock(&priv->mutex);
-        iwl4965_rx_replenish(priv);
-        mutex_unlock(&priv->mutex);
-}
-
-/*****************************************************************************
- *
- * mac80211 entry point functions
- *
- *****************************************************************************/
-
-#define UCODE_READY_TIMEOUT     (4 * HZ)
-
-/*
- * Not a mac80211 entry point function, but it fits in with all the
- * other mac80211 functions grouped here.
- */
-static int iwl4965_mac_setup_register(struct iwl_priv *priv,
-                                  u32 max_probe_length)
-{
-        int ret;
-        struct ieee80211_hw *hw = priv->hw;
-        struct iwl_rxon_context *ctx;
-
-        hw->rate_control_algorithm = "iwl-4965-rs";
-
-        /* Tell mac80211 our characteristics */
-        hw->flags = IEEE80211_HW_SIGNAL_DBM |
-                    IEEE80211_HW_AMPDU_AGGREGATION |
-                    IEEE80211_HW_NEED_DTIM_PERIOD |
-                    IEEE80211_HW_SPECTRUM_MGMT |
-                    IEEE80211_HW_REPORTS_TX_ACK_STATUS;
-
-        if (priv->cfg->sku & IWL_SKU_N)
-                hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |
-                             IEEE80211_HW_SUPPORTS_STATIC_SMPS;
-
-        hw->sta_data_size = sizeof(struct iwl_station_priv);
-        hw->vif_data_size = sizeof(struct iwl_vif_priv);
-
-        for_each_context(priv, ctx) {
-                hw->wiphy->interface_modes |= ctx->interface_modes;
-                hw->wiphy->interface_modes |= ctx->exclusive_interface_modes;
-        }
-
-        hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
-                            WIPHY_FLAG_DISABLE_BEACON_HINTS;
-
-        /*
-         * For now, disable PS by default because it affects
-         * RX performance significantly.
-         */
-        hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
-
-        hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX;
-        /* we create the 802.11 header and a zero-length SSID element */
-        hw->wiphy->max_scan_ie_len = max_probe_length - 24 - 2;
-
-        /* Default value; 4 EDCA QOS priorities */
-        hw->queues = 4;
-
-        hw->max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL;
-
-        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];
-
-        iwl_legacy_leds_init(priv);
-
-        ret = ieee80211_register_hw(priv->hw);
-        if (ret) {
-                IWL_ERR(priv, "Failed to register hw (error %d)\n", ret);
-                return ret;
-        }
-        priv->mac80211_registered = 1;
-
-        return 0;
-}
-
-
-int iwl4965_mac_start(struct ieee80211_hw *hw)
-{
-        struct iwl_priv *priv = hw->priv;
-        int ret;
-
-        IWL_DEBUG_MAC80211(priv, "enter\n");
-
-        /* we should be verifying the device is ready to be opened */
-        mutex_lock(&priv->mutex);
-        ret = __iwl4965_up(priv);
-        mutex_unlock(&priv->mutex);
-
-        if (ret)
-                return ret;
-
-        if (iwl_legacy_is_rfkill(priv))
-                goto out;
-
-        IWL_DEBUG_INFO(priv, "Start UP work done.\n");
-
-        /* Wait for START_ALIVE from Run Time ucode. Otherwise callbacks from
-         * mac80211 will not be run successfully. */
-        ret = wait_event_timeout(priv->wait_command_queue,
-                        test_bit(STATUS_READY, &priv->status),
-                        UCODE_READY_TIMEOUT);
-        if (!ret) {
-                if (!test_bit(STATUS_READY, &priv->status)) {
-                        IWL_ERR(priv, "START_ALIVE timeout after %dms.\n",
-                                jiffies_to_msecs(UCODE_READY_TIMEOUT));
-                        return -ETIMEDOUT;
-                }
-        }
-
-        iwl4965_led_enable(priv);
-
-out:
-        priv->is_open = 1;
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-        return 0;
-}
-
-void iwl4965_mac_stop(struct ieee80211_hw *hw)
-{
-        struct iwl_priv *priv = hw->priv;
-
-        IWL_DEBUG_MAC80211(priv, "enter\n");
-
-        if (!priv->is_open)
-                return;
-
-        priv->is_open = 0;
-
-        iwl4965_down(priv);
-
-        flush_workqueue(priv->workqueue);
-
-        /* User space software may expect getting rfkill changes
-         * even if interface is down */
-        iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
-        iwl_legacy_enable_rfkill_int(priv);
-
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-}
-
-void iwl4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
-{
-        struct iwl_priv *priv = hw->priv;
-
-        IWL_DEBUG_MACDUMP(priv, "enter\n");
-
-        IWL_DEBUG_TX(priv, "dev->xmit(%d bytes) at rate 0x%02x\n", skb->len,
-                     ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate);
-
-        if (iwl4965_tx_skb(priv, skb))
-                dev_kfree_skb_any(skb);
-
-        IWL_DEBUG_MACDUMP(priv, "leave\n");
-}
-
-void iwl4965_mac_update_tkip_key(struct ieee80211_hw *hw,
-                                struct ieee80211_vif *vif,
-                                struct ieee80211_key_conf *keyconf,
-                                struct ieee80211_sta *sta,
-                                u32 iv32, u16 *phase1key)
-{
-        struct iwl_priv *priv = hw->priv;
-        struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
-
-        IWL_DEBUG_MAC80211(priv, "enter\n");
-
-        iwl4965_update_tkip_key(priv, vif_priv->ctx, keyconf, sta,
-                            iv32, phase1key);
-
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-}
-
-int iwl4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
-                       struct ieee80211_vif *vif, struct ieee80211_sta *sta,
-                       struct ieee80211_key_conf *key)
-{
-        struct iwl_priv *priv = hw->priv;
-        struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
-        struct iwl_rxon_context *ctx = vif_priv->ctx;
-        int ret;
-        u8 sta_id;
-        bool is_default_wep_key = false;
-
-        IWL_DEBUG_MAC80211(priv, "enter\n");
-
-        if (priv->cfg->mod_params->sw_crypto) {
-                IWL_DEBUG_MAC80211(priv, "leave - hwcrypto disabled\n");
-                return -EOPNOTSUPP;
-        }
-
-        sta_id = iwl_legacy_sta_id_or_broadcast(priv, vif_priv->ctx, sta);
-        if (sta_id == IWL_INVALID_STATION)
-                return -EINVAL;
-
-        mutex_lock(&priv->mutex);
-        iwl_legacy_scan_cancel_timeout(priv, 100);
-
-        /*
-         * 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->cipher == WLAN_CIPHER_SUITE_WEP40 ||
-             key->cipher == WLAN_CIPHER_SUITE_WEP104) &&
-            !sta) {
-                if (cmd == SET_KEY)
-                        is_default_wep_key = !ctx->key_mapping_keys;
-                else
-                        is_default_wep_key =
-                                        (key->hw_key_idx == HW_KEY_DEFAULT);
-        }
-
-        switch (cmd) {
-        case SET_KEY:
-                if (is_default_wep_key)
-                        ret = iwl4965_set_default_wep_key(priv,
-                                                        vif_priv->ctx, key);
-                else
-                        ret = iwl4965_set_dynamic_key(priv, vif_priv->ctx,
-                                                  key, sta_id);
-
-                IWL_DEBUG_MAC80211(priv, "enable hwcrypto key\n");
-                break;
-        case DISABLE_KEY:
-                if (is_default_wep_key)
-                        ret = iwl4965_remove_default_wep_key(priv, ctx, key);
-                else
-                        ret = iwl4965_remove_dynamic_key(priv, ctx,
-                                                        key, sta_id);
-
-                IWL_DEBUG_MAC80211(priv, "disable hwcrypto key\n");
-                break;
-        default:
-                ret = -EINVAL;
-        }
-
-        mutex_unlock(&priv->mutex);
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-
-        return ret;
-}
-
-int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,
-                            struct ieee80211_vif *vif,
-                            enum ieee80211_ampdu_mlme_action action,
-                            struct ieee80211_sta *sta, u16 tid, u16 *ssn,
-                            u8 buf_size)
-{
-        struct iwl_priv *priv = hw->priv;
-        int ret = -EINVAL;
-
-        IWL_DEBUG_HT(priv, "A-MPDU action on addr %pM tid %d\n",
-                     sta->addr, tid);
-
-        if (!(priv->cfg->sku & IWL_SKU_N))
-                return -EACCES;
-
-        mutex_lock(&priv->mutex);
-
-        switch (action) {
-        case IEEE80211_AMPDU_RX_START:
-                IWL_DEBUG_HT(priv, "start Rx\n");
-                ret = iwl4965_sta_rx_agg_start(priv, sta, tid, *ssn);
-                break;
-        case IEEE80211_AMPDU_RX_STOP:
-                IWL_DEBUG_HT(priv, "stop Rx\n");
-                ret = iwl4965_sta_rx_agg_stop(priv, sta, tid);
-                if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                        ret = 0;
-                break;
-        case IEEE80211_AMPDU_TX_START:
-                IWL_DEBUG_HT(priv, "start Tx\n");
-                ret = iwl4965_tx_agg_start(priv, vif, sta, tid, ssn);
-                break;
-        case IEEE80211_AMPDU_TX_STOP:
-                IWL_DEBUG_HT(priv, "stop Tx\n");
-                ret = iwl4965_tx_agg_stop(priv, vif, sta, tid);
-                if (test_bit(STATUS_EXIT_PENDING, &priv->status))
-                        ret = 0;
-                break;
-        case IEEE80211_AMPDU_TX_OPERATIONAL:
-                ret = 0;
-                break;
-        }
-        mutex_unlock(&priv->mutex);
-
-        return ret;
-}
-
-int iwl4965_mac_sta_add(struct ieee80211_hw *hw,
-                       struct ieee80211_vif *vif,
-                       struct ieee80211_sta *sta)
-{
-        struct iwl_priv *priv = hw->priv;
-        struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
-        struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
-        bool is_ap = vif->type == NL80211_IFTYPE_STATION;
-        int ret;
-        u8 sta_id;
-
-        IWL_DEBUG_INFO(priv, "received request to add station %pM\n",
-                        sta->addr);
-        mutex_lock(&priv->mutex);
-        IWL_DEBUG_INFO(priv, "proceeding to add station %pM\n",
-                        sta->addr);
-        sta_priv->common.sta_id = IWL_INVALID_STATION;
-
-        atomic_set(&sta_priv->pending_frames, 0);
-
-        ret = iwl_legacy_add_station_common(priv, vif_priv->ctx, sta->addr,
-                                     is_ap, sta, &sta_id);
-        if (ret) {
-                IWL_ERR(priv, "Unable to add station %pM (%d)\n",
-                        sta->addr, ret);
-                /* Should we return success if return code is EEXIST ? */
-                mutex_unlock(&priv->mutex);
-                return ret;
-        }
-
-        sta_priv->common.sta_id = sta_id;
-
-        /* Initialize rate scaling */
-        IWL_DEBUG_INFO(priv, "Initializing rate scaling for station %pM\n",
-                       sta->addr);
-        iwl4965_rs_rate_init(priv, sta, sta_id);
-        mutex_unlock(&priv->mutex);
-
-        return 0;
-}
-
-void iwl4965_mac_channel_switch(struct ieee80211_hw *hw,
-                               struct ieee80211_channel_switch *ch_switch)
-{
-        struct iwl_priv *priv = hw->priv;
-        const struct iwl_channel_info *ch_info;
-        struct ieee80211_conf *conf = &hw->conf;
-        struct ieee80211_channel *channel = ch_switch->channel;
-        struct iwl_ht_config *ht_conf = &priv->current_ht_config;
-
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        u16 ch;
-
-        IWL_DEBUG_MAC80211(priv, "enter\n");
-
-        mutex_lock(&priv->mutex);
-
-        if (iwl_legacy_is_rfkill(priv))
-                goto out;
-
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status) ||
-            test_bit(STATUS_SCANNING, &priv->status) ||
-            test_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status))
-                goto out;
-
-        if (!iwl_legacy_is_associated_ctx(ctx))
-                goto out;
-
-        if (!priv->cfg->ops->lib->set_channel_switch)
-                goto out;
-
-        ch = channel->hw_value;
-        if (le16_to_cpu(ctx->active.channel) == ch)
-                goto out;
-
-        ch_info = iwl_legacy_get_channel_info(priv, channel->band, ch);
-        if (!iwl_legacy_is_channel_valid(ch_info)) {
-                IWL_DEBUG_MAC80211(priv, "invalid channel\n");
-                goto out;
-        }
-
-        spin_lock_irq(&priv->lock);
-
-        priv->current_ht_config.smps = conf->smps_mode;
-
-        /* Configure HT40 channels */
-        ctx->ht.enabled = conf_is_ht(conf);
-        if (ctx->ht.enabled) {
-                if (conf_is_ht40_minus(conf)) {
-                        ctx->ht.extension_chan_offset =
-                                IEEE80211_HT_PARAM_CHA_SEC_BELOW;
-                        ctx->ht.is_40mhz = true;
-                } else if (conf_is_ht40_plus(conf)) {
-                        ctx->ht.extension_chan_offset =
-                                IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
-                        ctx->ht.is_40mhz = true;
-                } else {
-                        ctx->ht.extension_chan_offset =
-                                IEEE80211_HT_PARAM_CHA_SEC_NONE;
-                        ctx->ht.is_40mhz = false;
-                }
-        } else
-                ctx->ht.is_40mhz = false;
-
-        if ((le16_to_cpu(ctx->staging.channel) != ch))
-                ctx->staging.flags = 0;
-
-        iwl_legacy_set_rxon_channel(priv, channel, ctx);
-        iwl_legacy_set_rxon_ht(priv, ht_conf);
-        iwl_legacy_set_flags_for_band(priv, ctx, channel->band, ctx->vif);
-
-        spin_unlock_irq(&priv->lock);
-
-        iwl_legacy_set_rate(priv);
-        /*
-         * at this point, staging_rxon has the
-         * configuration for channel switch
-         */
-        set_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status);
-        priv->switch_channel = cpu_to_le16(ch);
-        if (priv->cfg->ops->lib->set_channel_switch(priv, ch_switch)) {
-                clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status);
-                priv->switch_channel = 0;
-                ieee80211_chswitch_done(ctx->vif, false);
-        }
-
-out:
-        mutex_unlock(&priv->mutex);
-        IWL_DEBUG_MAC80211(priv, "leave\n");
-}
-
-void iwl4965_configure_filter(struct ieee80211_hw *hw,
-                             unsigned int changed_flags,
-                             unsigned int *total_flags,
-                             u64 multicast)
-{
-        struct iwl_priv *priv = hw->priv;
-        __le32 filter_or = 0, filter_nand = 0;
-        struct iwl_rxon_context *ctx;
-
-#define CHK(test, flag) do { \
-        if (*total_flags & (test))              \
-                filter_or |= (flag);            \
-        else                                    \
-                filter_nand |= (flag);          \
-        } while (0)
-
-        IWL_DEBUG_MAC80211(priv, "Enter: changed: 0x%x, total: 0x%x\n",
-                        changed_flags, *total_flags);
-
-        CHK(FIF_OTHER_BSS | FIF_PROMISC_IN_BSS, RXON_FILTER_PROMISC_MSK);
-        /* Setting _just_ RXON_FILTER_CTL2HOST_MSK causes FH errors */
-        CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK | RXON_FILTER_PROMISC_MSK);
-        CHK(FIF_BCN_PRBRESP_PROMISC, RXON_FILTER_BCON_AWARE_MSK);
-
-#undef CHK
-
-        mutex_lock(&priv->mutex);
-
-        for_each_context(priv, ctx) {
-                ctx->staging.filter_flags &= ~filter_nand;
-                ctx->staging.filter_flags |= filter_or;
-
-                /*
-                 * Not committing directly because hardware can perform a scan,
-                 * but we'll eventually commit the filter flags change anyway.
-                 */
-        }
-
-        mutex_unlock(&priv->mutex);
-
-        /*
-         * Receiving all multicast frames is always enabled by the
-         * default flags setup in iwl_legacy_connection_init_rx_config()
-         * since we currently do not support programming multicast
-         * filters into the device.
-         */
-        *total_flags &= FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |
-                        FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
-}
-
-/*****************************************************************************
- *
- * driver setup and teardown
- *
- *****************************************************************************/
-
-static void iwl4965_bg_txpower_work(struct work_struct *work)
-{
-        struct iwl_priv *priv = container_of(work, struct iwl_priv,
-                        txpower_work);
-
-        mutex_lock(&priv->mutex);
-
-        /* If a scan happened to start before we got here
-         * then just return; the statistics notification will
-         * kick off another scheduled work to compensate for
-         * any temperature delta we missed here. */
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status) ||
-            test_bit(STATUS_SCANNING, &priv->status))
-                goto out;
-
-        /* Regardless of if we are associated, we must reconfigure the
-         * TX power since frames can be sent on non-radar channels while
-         * not associated */
-        priv->cfg->ops->lib->send_tx_power(priv);
-
-        /* Update last_temperature to keep is_calib_needed from running
-         * when it isn't needed... */
-        priv->last_temperature = priv->temperature;
-out:
-        mutex_unlock(&priv->mutex);
-}
-
-static void iwl4965_setup_deferred_work(struct iwl_priv *priv)
-{
-        priv->workqueue = create_singlethread_workqueue(DRV_NAME);
-
-        init_waitqueue_head(&priv->wait_command_queue);
-
-        INIT_WORK(&priv->restart, iwl4965_bg_restart);
-        INIT_WORK(&priv->rx_replenish, iwl4965_bg_rx_replenish);
-        INIT_WORK(&priv->run_time_calib_work, iwl4965_bg_run_time_calib_work);
-        INIT_DELAYED_WORK(&priv->init_alive_start, iwl4965_bg_init_alive_start);
-        INIT_DELAYED_WORK(&priv->alive_start, iwl4965_bg_alive_start);
-
-        iwl_legacy_setup_scan_deferred_work(priv);
-
-        INIT_WORK(&priv->txpower_work, iwl4965_bg_txpower_work);
-
-        init_timer(&priv->statistics_periodic);
-        priv->statistics_periodic.data = (unsigned long)priv;
-        priv->statistics_periodic.function = iwl4965_bg_statistics_periodic;
-
-        init_timer(&priv->watchdog);
-        priv->watchdog.data = (unsigned long)priv;
-        priv->watchdog.function = iwl_legacy_bg_watchdog;
-
-        tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long))
-                iwl4965_irq_tasklet, (unsigned long)priv);
-}
-
-static void iwl4965_cancel_deferred_work(struct iwl_priv *priv)
-{
-        cancel_work_sync(&priv->txpower_work);
-        cancel_delayed_work_sync(&priv->init_alive_start);
-        cancel_delayed_work(&priv->alive_start);
-        cancel_work_sync(&priv->run_time_calib_work);
-
-        iwl_legacy_cancel_scan_deferred_work(priv);
-
-        del_timer_sync(&priv->statistics_periodic);
-}
-
-static void iwl4965_init_hw_rates(struct iwl_priv *priv,
-                              struct ieee80211_rate *rates)
-{
-        int i;
-
-        for (i = 0; i < IWL_RATE_COUNT_LEGACY; i++) {
-                rates[i].bitrate = iwlegacy_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_FIRST_CCK_RATE) && (i <= IWL_LAST_CCK_RATE)) {
-                        /*
-                         * If CCK != 1M then set short preamble rate flag.
-                         */
-                        rates[i].flags |=
-                                (iwlegacy_rates[i].plcp == IWL_RATE_1M_PLCP) ?
-                                        0 : IEEE80211_RATE_SHORT_PREAMBLE;
-                }
-        }
-}
-/*
- * Acquire priv->lock before calling this function !
- */
-void iwl4965_set_wr_ptrs(struct iwl_priv *priv, int txq_id, u32 index)
-{
-        iwl_legacy_write_direct32(priv, HBUS_TARG_WRPTR,
-                             (index & 0xff) | (txq_id << 8));
-        iwl_legacy_write_prph(priv, IWL49_SCD_QUEUE_RDPTR(txq_id), index);
-}
-
-void iwl4965_tx_queue_set_status(struct iwl_priv *priv,
-                                        struct iwl_tx_queue *txq,
-                                        int tx_fifo_id, int scd_retry)
-{
-        int txq_id = txq->q.id;
-
-        /* Find out whether to activate Tx queue */
-        int active = test_bit(txq_id, &priv->txq_ctx_active_msk) ? 1 : 0;
-
-        /* Set up and activate */
-        iwl_legacy_write_prph(priv, IWL49_SCD_QUEUE_STATUS_BITS(txq_id),
-                         (active << IWL49_SCD_QUEUE_STTS_REG_POS_ACTIVE) |
-                         (tx_fifo_id << IWL49_SCD_QUEUE_STTS_REG_POS_TXF) |
-                         (scd_retry << IWL49_SCD_QUEUE_STTS_REG_POS_WSL) |
-                         (scd_retry << IWL49_SCD_QUEUE_STTS_REG_POS_SCD_ACK) |
-                         IWL49_SCD_QUEUE_STTS_REG_MSK);
-
-        txq->sched_retry = scd_retry;
-
-        IWL_DEBUG_INFO(priv, "%s %s Queue %d on AC %d\n",
-                       active ? "Activate" : "Deactivate",
-                       scd_retry ? "BA" : "AC", txq_id, tx_fifo_id);
-}
-
-
-static int iwl4965_init_drv(struct iwl_priv *priv)
-{
-        int ret;
-
-        spin_lock_init(&priv->sta_lock);
-        spin_lock_init(&priv->hcmd_lock);
-
-        INIT_LIST_HEAD(&priv->free_frames);
-
-        mutex_init(&priv->mutex);
-
-        priv->ieee_channels = NULL;
-        priv->ieee_rates = NULL;
-        priv->band = IEEE80211_BAND_2GHZ;
-
-        priv->iw_mode = NL80211_IFTYPE_STATION;
-        priv->current_ht_config.smps = IEEE80211_SMPS_STATIC;
-        priv->missed_beacon_threshold = IWL_MISSED_BEACON_THRESHOLD_DEF;
-
-        /* initialize force reset */
-        priv->force_reset.reset_duration = IWL_DELAY_NEXT_FORCE_FW_RELOAD;
-
-        /* Choose which receivers/antennas to use */
-        if (priv->cfg->ops->hcmd->set_rxon_chain)
-                priv->cfg->ops->hcmd->set_rxon_chain(priv,
-                                        &priv->contexts[IWL_RXON_CTX_BSS]);
-
-        iwl_legacy_init_scan_params(priv);
-
-        ret = iwl_legacy_init_channel_map(priv);
-        if (ret) {
-                IWL_ERR(priv, "initializing regulatory failed: %d\n", ret);
-                goto err;
-        }
-
-        ret = iwl_legacy_init_geos(priv);
-        if (ret) {
-                IWL_ERR(priv, "initializing geos failed: %d\n", ret);
-                goto err_free_channel_map;
-        }
-        iwl4965_init_hw_rates(priv, priv->ieee_rates);
-
-        return 0;
-
-err_free_channel_map:
-        iwl_legacy_free_channel_map(priv);
-err:
-        return ret;
-}
-
-static void iwl4965_uninit_drv(struct iwl_priv *priv)
-{
-        iwl4965_calib_free_results(priv);
-        iwl_legacy_free_geos(priv);
-        iwl_legacy_free_channel_map(priv);
-        kfree(priv->scan_cmd);
-}
-
-static void iwl4965_hw_detect(struct iwl_priv *priv)
-{
-        priv->hw_rev = _iwl_legacy_read32(priv, CSR_HW_REV);
-        priv->hw_wa_rev = _iwl_legacy_read32(priv, CSR_HW_REV_WA_REG);
-        priv->rev_id = priv->pci_dev->revision;
-        IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", priv->rev_id);
-}
-
-static int iwl4965_set_hw_params(struct iwl_priv *priv)
-{
-        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_page_order = get_order(IWL_RX_BUF_SIZE_8K);
-        else
-                priv->hw_params.rx_page_order = get_order(IWL_RX_BUF_SIZE_4K);
-
-        priv->hw_params.max_beacon_itrvl = IWL_MAX_UCODE_BEACON_INTERVAL;
-
-        if (priv->cfg->mod_params->disable_11n)
-                priv->cfg->sku &= ~IWL_SKU_N;
-
-        /* Device-specific setup */
-        return priv->cfg->ops->lib->set_hw_params(priv);
-}
-
-static const u8 iwl4965_bss_ac_to_fifo[] = {
-        IWL_TX_FIFO_VO,
-        IWL_TX_FIFO_VI,
-        IWL_TX_FIFO_BE,
-        IWL_TX_FIFO_BK,
-};
-
-static const u8 iwl4965_bss_ac_to_queue[] = {
-        0, 1, 2, 3,
-};
-
-static int
-iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-        int err = 0, i;
-        struct iwl_priv *priv;
-        struct ieee80211_hw *hw;
-        struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
-        unsigned long flags;
-        u16 pci_cmd;
-
-        /************************
-         * 1. Allocating HW data
-         ************************/
-
-        hw = iwl_legacy_alloc_all(cfg);
-        if (!hw) {
-                err = -ENOMEM;
-                goto out;
-        }
-        priv = hw->priv;
-        /* At this point both hw and priv are allocated. */
-
-        /*
-         * The default context is always valid,
-         * more may be discovered when firmware
-         * is loaded.
-         */
-        priv->valid_contexts = BIT(IWL_RXON_CTX_BSS);
-
-        for (i = 0; i < NUM_IWL_RXON_CTX; i++)
-                priv->contexts[i].ctxid = i;
-
-        priv->contexts[IWL_RXON_CTX_BSS].always_active = true;
-        priv->contexts[IWL_RXON_CTX_BSS].is_active = true;
-        priv->contexts[IWL_RXON_CTX_BSS].rxon_cmd = REPLY_RXON;
-        priv->contexts[IWL_RXON_CTX_BSS].rxon_timing_cmd = REPLY_RXON_TIMING;
-        priv->contexts[IWL_RXON_CTX_BSS].rxon_assoc_cmd = REPLY_RXON_ASSOC;
-        priv->contexts[IWL_RXON_CTX_BSS].qos_cmd = REPLY_QOS_PARAM;
-        priv->contexts[IWL_RXON_CTX_BSS].ap_sta_id = IWL_AP_ID;
-        priv->contexts[IWL_RXON_CTX_BSS].wep_key_cmd = REPLY_WEPKEY;
-        priv->contexts[IWL_RXON_CTX_BSS].ac_to_fifo = iwl4965_bss_ac_to_fifo;
-        priv->contexts[IWL_RXON_CTX_BSS].ac_to_queue = iwl4965_bss_ac_to_queue;
-        priv->contexts[IWL_RXON_CTX_BSS].exclusive_interface_modes =
-                BIT(NL80211_IFTYPE_ADHOC);
-        priv->contexts[IWL_RXON_CTX_BSS].interface_modes =
-                BIT(NL80211_IFTYPE_STATION);
-        priv->contexts[IWL_RXON_CTX_BSS].ap_devtype = RXON_DEV_TYPE_AP;
-        priv->contexts[IWL_RXON_CTX_BSS].ibss_devtype = RXON_DEV_TYPE_IBSS;
-        priv->contexts[IWL_RXON_CTX_BSS].station_devtype = RXON_DEV_TYPE_ESS;
-        priv->contexts[IWL_RXON_CTX_BSS].unused_devtype = RXON_DEV_TYPE_ESS;
-
-        BUILD_BUG_ON(NUM_IWL_RXON_CTX != 1);
-
-        SET_IEEE80211_DEV(hw, &pdev->dev);
-
-        IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
-        priv->cfg = cfg;
-        priv->pci_dev = pdev;
-        priv->inta_mask = CSR_INI_SET_MASK;
-
-        if (iwl_legacy_alloc_traffic_mem(priv))
-                IWL_ERR(priv, "Not enough memory to generate traffic log\n");
-
-        /**************************
-         * 2. Initializing PCI bus
-         **************************/
-        pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
-                                PCIE_LINK_STATE_CLKPM);
-
-        if (pci_enable_device(pdev)) {
-                err = -ENODEV;
-                goto out_ieee80211_free_hw;
-        }
-
-        pci_set_master(pdev);
-
-        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));
-        if (!err)
-                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(36));
-        if (err) {
-                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
-                if (!err)
-                        err = pci_set_consistent_dma_mask(pdev,
-                                                        DMA_BIT_MASK(32));
-                /* both attempts failed: */
-                if (err) {
-                        IWL_WARN(priv, "No suitable DMA available.\n");
-                        goto out_pci_disable_device;
-                }
-        }
-
-        err = pci_request_regions(pdev, DRV_NAME);
-        if (err)
-                goto out_pci_disable_device;
-
-        pci_set_drvdata(pdev, priv);
-
-
-        /***********************
-         * 3. Read REV register
-         ***********************/
-        priv->hw_base = pci_iomap(pdev, 0, 0);
-        if (!priv->hw_base) {
-                err = -ENODEV;
-                goto out_pci_release_regions;
-        }
-
-        IWL_DEBUG_INFO(priv, "pci_resource_len = 0x%08llx\n",
-                (unsigned long long) pci_resource_len(pdev, 0));
-        IWL_DEBUG_INFO(priv, "pci_resource_base = %p\n", priv->hw_base);
-
-        /* these spin locks will be used in apm_ops.init and EEPROM access
-         * we should init now
-         */
-        spin_lock_init(&priv->reg_lock);
-        spin_lock_init(&priv->lock);
-
-        /*
-         * stop and reset the on-board processor just in case it is in a
-         * strange state ... like being left stranded by a primary kernel
-         * and this is now the kdump kernel trying to start up
-         */
-        iwl_write32(priv, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
-
-        iwl4965_hw_detect(priv);
-        IWL_INFO(priv, "Detected %s, REV=0x%X\n",
-                priv->cfg->name, priv->hw_rev);
-
-        /* We disable the RETRY_TIMEOUT register (0x41) to keep
-         * PCI Tx retries from interfering with C3 CPU state */
-        pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);
-
-        iwl4965_prepare_card_hw(priv);
-        if (!priv->hw_ready) {
-                IWL_WARN(priv, "Failed, HW not ready\n");
-                goto out_iounmap;
-        }
-
-        /*****************
-         * 4. Read EEPROM
-         *****************/
-        /* Read the EEPROM */
-        err = iwl_legacy_eeprom_init(priv);
-        if (err) {
-                IWL_ERR(priv, "Unable to init EEPROM\n");
-                goto out_iounmap;
-        }
-        err = iwl4965_eeprom_check_version(priv);
-        if (err)
-                goto out_free_eeprom;
-
-        if (err)
-                goto out_free_eeprom;
-
-        /* extract MAC Address */
-        iwl4965_eeprom_get_mac(priv, priv->addresses[0].addr);
-        IWL_DEBUG_INFO(priv, "MAC address: %pM\n", priv->addresses[0].addr);
-        priv->hw->wiphy->addresses = priv->addresses;
-        priv->hw->wiphy->n_addresses = 1;
-
-        /************************
-         * 5. Setup HW constants
-         ************************/
-        if (iwl4965_set_hw_params(priv)) {
-                IWL_ERR(priv, "failed to set hw parameters\n");
-                goto out_free_eeprom;
-        }
-
-        /*******************
-         * 6. Setup priv
-         *******************/
-
-        err = iwl4965_init_drv(priv);
-        if (err)
-                goto out_free_eeprom;
-        /* At this point both hw and priv are initialized. */
-
-        /********************
-         * 7. Setup services
-         ********************/
-        spin_lock_irqsave(&priv->lock, flags);
-        iwl_legacy_disable_interrupts(priv);
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        pci_enable_msi(priv->pci_dev);
-
-        err = request_irq(priv->pci_dev->irq, iwl_legacy_isr,
-                          IRQF_SHARED, DRV_NAME, priv);
-        if (err) {
-                IWL_ERR(priv, "Error allocating IRQ %d\n", priv->pci_dev->irq);
-                goto out_disable_msi;
-        }
-
-        iwl4965_setup_deferred_work(priv);
-        iwl4965_setup_rx_handlers(priv);
-
-        /*********************************************
-         * 8. Enable interrupts and read RFKILL state
-         *********************************************/
-
-        /* enable rfkill interrupt: hw bug w/a */
-        pci_read_config_word(priv->pci_dev, PCI_COMMAND, &pci_cmd);
-        if (pci_cmd & PCI_COMMAND_INTX_DISABLE) {
-                pci_cmd &= ~PCI_COMMAND_INTX_DISABLE;
-                pci_write_config_word(priv->pci_dev, PCI_COMMAND, pci_cmd);
-        }
-
-        iwl_legacy_enable_rfkill_int(priv);
-
-        /* If platform's RF_KILL switch is NOT set to KILL */
-        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);
-
-        wiphy_rfkill_set_hw_state(priv->hw->wiphy,
-                test_bit(STATUS_RF_KILL_HW, &priv->status));
-
-        iwl_legacy_power_initialize(priv);
-
-        init_completion(&priv->_4965.firmware_loading_complete);
-
-        err = iwl4965_request_firmware(priv, true);
-        if (err)
-                goto out_destroy_workqueue;
-
-        return 0;
-
- out_destroy_workqueue:
-        destroy_workqueue(priv->workqueue);
-        priv->workqueue = NULL;
-        free_irq(priv->pci_dev->irq, priv);
- out_disable_msi:
-        pci_disable_msi(priv->pci_dev);
-        iwl4965_uninit_drv(priv);
- out_free_eeprom:
-        iwl_legacy_eeprom_free(priv);
- out_iounmap:
-        pci_iounmap(pdev, priv->hw_base);
- out_pci_release_regions:
-        pci_set_drvdata(pdev, NULL);
-        pci_release_regions(pdev);
- out_pci_disable_device:
-        pci_disable_device(pdev);
- out_ieee80211_free_hw:
-        iwl_legacy_free_traffic_mem(priv);
-        ieee80211_free_hw(priv->hw);
- out:
-        return err;
-}
-
-static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
-{
-        struct iwl_priv *priv = pci_get_drvdata(pdev);
-        unsigned long flags;
-
-        if (!priv)
-                return;
-
-        wait_for_completion(&priv->_4965.firmware_loading_complete);
-
-        IWL_DEBUG_INFO(priv, "*** UNLOAD DRIVER ***\n");
-
-        iwl_legacy_dbgfs_unregister(priv);
-        sysfs_remove_group(&pdev->dev.kobj, &iwl_attribute_group);
-
-        /* ieee80211_unregister_hw call wil cause iwl_mac_stop to
-         * to be called and iwl4965_down since we are removing the device
-         * we need to set STATUS_EXIT_PENDING bit.
-         */
-        set_bit(STATUS_EXIT_PENDING, &priv->status);
-
-        iwl_legacy_leds_exit(priv);
-
-        if (priv->mac80211_registered) {
-                ieee80211_unregister_hw(priv->hw);
-                priv->mac80211_registered = 0;
-        } else {
-                iwl4965_down(priv);
-        }
-
-        /*
-         * Make sure device is reset to low power before unloading driver.
-         * This may be redundant with iwl4965_down(), but there are paths to
-         * run iwl4965_down() without calling apm_ops.stop(), and there are
-         * paths to avoid running iwl4965_down() at all before leaving driver.
-         * This (inexpensive) call *makes sure* device is reset.
-         */
-        iwl_legacy_apm_stop(priv);
-
-        /* make sure we flush any pending irq or
-         * tasklet for the driver
-         */
-        spin_lock_irqsave(&priv->lock, flags);
-        iwl_legacy_disable_interrupts(priv);
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        iwl4965_synchronize_irq(priv);
-
-        iwl4965_dealloc_ucode_pci(priv);
-
-        if (priv->rxq.bd)
-                iwl4965_rx_queue_free(priv, &priv->rxq);
-        iwl4965_hw_txq_ctx_free(priv);
-
-        iwl_legacy_eeprom_free(priv);
-
-
-        /*netif_stop_queue(dev); */
-        flush_workqueue(priv->workqueue);
-
-        /* ieee80211_unregister_hw calls iwl_mac_stop, which flushes
-         * priv->workqueue... so we can't take down the workqueue
-         * until now... */
-        destroy_workqueue(priv->workqueue);
-        priv->workqueue = NULL;
-        iwl_legacy_free_traffic_mem(priv);
-
-        free_irq(priv->pci_dev->irq, priv);
-        pci_disable_msi(priv->pci_dev);
-        pci_iounmap(pdev, priv->hw_base);
-        pci_release_regions(pdev);
-        pci_disable_device(pdev);
-        pci_set_drvdata(pdev, NULL);
-
-        iwl4965_uninit_drv(priv);
-
-        dev_kfree_skb(priv->beacon_skb);
-
-        ieee80211_free_hw(priv->hw);
-}
-
-/*
- * Activate/Deactivate Tx DMA/FIFO channels according tx fifos mask
- * must be called under priv->lock and mac access
- */
-void iwl4965_txq_set_sched(struct iwl_priv *priv, u32 mask)
-{
-        iwl_legacy_write_prph(priv, IWL49_SCD_TXFACT, mask);
-}
-
-/*****************************************************************************
- *
- * driver and module entry point
- *
- *****************************************************************************/
-
-/* Hardware specific file defines the PCI IDs table for that hardware module */
-static DEFINE_PCI_DEVICE_TABLE(iwl4965_hw_card_ids) = {
-#if defined(CONFIG_IWL4965_MODULE) || defined(CONFIG_IWL4965)
-        {IWL_PCI_DEVICE(0x4229, PCI_ANY_ID, iwl4965_cfg)},
-        {IWL_PCI_DEVICE(0x4230, PCI_ANY_ID, iwl4965_cfg)},
-#endif /* CONFIG_IWL4965 */
-
-        {0}
-};
-MODULE_DEVICE_TABLE(pci, iwl4965_hw_card_ids);
-
-static struct pci_driver iwl4965_driver = {
-        .name = DRV_NAME,
-        .id_table = iwl4965_hw_card_ids,
-        .probe = iwl4965_pci_probe,
-        .remove = __devexit_p(iwl4965_pci_remove),
-        .driver.pm = IWL_LEGACY_PM_OPS,
-};
-
-static int __init iwl4965_init(void)
-{
-
-        int ret;
-        pr_info(DRV_DESCRIPTION ", " DRV_VERSION "\n");
-        pr_info(DRV_COPYRIGHT "\n");
-
-        ret = iwl4965_rate_control_register();
-        if (ret) {
-                pr_err("Unable to register rate control algorithm: %d\n", ret);
-                return ret;
-        }
-
-        ret = pci_register_driver(&iwl4965_driver);
-        if (ret) {
-                pr_err("Unable to initialize PCI module\n");
-                goto error_register;
-        }
-
-        return ret;
-
-error_register:
-        iwl4965_rate_control_unregister();
-        return ret;
-}
-
-static void __exit iwl4965_exit(void)
-{
-        pci_unregister_driver(&iwl4965_driver);
-        iwl4965_rate_control_unregister();
-}
-
-module_exit(iwl4965_exit);
-module_init(iwl4965_init);
-
-#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
-module_param_named(debug, iwlegacy_debug_level, uint, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(debug, "debug output mask");
-#endif
-
-module_param_named(swcrypto, iwl4965_mod_params.sw_crypto, int, S_IRUGO);
-MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])");
-module_param_named(queues_num, iwl4965_mod_params.num_of_queues, int, S_IRUGO);
-MODULE_PARM_DESC(queues_num, "number of hw queues.");
-module_param_named(11n_disable, iwl4965_mod_params.disable_11n, int, S_IRUGO);
-MODULE_PARM_DESC(11n_disable, "disable 11n functionality");
-module_param_named(amsdu_size_8K, iwl4965_mod_params.amsdu_size_8K,
-                   int, S_IRUGO);
-MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size");
-module_param_named(fw_restart, iwl4965_mod_params.restart_fw, int, S_IRUGO);
-MODULE_PARM_DESC(fw_restart, "restart firmware in case of error");
diff --git a/drivers/net/wireless/iwlegacy/iwl-prph.h b/drivers/net/wireless/iwlegacy/prph.h
index 30a493003ab0..ffec4b4a248a 100644
--- a/drivers/net/wireless/iwlegacy/iwl-prph.h
+++ b/drivers/net/wireless/iwlegacy/prph.h
@@ -60,8 +60,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#ifndef __iwl_legacy_prph_h__
-#define __iwl_legacy_prph_h__
+#ifndef __il_prph_h__
+#define __il_prph_h__
 
 /*
  * Registers in this file are internal, not PCI bus memory mapped.
@@ -91,9 +91,9 @@
 #define APMG_PS_CTRL_VAL_RESET_REQ              (0x04000000)
 #define APMG_PS_CTRL_MSK_PWR_SRC                (0x03000000)
 #define APMG_PS_CTRL_VAL_PWR_SRC_VMAIN          (0x00000000)
-#define APMG_PS_CTRL_VAL_PWR_SRC_MAX            (0x01000000) /* 3945 only */
+#define APMG_PS_CTRL_VAL_PWR_SRC_MAX            (0x01000000)    /* 3945 only */
 #define APMG_PS_CTRL_VAL_PWR_SRC_VAUX           (0x02000000)
-#define APMG_SVR_VOLTAGE_CONFIG_BIT_MSK (0x000001E0) /* bit 8:5 */
+#define APMG_SVR_VOLTAGE_CONFIG_BIT_MSK (0x000001E0)    /* bit 8:5 */
 #define APMG_SVR_DIGITAL_VOLTAGE_1_32           (0x00000060)
 
 #define APMG_PCIDEV_STT_VAL_L1_ACT_DIS          (0x00000800)
@@ -120,13 +120,13 @@
  *
  * 1)  Initialization -- performs hardware calibration and sets up some
  *     internal data, then notifies host via "initialize alive" notification
- *     (struct iwl_init_alive_resp) that it has completed all of its work.
+ *     (struct il_init_alive_resp) that it has completed all of its work.
  *     After signal from host, it then loads and starts the runtime program.
  *     The initialization program must be used when initially setting up the
  *     NIC after loading the driver.
  *
  * 2)  Runtime/Protocol -- performs all normal runtime operations.  This
- *     notifies host via "alive" notification (struct iwl_alive_resp) that it
+ *     notifies host via "alive" notification (struct il_alive_resp) that it
  *     is ready to be used.
  *
  * When initializing the NIC, the host driver does the following procedure:
@@ -189,7 +189,7 @@
  *        procedure.
  *
  * This save/restore method is mostly for autonomous power management during
- * normal operation (result of POWER_TABLE_CMD).  Platform suspend/resume and
+ * normal operation (result of C_POWER_TBL).  Platform suspend/resume and
  * RFKILL should use complete restarts (with total re-initialization) of uCode,
  * allowing total shutdown (including BSM memory).
  *
@@ -202,19 +202,19 @@
  */
 
 /* BSM bit fields */
-#define BSM_WR_CTRL_REG_BIT_START     (0x80000000) /* start boot load now */
-#define BSM_WR_CTRL_REG_BIT_START_EN  (0x40000000) /* enable boot after pwrup*/
-#define BSM_DRAM_INST_LOAD            (0x80000000) /* start program load now */
+#define BSM_WR_CTRL_REG_BIT_START     (0x80000000)      /* start boot load now */
+#define BSM_WR_CTRL_REG_BIT_START_EN  (0x40000000)      /* enable boot after pwrup */
+#define BSM_DRAM_INST_LOAD            (0x80000000)      /* start program load now */
 
 /* BSM addresses */
 #define BSM_BASE                     (PRPH_BASE + 0x3400)
 #define BSM_END                      (PRPH_BASE + 0x3800)
 
-#define BSM_WR_CTRL_REG              (BSM_BASE + 0x000) /* ctl and status */
-#define BSM_WR_MEM_SRC_REG           (BSM_BASE + 0x004) /* source in BSM mem */
-#define BSM_WR_MEM_DST_REG           (BSM_BASE + 0x008) /* dest in SRAM mem */
-#define BSM_WR_DWCOUNT_REG           (BSM_BASE + 0x00C) /* bytes */
-#define BSM_WR_STATUS_REG            (BSM_BASE + 0x010) /* bit 0:  1 == done */
+#define BSM_WR_CTRL_REG              (BSM_BASE + 0x000) /* ctl and status */
+#define BSM_WR_MEM_SRC_REG           (BSM_BASE + 0x004) /* source in BSM mem */
+#define BSM_WR_MEM_DST_REG           (BSM_BASE + 0x008) /* dest in SRAM mem */
+#define BSM_WR_DWCOUNT_REG           (BSM_BASE + 0x00C) /* bytes */
+#define BSM_WR_STATUS_REG            (BSM_BASE + 0x010) /* bit 0:  1 == done */
 
 /*
  * Pointers and size regs for bootstrap load and data SRAM save/restore.
@@ -231,8 +231,7 @@
  * Read/write, address range from LOWER_BOUND to (LOWER_BOUND + SIZE -1)
  */
 #define BSM_SRAM_LOWER_BOUND         (PRPH_BASE + 0x3800)
-#define BSM_SRAM_SIZE                   (1024) /* bytes */
-
+#define BSM_SRAM_SIZE                   (1024)  /* bytes */
 
 /* 3945 Tx scheduler registers */
 #define ALM_SCD_BASE                        (PRPH_BASE + 0x2E00)
@@ -255,7 +254,7 @@
  * but one DMA channel may take input from several queues.
  *
  * Tx DMA FIFOs have dedicated purposes.  For 4965, they are used as follows
- * (cf. default_queue_to_tx_fifo in iwl-4965.c):
+ * (cf. default_queue_to_tx_fifo in 4965.c):
  *
  * 0 -- EDCA BK (background) frames, lowest priority
  * 1 -- EDCA BE (best effort) frames, normal priority
@@ -274,20 +273,20 @@
  * The driver sets up each queue to work in one of two modes:
  *
  * 1)  Scheduler-Ack, in which the scheduler automatically supports a
- *     block-ack (BA) window of up to 64 TFDs.  In this mode, each queue
+ *     block-ack (BA) win of up to 64 TFDs.  In this mode, each queue
  *     contains TFDs for a unique combination of Recipient Address (RA)
  *     and Traffic Identifier (TID), that is, traffic of a given
  *     Quality-Of-Service (QOS) priority, destined for a single station.
  *
  *     In scheduler-ack mode, the scheduler keeps track of the Tx status of
- *     each frame within the BA window, including whether it's been transmitted,
+ *     each frame within the BA win, including whether it's been transmitted,
  *     and whether it's been acknowledged by the receiving station.  The device
  *     automatically processes block-acks received from the receiving STA,
  *     and reschedules un-acked frames to be retransmitted (successful
  *     Tx completion may end up being out-of-order).
  *
  *     The driver must maintain the queue's Byte Count table in host DRAM
- *     (struct iwl4965_sched_queue_byte_cnt_tbl) for this mode.
+ *     (struct il4965_sched_queue_byte_cnt_tbl) for this mode.
  *     This mode does not support fragmentation.
  *
  * 2)  FIFO (a.k.a. non-Scheduler-ACK), in which each TFD is processed in order.
@@ -316,34 +315,34 @@
  */
 
 /**
- * Max Tx window size is the max number of contiguous TFDs that the scheduler
+ * Max Tx win size is the max number of contiguous TFDs that the scheduler
  * can keep track of at one time when creating block-ack chains of frames.
  * Note that "64" matches the number of ack bits in a block-ack packet.
  * Driver should use SCD_WIN_SIZE and SCD_FRAME_LIMIT values to initialize
- * IWL49_SCD_CONTEXT_QUEUE_OFFSET(x) values.
+ * IL49_SCD_CONTEXT_QUEUE_OFFSET(x) values.
  */
 #define SCD_WIN_SIZE                            64
 #define SCD_FRAME_LIMIT                         64
 
 /* SCD registers are internal, must be accessed via HBUS_TARG_PRPH regs */
-#define IWL49_SCD_START_OFFSET          0xa02c00
+#define IL49_SCD_START_OFFSET           0xa02c00
 
 /*
  * 4965 tells driver SRAM address for internal scheduler structs via this reg.
  * Value is valid only after "Alive" response from uCode.
  */
-#define IWL49_SCD_SRAM_BASE_ADDR           (IWL49_SCD_START_OFFSET + 0x0)
+#define IL49_SCD_SRAM_BASE_ADDR           (IL49_SCD_START_OFFSET + 0x0)
 
 /*
  * Driver may need to update queue-empty bits after changing queue's
- * write and read pointers (indexes) during (re-)initialization (i.e. when
+ * write and read pointers (idxes) during (re-)initialization (i.e. when
  * scheduler is not tracking what's happening).
  * Bit fields:
  * 31-16:  Write mask -- 1: update empty bit, 0: don't change empty bit
  * 15-00:  Empty state, one for each queue -- 1: empty, 0: non-empty
  * NOTE:  This register is not used by Linux driver.
  */
-#define IWL49_SCD_EMPTY_BITS               (IWL49_SCD_START_OFFSET + 0x4)
+#define IL49_SCD_EMPTY_BITS               (IL49_SCD_START_OFFSET + 0x4)
 
 /*
  * Physical base address of array of byte count (BC) circular buffers (CBs).
@@ -351,11 +350,11 @@
  * This register points to BC CB for queue 0, must be on 1024-byte boundary.
  * Others are spaced by 1024 bytes.
  * Each BC CB is 2 bytes * (256 + 64) = 740 bytes, followed by 384 bytes pad.
- * (Index into a queue's BC CB) = (index into queue's TFD CB) = (SSN & 0xff).
+ * (Index into a queue's BC CB) = (idx into queue's TFD CB) = (SSN & 0xff).
  * Bit fields:
  * 25-00:  Byte Count CB physical address [35:10], must be 1024-byte aligned.
  */
-#define IWL49_SCD_DRAM_BASE_ADDR           (IWL49_SCD_START_OFFSET + 0x10)
+#define IL49_SCD_DRAM_BASE_ADDR           (IL49_SCD_START_OFFSET + 0x10)
 
 /*
  * Enables any/all Tx DMA/FIFO channels.
@@ -364,23 +363,23 @@
  * Bit fields:
  *  7- 0:  Enable (1), disable (0), one bit for each channel 0-7
  */
-#define IWL49_SCD_TXFACT                   (IWL49_SCD_START_OFFSET + 0x1c)
+#define IL49_SCD_TXFACT                   (IL49_SCD_START_OFFSET + 0x1c)
 /*
- * Queue (x) Write Pointers (indexes, really!), one for each Tx queue.
+ * Queue (x) Write Pointers (idxes, really!), one for each Tx queue.
  * Initialized and updated by driver as new TFDs are added to queue.
- * NOTE:  If using Block Ack, index must correspond to frame's
- *        Start Sequence Number; index = (SSN & 0xff)
+ * NOTE:  If using Block Ack, idx must correspond to frame's
+ *        Start Sequence Number; idx = (SSN & 0xff)
  * NOTE:  Alternative to HBUS_TARG_WRPTR, which is what Linux driver uses?
  */
-#define IWL49_SCD_QUEUE_WRPTR(x)  (IWL49_SCD_START_OFFSET + 0x24 + (x) * 4)
+#define IL49_SCD_QUEUE_WRPTR(x)  (IL49_SCD_START_OFFSET + 0x24 + (x) * 4)
 
 /*
- * Queue (x) Read Pointers (indexes, really!), one for each Tx queue.
- * For FIFO mode, index indicates next frame to transmit.
- * For Scheduler-ACK mode, index indicates first frame in Tx window.
+ * Queue (x) Read Pointers (idxes, really!), one for each Tx queue.
+ * For FIFO mode, idx indicates next frame to transmit.
+ * For Scheduler-ACK mode, idx indicates first frame in Tx win.
  * Initialized by driver, updated by scheduler.
  */
-#define IWL49_SCD_QUEUE_RDPTR(x)  (IWL49_SCD_START_OFFSET + 0x64 + (x) * 4)
+#define IL49_SCD_QUEUE_RDPTR(x)  (IL49_SCD_START_OFFSET + 0x64 + (x) * 4)
 
 /*
  * Select which queues work in chain mode (1) vs. not (0).
@@ -391,18 +390,18 @@
  * NOTE:  If driver sets up queue for chain mode, it should be also set up
  *        Scheduler-ACK mode as well, via SCD_QUEUE_STATUS_BITS(x).
  */
-#define IWL49_SCD_QUEUECHAIN_SEL  (IWL49_SCD_START_OFFSET + 0xd0)
+#define IL49_SCD_QUEUECHAIN_SEL  (IL49_SCD_START_OFFSET + 0xd0)
 
 /*
  * Select which queues interrupt driver when scheduler increments
- * a queue's read pointer (index).
+ * a queue's read pointer (idx).
  * Bit fields:
  * 31-16:  Reserved
  * 15-00:  Interrupt enable, one bit for each queue -- 1: enabled, 0: disabled
  * NOTE:  This functionality is apparently a no-op; driver relies on interrupts
  *        from Rx queue to read Tx command responses and update Tx queues.
  */
-#define IWL49_SCD_INTERRUPT_MASK  (IWL49_SCD_START_OFFSET + 0xe4)
+#define IL49_SCD_INTERRUPT_MASK  (IL49_SCD_START_OFFSET + 0xe4)
 
 /*
  * Queue search status registers.  One for each queue.
@@ -414,7 +413,7 @@
  *        Driver should init to "1" for aggregation mode, or "0" otherwise.
  *   7-6: Driver should init to "0"
  *     5: Window Size Left; indicates whether scheduler can request
- *        another TFD, based on window size, etc.  Driver should init
+ *        another TFD, based on win size, etc.  Driver should init
  *        this bit to "1" for aggregation mode, or "0" for non-agg.
  *   4-1: Tx FIFO to use (range 0-7).
  *     0: Queue is active (1), not active (0).
@@ -423,18 +422,18 @@
  * NOTE:  If enabling Scheduler-ACK mode, chain mode should also be enabled
  *        via SCD_QUEUECHAIN_SEL.
  */
-#define IWL49_SCD_QUEUE_STATUS_BITS(x)\
-        (IWL49_SCD_START_OFFSET + 0x104 + (x) * 4)
+#define IL49_SCD_QUEUE_STATUS_BITS(x)\
+        (IL49_SCD_START_OFFSET + 0x104 + (x) * 4)
 
 /* Bit field positions */
-#define IWL49_SCD_QUEUE_STTS_REG_POS_ACTIVE     (0)
-#define IWL49_SCD_QUEUE_STTS_REG_POS_TXF        (1)
-#define IWL49_SCD_QUEUE_STTS_REG_POS_WSL        (5)
-#define IWL49_SCD_QUEUE_STTS_REG_POS_SCD_ACK    (8)
+#define IL49_SCD_QUEUE_STTS_REG_POS_ACTIVE      (0)
+#define IL49_SCD_QUEUE_STTS_REG_POS_TXF (1)
+#define IL49_SCD_QUEUE_STTS_REG_POS_WSL (5)
+#define IL49_SCD_QUEUE_STTS_REG_POS_SCD_ACK     (8)
 
 /* Write masks */
-#define IWL49_SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN (10)
-#define IWL49_SCD_QUEUE_STTS_REG_MSK            (0x0007FC00)
+#define IL49_SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN  (10)
+#define IL49_SCD_QUEUE_STTS_REG_MSK             (0x0007FC00)
 
 /**
  * 4965 internal SRAM structures for scheduler, shared with driver ...
@@ -460,7 +459,7 @@
  * each queue's entry as follows:
  *
  * LS Dword bit fields:
- *  0-06:  Max Tx window size for Scheduler-ACK.  Driver should init to 64.
+ *  0-06:  Max Tx win size for Scheduler-ACK.  Driver should init to 64.
  *
  * MS Dword bit fields:
  * 16-22:  Frame limit.  Driver should init to 10 (0xa).
@@ -470,14 +469,14 @@
  * Init must be done after driver receives "Alive" response from 4965 uCode,
  * and when setting up queue for aggregation.
  */
-#define IWL49_SCD_CONTEXT_DATA_OFFSET                   0x380
-#define IWL49_SCD_CONTEXT_QUEUE_OFFSET(x) \
-                        (IWL49_SCD_CONTEXT_DATA_OFFSET + ((x) * 8))
+#define IL49_SCD_CONTEXT_DATA_OFFSET                    0x380
+#define IL49_SCD_CONTEXT_QUEUE_OFFSET(x) \
+                        (IL49_SCD_CONTEXT_DATA_OFFSET + ((x) * 8))
 
-#define IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS           (0)
-#define IWL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK           (0x0000007F)
-#define IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS        (16)
-#define IWL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK        (0x007F0000)
+#define IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_POS            (0)
+#define IL49_SCD_QUEUE_CTX_REG1_WIN_SIZE_MSK            (0x0000007F)
+#define IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS (16)
+#define IL49_SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK (0x007F0000)
 
 /*
  * Tx Status Bitmap
@@ -486,7 +485,7 @@
  * "Alive" notification from uCode.  Area is used only by device itself;
  * no other support (besides clearing) is required from driver.
  */
-#define IWL49_SCD_TX_STTS_BITMAP_OFFSET         0x400
+#define IL49_SCD_TX_STTS_BITMAP_OFFSET          0x400
 
 /*
  * RAxTID to queue translation mapping.
@@ -494,7 +493,7 @@
  * When queue is in Scheduler-ACK mode, frames placed in a that queue must be
  * for only one combination of receiver address (RA) and traffic ID (TID), i.e.
  * one QOS priority level destined for one station (for this wireless link,
- * not final destination).  The SCD_TRANSLATE_TABLE area provides 16 16-bit
+ * not final destination).  The SCD_TRANSLATE_TBL area provides 16 16-bit
  * mappings, one for each of the 16 queues.  If queue is not in Scheduler-ACK
  * mode, the device ignores the mapping value.
  *
@@ -508,16 +507,16 @@
  * must read a dword-aligned value from device SRAM, replace the 16-bit map
  * value of interest, and write the dword value back into device SRAM.
  */
-#define IWL49_SCD_TRANSLATE_TBL_OFFSET          0x500
+#define IL49_SCD_TRANSLATE_TBL_OFFSET           0x500
 
 /* Find translation table dword to read/write for given queue */
-#define IWL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(x) \
-        ((IWL49_SCD_TRANSLATE_TBL_OFFSET + ((x) * 2)) & 0xfffffffc)
+#define IL49_SCD_TRANSLATE_TBL_OFFSET_QUEUE(x) \
+        ((IL49_SCD_TRANSLATE_TBL_OFFSET + ((x) * 2)) & 0xfffffffc)
 
-#define IWL_SCD_TXFIFO_POS_TID                  (0)
-#define IWL_SCD_TXFIFO_POS_RA                   (4)
-#define IWL_SCD_QUEUE_RA_TID_MAP_RATID_MSK      (0x01FF)
+#define IL_SCD_TXFIFO_POS_TID                   (0)
+#define IL_SCD_TXFIFO_POS_RA                    (4)
+#define IL_SCD_QUEUE_RA_TID_MAP_RATID_MSK       (0x01FF)
 
 /*********************** END TX SCHEDULER *************************************/
 
-#endif                          /* __iwl_legacy_prph_h__ */
+#endif /* __il_prph_h__ */
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 57703d5209d7..ae08498dfcad 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -102,12 +102,28 @@ config IWLWIFI_DEVICE_TRACING
           occur.
 endmenu
 
-config IWLWIFI_DEVICE_SVTOOL
-        bool "iwlwifi device svtool support"
+config IWLWIFI_DEVICE_TESTMODE
+        def_bool y
         depends on IWLWIFI
-        select NL80211_TESTMODE
+        depends on NL80211_TESTMODE
         help
-          This option enables the svtool support for iwlwifi device through
-          NL80211_TESTMODE. svtool is a software validation tool that runs in
-          the user space and interacts with the device in the kernel space
-          through the generic netlink message via NL80211_TESTMODE channel.
+          This option enables the testmode support for iwlwifi device through
+          NL80211_TESTMODE. This provide the capabilities of enable user space
+          validation applications to interacts with the device through the
+          generic netlink message via NL80211_TESTMODE channel.
+
+config IWLWIFI_P2P
+       bool "iwlwifi experimental P2P support"
+       depends on IWLWIFI
+       help
+         This option enables experimental P2P support for some devices
+         based on microcode support. Since P2P support is still under
+         development, this option may even enable it for some devices
+         now that turn out to not support it in the future due to
+         microcode restrictions.
+
+         To determine if your microcode supports the experimental P2P
+         offered by this option, check if the driver advertises AP
+         support when it is loaded.
+
+         Say Y only if you want to experiment with P2P.
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index a7ab280994c8..9dc84a7354db 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -1,7 +1,7 @@
 # WIFI
 obj-$(CONFIG_IWLWIFI)   += iwlwifi.o
 iwlwifi-objs            := iwl-agn.o iwl-agn-rs.o iwl-mac80211.o
-iwlwifi-objs            += iwl-agn-ucode.o iwl-agn-tx.o
+iwlwifi-objs            += iwl-ucode.o iwl-agn-tx.o
 iwlwifi-objs            += iwl-agn-lib.o iwl-agn-calib.o iwl-io.o
 iwlwifi-objs            += iwl-agn-tt.o iwl-agn-sta.o iwl-agn-rx.o
 
@@ -18,7 +18,7 @@ iwlwifi-objs		+= iwl-trans-pcie.o iwl-trans-pcie-rx.o iwl-trans-pcie-tx.o
 
 iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
 iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
-iwlwifi-$(CONFIG_IWLWIFI_DEVICE_SVTOOL) += iwl-sv-open.o
+iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-testmode.o
 
 CFLAGS_iwl-devtrace.o := -I$(src)
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index e12b48c2cff6..8d3bad7ea5d3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -147,16 +147,7 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv)
         iwl1000_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
-        /* Set initial calibration set */
         hw_params(priv).sens = &iwl1000_sensitivity;
-        hw_params(priv).calib_init_cfg =
-                        BIT(IWL_CALIB_XTAL)             |
-                        BIT(IWL_CALIB_LO)               |
-                        BIT(IWL_CALIB_TX_IQ)            |
-                        BIT(IWL_CALIB_TX_IQ_PERD)       |
-                        BIT(IWL_CALIB_BASE_BAND);
-        if (priv->cfg->need_dc_calib)
-                hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_DC);
 
         return 0;
 }
@@ -191,6 +182,7 @@ static struct iwl_base_params iwl1000_base_params = {
         .chain_noise_scale = 1000,
         .wd_timeout = IWL_DEF_WD_TIMEOUT,
         .max_event_log_size = 128,
+        .wd_disable = true,
 };
 static struct iwl_ht_params iwl1000_ht_params = {
         .ht_greenfield_support = true,
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index b3193571ed07..0c4688d95b65 100644
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -143,17 +143,7 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv)
         iwl2000_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
-        /* Set initial calibration set */
         hw_params(priv).sens = &iwl2000_sensitivity;
-        hw_params(priv).calib_init_cfg =
-                BIT(IWL_CALIB_XTAL)             |
-                BIT(IWL_CALIB_LO)               |
-                BIT(IWL_CALIB_TX_IQ)            |
-                BIT(IWL_CALIB_BASE_BAND);
-        if (priv->cfg->need_dc_calib)
-                hw_params(priv).calib_rt_cfg |= IWL_CALIB_CFG_DC_IDX;
-        if (priv->cfg->need_temp_offset_calib)
-                hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_TEMP_OFFSET);
 
         return 0;
 }
@@ -258,7 +248,6 @@ static struct iwl_bt_params iwl2030_bt_params = {
         .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
         .lib = &iwl2000_lib,                                    \
         .base_params = &iwl2000_base_params,                    \
-        .need_dc_calib = true,                                  \
         .need_temp_offset_calib = true,                         \
         .temp_offset_v2 = true,                                 \
         .led_mode = IWL_LED_RF_STATE,                           \
@@ -286,7 +275,6 @@ struct iwl_cfg iwl2000_2bgn_d_cfg = {
         .lib = &iwl2030_lib,                                    \
         .base_params = &iwl2030_base_params,                    \
         .bt_params = &iwl2030_bt_params,                        \
-        .need_dc_calib = true,                                  \
         .need_temp_offset_calib = true,                         \
         .temp_offset_v2 = true,                                 \
         .led_mode = IWL_LED_RF_STATE,                           \
@@ -308,7 +296,6 @@ struct iwl_cfg iwl2030_2bgn_cfg = {
         .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
         .lib = &iwl2000_lib,                                    \
         .base_params = &iwl2000_base_params,                    \
-        .need_dc_calib = true,                                  \
         .need_temp_offset_calib = true,                         \
         .temp_offset_v2 = true,                                 \
         .led_mode = IWL_LED_RF_STATE,                           \
@@ -338,7 +325,6 @@ struct iwl_cfg iwl105_bgn_d_cfg = {
         .lib = &iwl2030_lib,                                    \
         .base_params = &iwl2030_base_params,                    \
         .bt_params = &iwl2030_bt_params,                        \
-        .need_dc_calib = true,                                  \
         .need_temp_offset_calib = true,                         \
         .temp_offset_v2 = true,                                 \
         .led_mode = IWL_LED_RF_STATE,                           \
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index c511c98a89a8..6706d7c10bd8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -134,10 +134,10 @@ static struct iwl_sensitivity_ranges iwl5150_sensitivity = {
 
 #define IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF   (-5)
 
-static s32 iwl_temp_calib_to_offset(struct iwl_priv *priv)
+static s32 iwl_temp_calib_to_offset(struct iwl_shared *shrd)
 {
         u16 temperature, voltage;
-        __le16 *temp_calib = (__le16 *)iwl_eeprom_query_addr(priv,
+        __le16 *temp_calib = (__le16 *)iwl_eeprom_query_addr(shrd,
                                 EEPROM_KELVIN_TEMPERATURE);
 
         temperature = le16_to_cpu(temp_calib[0]);
@@ -151,7 +151,7 @@ static void iwl5150_set_ct_threshold(struct iwl_priv *priv)
 {
         const s32 volt2temp_coef = IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF;
         s32 threshold = (s32)CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD_LEGACY) -
-                        iwl_temp_calib_to_offset(priv);
+                        iwl_temp_calib_to_offset(priv->shrd);
 
         hw_params(priv).ct_kill_threshold = threshold * volt2temp_coef;
 }
@@ -186,14 +186,7 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)
         iwl5000_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
-        /* Set initial calibration set */
         hw_params(priv).sens = &iwl5000_sensitivity;
-        hw_params(priv).calib_init_cfg =
-                BIT(IWL_CALIB_XTAL)             |
-                BIT(IWL_CALIB_LO)               |
-                BIT(IWL_CALIB_TX_IQ)            |
-                BIT(IWL_CALIB_TX_IQ_PERD)       |
-                BIT(IWL_CALIB_BASE_BAND);
 
         return 0;
 }
@@ -222,14 +215,7 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv)
         iwl5150_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
-        /* Set initial calibration set */
         hw_params(priv).sens = &iwl5150_sensitivity;
-        hw_params(priv).calib_init_cfg =
-                BIT(IWL_CALIB_LO)               |
-                BIT(IWL_CALIB_TX_IQ)            |
-                BIT(IWL_CALIB_BASE_BAND);
-        if (priv->cfg->need_dc_calib)
-                hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_DC);
 
         return 0;
 }
@@ -237,7 +223,7 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv)
 static void iwl5150_temperature(struct iwl_priv *priv)
 {
         u32 vt = 0;
-        s32 offset =  iwl_temp_calib_to_offset(priv);
+        s32 offset =  iwl_temp_calib_to_offset(priv->shrd);
 
         vt = le32_to_cpu(priv->statistics.common.temperature);
         vt = vt / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF + offset;
@@ -364,6 +350,7 @@ static struct iwl_base_params iwl5000_base_params = {
         .wd_timeout = IWL_LONG_WD_TIMEOUT,
         .max_event_log_size = 512,
         .no_idle_support = true,
+        .wd_disable = true,
 };
 static struct iwl_ht_params iwl5000_ht_params = {
         .ht_greenfield_support = true,
@@ -433,7 +420,7 @@ struct iwl_cfg iwl5350_agn_cfg = {
         .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,       \
         .lib = &iwl5150_lib,                                    \
         .base_params = &iwl5000_base_params,                    \
-        .need_dc_calib = true,                                  \
+        .no_xtal_calib = true,                                  \
         .led_mode = IWL_LED_BLINK,                              \
         .internal_wimax_coex = true
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index ee3363fdf309..3e277b6774f1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -46,11 +46,12 @@
 #include "iwl-cfg.h"
 
 /* Highest firmware API version supported */
-#define IWL6000_UCODE_API_MAX 4
+#define IWL6000_UCODE_API_MAX 6
 #define IWL6050_UCODE_API_MAX 5
 #define IWL6000G2_UCODE_API_MAX 6
 
 /* Oldest version we won't warn about */
+#define IWL6000_UCODE_API_OK 4
 #define IWL6000G2_UCODE_API_OK 5
 
 /* Lowest firmware API version supported */
@@ -80,7 +81,7 @@ static void iwl6000_set_ct_threshold(struct iwl_priv *priv)
 static void iwl6050_additional_nic_config(struct iwl_priv *priv)
 {
         /* Indicate calibration version to uCode. */
-        if (iwlagn_eeprom_calib_version(priv) >= 6)
+        if (iwl_eeprom_calib_version(priv->shrd) >= 6)
                 iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,
                                 CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
 }
@@ -88,7 +89,7 @@ static void iwl6050_additional_nic_config(struct iwl_priv *priv)
 static void iwl6150_additional_nic_config(struct iwl_priv *priv)
 {
         /* Indicate calibration version to uCode. */
-        if (iwlagn_eeprom_calib_version(priv) >= 6)
+        if (iwl_eeprom_calib_version(priv->shrd) >= 6)
                 iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,
                                 CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
         iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,
@@ -164,17 +165,7 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv)
         iwl6000_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
-        /* Set initial calibration set */
         hw_params(priv).sens = &iwl6000_sensitivity;
-        hw_params(priv).calib_init_cfg =
-                BIT(IWL_CALIB_XTAL)             |
-                BIT(IWL_CALIB_LO)               |
-                BIT(IWL_CALIB_TX_IQ)            |
-                BIT(IWL_CALIB_BASE_BAND);
-        if (priv->cfg->need_dc_calib)
-                hw_params(priv).calib_rt_cfg |= IWL_CALIB_CFG_DC_IDX;
-        if (priv->cfg->need_temp_offset_calib)
-                hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_TEMP_OFFSET);
 
         return 0;
 }
@@ -364,7 +355,6 @@ static struct iwl_bt_params iwl6000_bt_params = {
         .eeprom_calib_ver = EEPROM_6005_TX_POWER_VERSION,       \
         .lib = &iwl6000_lib,                                    \
         .base_params = &iwl6000_g2_base_params,                 \
-        .need_dc_calib = true,                                  \
         .need_temp_offset_calib = true,                         \
         .led_mode = IWL_LED_RF_STATE
 
@@ -406,7 +396,6 @@ struct iwl_cfg iwl6005_2agn_d_cfg = {
         .lib = &iwl6030_lib,                                    \
         .base_params = &iwl6000_g2_base_params,                 \
         .bt_params = &iwl6000_bt_params,                        \
-        .need_dc_calib = true,                                  \
         .need_temp_offset_calib = true,                         \
         .led_mode = IWL_LED_RF_STATE,                           \
         .adv_pm = true                                          \
@@ -469,6 +458,7 @@ struct iwl_cfg iwl130_bg_cfg = {
 #define IWL_DEVICE_6000i                                        \
         .fw_name_pre = IWL6000_FW_PRE,                          \
         .ucode_api_max = IWL6000_UCODE_API_MAX,                 \
+        .ucode_api_ok = IWL6000_UCODE_API_OK,                   \
         .ucode_api_min = IWL6000_UCODE_API_MIN,                 \
         .valid_tx_ant = ANT_BC,         /* .cfg overwrite */    \
         .valid_rx_ant = ANT_BC,         /* .cfg overwrite */    \
@@ -506,7 +496,6 @@ struct iwl_cfg iwl6000i_2bg_cfg = {
         .eeprom_ver = EEPROM_6050_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,       \
         .base_params = &iwl6050_base_params,                    \
-        .need_dc_calib = true,                                  \
         .led_mode = IWL_LED_BLINK,                              \
         .internal_wimax_coex = true
 
@@ -530,7 +519,6 @@ struct iwl_cfg iwl6050_2abg_cfg = {
         .eeprom_ver = EEPROM_6150_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6150_TX_POWER_VERSION,       \
         .base_params = &iwl6050_base_params,                    \
-        .need_dc_calib = true,                                  \
         .led_mode = IWL_LED_BLINK,                              \
         .internal_wimax_coex = true
 
@@ -549,17 +537,17 @@ struct iwl_cfg iwl6000_3agn_cfg = {
         .name = "Intel(R) Centrino(R) Ultimate-N 6300 AGN",
         .fw_name_pre = IWL6000_FW_PRE,
         .ucode_api_max = IWL6000_UCODE_API_MAX,
+        .ucode_api_ok = IWL6000_UCODE_API_OK,
         .ucode_api_min = IWL6000_UCODE_API_MIN,
         .eeprom_ver = EEPROM_6000_EEPROM_VERSION,
         .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,
         .lib = &iwl6000_lib,
         .base_params = &iwl6000_base_params,
         .ht_params = &iwl6000_ht_params,
-        .need_dc_calib = true,
         .led_mode = IWL_LED_BLINK,
 };
 
-MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
+MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_OK));
 MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
index 03bac48558b2..16971a020297 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
@@ -82,56 +82,64 @@ struct statistics_general_data {
         u32 beacon_energy_c;
 };
 
-int iwl_send_calib_results(struct iwl_priv *priv)
+int iwl_send_calib_results(struct iwl_trans *trans)
 {
-        int ret = 0;
-        int i = 0;
-
         struct iwl_host_cmd hcmd = {
                 .id = REPLY_PHY_CALIBRATION_CMD,
                 .flags = CMD_SYNC,
         };
-
-        for (i = 0; i < IWL_CALIB_MAX; i++) {
-                if ((BIT(i) & hw_params(priv).calib_init_cfg) &&
-                    priv->calib_results[i].buf) {
-                        hcmd.len[0] = priv->calib_results[i].buf_len;
-                        hcmd.data[0] = priv->calib_results[i].buf;
-                        hcmd.dataflags[0] = IWL_HCMD_DFL_NOCOPY;
-                        ret = iwl_trans_send_cmd(trans(priv), &hcmd);
-                        if (ret) {
-                                IWL_ERR(priv, "Error %d iteration %d\n",
-                                        ret, i);
-                                break;
-                        }
+        struct iwl_calib_result *res;
+
+        list_for_each_entry(res, &trans->calib_results, list) {
+                int ret;
+
+                hcmd.len[0] = res->cmd_len;
+                hcmd.data[0] = &res->hdr;
+                hcmd.dataflags[0] = IWL_HCMD_DFL_NOCOPY;
+                ret = iwl_trans_send_cmd(trans, &hcmd);
+                if (ret) {
+                        IWL_ERR(trans, "Error %d on calib cmd %d\n",
+                                ret, res->hdr.op_code);
+                        return ret;
                 }
         }
 
-        return ret;
+        return 0;
 }
 
-int iwl_calib_set(struct iwl_calib_result *res, const u8 *buf, int len)
+int iwl_calib_set(struct iwl_trans *trans,
+                  const struct iwl_calib_hdr *cmd, int len)
 {
-        if (res->buf_len != len) {
-                kfree(res->buf);
-                res->buf = kzalloc(len, GFP_ATOMIC);
-        }
-        if (unlikely(res->buf == NULL))
+        struct iwl_calib_result *res, *tmp;
+
+        res = kmalloc(sizeof(*res) + len - sizeof(struct iwl_calib_hdr),
+                      GFP_ATOMIC);
+        if (!res)
                 return -ENOMEM;
+        memcpy(&res->hdr, cmd, len);
+        res->cmd_len = len;
+
+        list_for_each_entry(tmp, &trans->calib_results, list) {
+                if (tmp->hdr.op_code == res->hdr.op_code) {
+                        list_replace(&tmp->list, &res->list);
+                        kfree(tmp);
+                        return 0;
+                }
+        }
+
+        /* wasn't in list already */
+        list_add_tail(&res->list, &trans->calib_results);
 
-        res->buf_len = len;
-        memcpy(res->buf, buf, len);
         return 0;
 }
 
-void iwl_calib_free_results(struct iwl_priv *priv)
+void iwl_calib_free_results(struct iwl_trans *trans)
 {
-        int i;
+        struct iwl_calib_result *res, *tmp;
 
-        for (i = 0; i < IWL_CALIB_MAX; i++) {
-                kfree(priv->calib_results[i].buf);
-                priv->calib_results[i].buf = NULL;
-                priv->calib_results[i].buf_len = 0;
+        list_for_each_entry_safe(res, tmp, &trans->calib_results, list) {
+                list_del(&res->list);
+                kfree(res);
         }
 }
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.h b/drivers/net/wireless/iwlwifi/iwl-agn-calib.h
index a869fc9205d2..10275ce92bde 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-calib.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-calib.h
@@ -72,8 +72,4 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv);
 void iwl_init_sensitivity(struct iwl_priv *priv);
 void iwl_reset_run_time_calib(struct iwl_priv *priv);
 
-int iwl_send_calib_results(struct iwl_priv *priv);
-int iwl_calib_set(struct iwl_calib_result *res, const u8 *buf, int len);
-void iwl_calib_free_results(struct iwl_priv *priv);
-
 #endif /* __iwl_calib_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 0bc962217351..057f95233567 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -92,11 +92,11 @@ void iwlagn_temperature(struct iwl_priv *priv)
         iwl_tt_handler(priv);
 }
 
-u16 iwlagn_eeprom_calib_version(struct iwl_priv *priv)
+u16 iwl_eeprom_calib_version(struct iwl_shared *shrd)
 {
         struct iwl_eeprom_calib_hdr *hdr;
 
-        hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(priv,
+        hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(shrd,
                                                         EEPROM_CALIB_ALL);
         return hdr->version;
 
@@ -105,7 +105,7 @@ u16 iwlagn_eeprom_calib_version(struct iwl_priv *priv)
 /*
  * EEPROM
  */
-static u32 eeprom_indirect_address(const struct iwl_priv *priv, u32 address)
+static u32 eeprom_indirect_address(const struct iwl_shared *shrd, u32 address)
 {
         u16 offset = 0;
 
@@ -114,31 +114,31 @@ static u32 eeprom_indirect_address(const struct iwl_priv *priv, u32 address)
 
         switch (address & INDIRECT_TYPE_MSK) {
         case INDIRECT_HOST:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_HOST);
+                offset = iwl_eeprom_query16(shrd, EEPROM_LINK_HOST);
                 break;
         case INDIRECT_GENERAL:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_GENERAL);
+                offset = iwl_eeprom_query16(shrd, EEPROM_LINK_GENERAL);
                 break;
         case INDIRECT_REGULATORY:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_REGULATORY);
+                offset = iwl_eeprom_query16(shrd, EEPROM_LINK_REGULATORY);
                 break;
         case INDIRECT_TXP_LIMIT:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_TXP_LIMIT);
+                offset = iwl_eeprom_query16(shrd, EEPROM_LINK_TXP_LIMIT);
                 break;
         case INDIRECT_TXP_LIMIT_SIZE:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_TXP_LIMIT_SIZE);
+                offset = iwl_eeprom_query16(shrd, EEPROM_LINK_TXP_LIMIT_SIZE);
                 break;
         case INDIRECT_CALIBRATION:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_CALIBRATION);
+                offset = iwl_eeprom_query16(shrd, EEPROM_LINK_CALIBRATION);
                 break;
         case INDIRECT_PROCESS_ADJST:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_PROCESS_ADJST);
+                offset = iwl_eeprom_query16(shrd, EEPROM_LINK_PROCESS_ADJST);
                 break;
         case INDIRECT_OTHERS:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_OTHERS);
+                offset = iwl_eeprom_query16(shrd, EEPROM_LINK_OTHERS);
                 break;
         default:
-                IWL_ERR(priv, "illegal indirect type: 0x%X\n",
+                IWL_ERR(shrd->trans, "illegal indirect type: 0x%X\n",
                 address & INDIRECT_TYPE_MSK);
                 break;
         }
@@ -147,11 +147,11 @@ static u32 eeprom_indirect_address(const struct iwl_priv *priv, u32 address)
         return (address & ADDRESS_MSK) + (offset << 1);
 }
 
-const u8 *iwl_eeprom_query_addr(const struct iwl_priv *priv, size_t offset)
+const u8 *iwl_eeprom_query_addr(const struct iwl_shared *shrd, size_t offset)
 {
-        u32 address = eeprom_indirect_address(priv, offset);
-        BUG_ON(address >= priv->cfg->base_params->eeprom_size);
-        return &priv->eeprom[address];
+        u32 address = eeprom_indirect_address(shrd, offset);
+        BUG_ON(address >= shrd->priv->cfg->base_params->eeprom_size);
+        return &shrd->eeprom[address];
 }
 
 struct iwl_mod_params iwlagn_mod_params = {
@@ -934,57 +934,6 @@ u8 iwl_toggle_tx_ant(struct iwl_priv *priv, u8 ant, u8 valid)
         return ant;
 }
 
-/* notification wait support */
-void iwlagn_init_notification_wait(struct iwl_priv *priv,
-                                   struct iwl_notification_wait *wait_entry,
-                                   u8 cmd,
-                                   void (*fn)(struct iwl_priv *priv,
-                                              struct iwl_rx_packet *pkt,
-                                              void *data),
-                                   void *fn_data)
-{
-        wait_entry->fn = fn;
-        wait_entry->fn_data = fn_data;
-        wait_entry->cmd = cmd;
-        wait_entry->triggered = false;
-        wait_entry->aborted = false;
-
-        spin_lock_bh(&priv->notif_wait_lock);
-        list_add(&wait_entry->list, &priv->notif_waits);
-        spin_unlock_bh(&priv->notif_wait_lock);
-}
-
-int iwlagn_wait_notification(struct iwl_priv *priv,
-                             struct iwl_notification_wait *wait_entry,
-                             unsigned long timeout)
-{
-        int ret;
-
-        ret = wait_event_timeout(priv->notif_waitq,
-                                 wait_entry->triggered || wait_entry->aborted,
-                                 timeout);
-
-        spin_lock_bh(&priv->notif_wait_lock);
-        list_del(&wait_entry->list);
-        spin_unlock_bh(&priv->notif_wait_lock);
-
-        if (wait_entry->aborted)
-                return -EIO;
-
-        /* return value is always >= 0 */
-        if (ret <= 0)
-                return -ETIMEDOUT;
-        return 0;
-}
-
-void iwlagn_remove_notification(struct iwl_priv *priv,
-                                struct iwl_notification_wait *wait_entry)
-{
-        spin_lock_bh(&priv->notif_wait_lock);
-        list_del(&wait_entry->list);
-        spin_unlock_bh(&priv->notif_wait_lock);
-}
-
 #ifdef CONFIG_PM_SLEEP
 static void iwlagn_convert_p1k(u16 *p1k, __le16 *out)
 {
@@ -1208,7 +1157,7 @@ int iwlagn_suspend(struct iwl_priv *priv,
          * For QoS counters, we store the one to use next, so subtract 0x10
          * since the uCode will add 0x10 before using the value.
          */
-        for (i = 0; i < 8; i++) {
+        for (i = 0; i < IWL_MAX_TID_COUNT; i++) {
                 seq = priv->shrd->tid_data[IWL_AP_ID][i].seq_number;
                 seq -= 0x10;
                 wakeup_filter_cmd.qos_seq[i] = cpu_to_le16(seq);
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 359c47a4fcea..a23835a7797a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -298,7 +298,7 @@ static u8 rs_tl_add_packet(struct iwl_lq_sta *lq_data,
         } else
                 return IWL_MAX_TID_COUNT;
 
-        if (unlikely(tid >= TID_MAX_LOAD_COUNT))
+        if (unlikely(tid >= IWL_MAX_TID_COUNT))
                 return IWL_MAX_TID_COUNT;
 
         tl = &lq_data->load[tid];
@@ -352,7 +352,7 @@ static void rs_program_fix_rate(struct iwl_priv *priv,
         lq_sta->active_mimo2_rate  = 0x1FD0;    /* 6 - 60 MBits, no 9, no CCK */
         lq_sta->active_mimo3_rate  = 0x1FD0;    /* 6 - 60 MBits, no 9, no CCK */
 
-#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL
+#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE
         /* testmode has higher priority to overwirte the fixed rate */
         if (priv->tm_fixed_rate)
                 lq_sta->dbg_fixed_rate = priv->tm_fixed_rate;
@@ -379,7 +379,7 @@ static u32 rs_tl_get_load(struct iwl_lq_sta *lq_data, u8 tid)
         s32 index;
         struct iwl_traffic_load *tl = NULL;
 
-        if (tid >= TID_MAX_LOAD_COUNT)
+        if (tid >= IWL_MAX_TID_COUNT)
                 return 0;
 
         tl = &(lq_data->load[tid]);
@@ -444,11 +444,11 @@ static void rs_tl_turn_on_agg(struct iwl_priv *priv, u8 tid,
                               struct iwl_lq_sta *lq_data,
                               struct ieee80211_sta *sta)
 {
-        if (tid < TID_MAX_LOAD_COUNT)
+        if (tid < IWL_MAX_TID_COUNT)
                 rs_tl_turn_on_agg_for_tid(priv, lq_data, tid, sta);
         else
-                IWL_ERR(priv, "tid exceeds max load count: %d/%d\n",
-                        tid, TID_MAX_LOAD_COUNT);
+                IWL_ERR(priv, "tid exceeds max TID count: %d/%d\n",
+                        tid, IWL_MAX_TID_COUNT);
 }
 
 static inline int get_num_of_ant_from_rate(u32 rate_n_flags)
@@ -1081,7 +1081,7 @@ done:
         if (sta && sta->supp_rates[sband->band])
                 rs_rate_scale_perform(priv, skb, sta, lq_sta);
 
-#if defined(CONFIG_MAC80211_DEBUGFS) && defined(CONFIG_IWLWIFI_DEVICE_SVTOOL)
+#if defined(CONFIG_MAC80211_DEBUGFS) && defined(CONFIG_IWLWIFI_DEVICE_TESTMODE)
         if ((priv->tm_fixed_rate) &&
             (priv->tm_fixed_rate != lq_sta->dbg_fixed_rate))
                 rs_program_fix_rate(priv, lq_sta);
@@ -2904,7 +2904,7 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i
         if (sband->band == IEEE80211_BAND_5GHZ)
                 lq_sta->last_txrate_idx += IWL_FIRST_OFDM_RATE;
         lq_sta->is_agg = 0;
-#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL
+#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE
         priv->tm_fixed_rate = 0;
 #endif
 #ifdef CONFIG_MAC80211_DEBUGFS
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
index f4f6deb829ae..6675b3c816d9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
@@ -281,7 +281,6 @@ enum {
 #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))
@@ -402,7 +401,7 @@ struct iwl_lq_sta {
 
         struct iwl_link_quality_cmd lq;
         struct iwl_scale_tbl_info lq_info[LQ_SIZE]; /* "active", "search" */
-        struct iwl_traffic_load load[TID_MAX_LOAD_COUNT];
+        struct iwl_traffic_load load[IWL_MAX_TID_COUNT];
         u8 tx_agg_tid_en;
 #ifdef CONFIG_MAC80211_DEBUGFS
         struct dentry *rs_sta_dbgfs_scale_table_file;
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
index fdb4c3786114..9001c23f27bb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
@@ -117,6 +117,7 @@ const char *get_cmd_string(u8 cmd)
                 IWL_CMD(REPLY_WOWLAN_TKIP_PARAMS);
                 IWL_CMD(REPLY_WOWLAN_KEK_KCK_MATERIAL);
                 IWL_CMD(REPLY_WOWLAN_GET_STATUS);
+                IWL_CMD(REPLY_D3_CONFIG);
         default:
                 return "UNKNOWN";
 
@@ -1130,9 +1131,9 @@ void iwl_setup_rx_handlers(struct iwl_priv *priv)
         priv->rx_handlers[REPLY_TX] = iwlagn_rx_reply_tx;
 
         /* set up notification wait support */
-        spin_lock_init(&priv->notif_wait_lock);
-        INIT_LIST_HEAD(&priv->notif_waits);
-        init_waitqueue_head(&priv->notif_waitq);
+        spin_lock_init(&priv->shrd->notif_wait_lock);
+        INIT_LIST_HEAD(&priv->shrd->notif_waits);
+        init_waitqueue_head(&priv->shrd->notif_waitq);
 
         /* Set up BT Rx handlers */
         if (priv->cfg->lib->bt_rx_handler_setup)
@@ -1151,11 +1152,11 @@ int iwl_rx_dispatch(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,
          * even if the RX handler consumes the RXB we have
          * access to it in the notification wait entry.
          */
-        if (!list_empty(&priv->notif_waits)) {
+        if (!list_empty(&priv->shrd->notif_waits)) {
                 struct iwl_notification_wait *w;
 
-                spin_lock(&priv->notif_wait_lock);
-                list_for_each_entry(w, &priv->notif_waits, list) {
+                spin_lock(&priv->shrd->notif_wait_lock);
+                list_for_each_entry(w, &priv->shrd->notif_waits, list) {
                         if (w->cmd != pkt->hdr.cmd)
                                 continue;
                         IWL_DEBUG_RX(priv,
@@ -1164,11 +1165,11 @@ int iwl_rx_dispatch(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,
                                 pkt->hdr.cmd);
                         w->triggered = true;
                         if (w->fn)
-                                w->fn(priv, pkt, w->fn_data);
+                                w->fn(trans(priv), pkt, w->fn_data);
                 }
-                spin_unlock(&priv->notif_wait_lock);
+                spin_unlock(&priv->shrd->notif_wait_lock);
 
-                wake_up_all(&priv->notif_waitq);
+                wake_up_all(&priv->shrd->notif_waitq);
         }
 
         if (priv->pre_rx_handler)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 8de97f5a1825..d21f535a3b4f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -60,7 +60,7 @@ static int iwlagn_disable_pan(struct iwl_priv *priv,
         u8 old_dev_type = send->dev_type;
         int ret;
 
-        iwlagn_init_notification_wait(priv, &disable_wait,
+        iwl_init_notification_wait(priv->shrd, &disable_wait,
                                       REPLY_WIPAN_DEACTIVATION_COMPLETE,
                                       NULL, NULL);
 
@@ -74,9 +74,9 @@ static int iwlagn_disable_pan(struct iwl_priv *priv,
 
         if (ret) {
                 IWL_ERR(priv, "Error disabling PAN (%d)\n", ret);
-                iwlagn_remove_notification(priv, &disable_wait);
+                iwl_remove_notification(priv->shrd, &disable_wait);
         } else {
-                ret = iwlagn_wait_notification(priv, &disable_wait, HZ);
+                ret = iwl_wait_notification(priv->shrd, &disable_wait, HZ);
                 if (ret)
                         IWL_ERR(priv, "Timed out waiting for PAN disable\n");
         }
@@ -529,6 +529,24 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
         return 0;
 }
 
+void iwlagn_config_ht40(struct ieee80211_conf *conf,
+        struct iwl_rxon_context *ctx)
+{
+        if (conf_is_ht40_minus(conf)) {
+                ctx->ht.extension_chan_offset =
+                        IEEE80211_HT_PARAM_CHA_SEC_BELOW;
+                ctx->ht.is_40mhz = true;
+        } else if (conf_is_ht40_plus(conf)) {
+                ctx->ht.extension_chan_offset =
+                        IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
+                ctx->ht.is_40mhz = true;
+        } else {
+                ctx->ht.extension_chan_offset =
+                        IEEE80211_HT_PARAM_CHA_SEC_NONE;
+                ctx->ht.is_40mhz = false;
+        }
+}
+
 int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
 {
         struct iwl_priv *priv = hw->priv;
@@ -590,19 +608,11 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
                                 ctx->ht.enabled = conf_is_ht(conf);
 
                         if (ctx->ht.enabled) {
-                                if (conf_is_ht40_minus(conf)) {
-                                        ctx->ht.extension_chan_offset =
-                                                IEEE80211_HT_PARAM_CHA_SEC_BELOW;
-                                        ctx->ht.is_40mhz = true;
-                                } else if (conf_is_ht40_plus(conf)) {
-                                        ctx->ht.extension_chan_offset =
-                                                IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
-                                        ctx->ht.is_40mhz = true;
-                                } else {
-                                        ctx->ht.extension_chan_offset =
-                                                IEEE80211_HT_PARAM_CHA_SEC_NONE;
-                                        ctx->ht.is_40mhz = false;
-                                }
+                                /* if HT40 is used, it should not change
+                                 * after associated except channel switch */
+                                if (!ctx->ht.is_40mhz ||
+                                                !iwl_is_associated_ctx(ctx))
+                                        iwlagn_config_ht40(conf, ctx);
                         } else
                                 ctx->ht.is_40mhz = false;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
index 901fd9485d75..63d948d21c04 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
@@ -135,8 +135,8 @@ static u16 iwlagn_build_addsta_hcmd(const struct iwl_addsta_cmd *cmd, u8 *data)
         u16 size = (u16)sizeof(struct iwl_addsta_cmd);
         struct iwl_addsta_cmd *addsta = (struct iwl_addsta_cmd *)data;
         memcpy(addsta, cmd, size);
-        /* resrved in 5000 */
-        addsta->rate_n_flags = cpu_to_le16(0);
+        /* resrved in agn */
+        addsta->legacy_reserved = cpu_to_le16(0);
         return size;
 }
 
@@ -1250,9 +1250,6 @@ int iwl_set_dynamic_key(struct iwl_priv *priv,
 
         switch (keyconf->cipher) {
         case WLAN_CIPHER_SUITE_TKIP:
-                keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
-                keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
-
                 if (sta)
                         addr = sta->addr;
                 else /* station mode case only */
@@ -1265,8 +1262,6 @@ int iwl_set_dynamic_key(struct iwl_priv *priv,
                                           seq.tkip.iv32, p1k, CMD_SYNC);
                 break;
         case WLAN_CIPHER_SUITE_CCMP:
-                keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
-                /* fall through */
         case WLAN_CIPHER_SUITE_WEP40:
         case WLAN_CIPHER_SUITE_WEP104:
                 ret = iwlagn_send_sta_key(priv, keyconf, sta_id,
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index e6a02e09ee18..81754cddba73 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@ -91,7 +91,10 @@ static void iwlagn_tx_cmd_build_basic(struct iwl_priv *priv,
                 tx_cmd->tid_tspec = qc[0] & 0xf;
                 tx_flags &= ~TX_CMD_FLG_SEQ_CTL_MSK;
         } else {
-                tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
+                if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)
+                        tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
+                else
+                        tx_flags &= ~TX_CMD_FLG_SEQ_CTL_MSK;
         }
 
         iwlagn_tx_cmd_protection(priv, info, fc, &tx_flags);
@@ -148,7 +151,7 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,
         if (ieee80211_is_data(fc)) {
                 tx_cmd->initial_rate_index = 0;
                 tx_cmd->tx_flags |= TX_CMD_FLG_STA_RATE_MSK;
-#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL
+#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE
                 if (priv->tm_fixed_rate) {
                         /*
                          * rate overwrite by testmode
@@ -161,7 +164,8 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,
                 }
 #endif
                 return;
-        }
+        } else if (ieee80211_is_back_req(fc))
+                tx_cmd->tx_flags |= TX_CMD_FLG_STA_RATE_MSK;
 
         /**
          * If the current TX rate stored in mac80211 has the MCS bit set, it's
@@ -790,6 +794,7 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,
                 iwl_rx_reply_tx_agg(priv, tx_resp);
 
         if (tx_resp->frame_count == 1) {
+                IWL_DEBUG_TX_REPLY(priv, "Q %d, ssn %d", txq_id, ssn);
                 __skb_queue_head_init(&skbs);
                 /*we can free until ssn % q.n_bd not inclusive */
                 iwl_trans_reclaim(trans(priv), sta_id, tid, txq_id,
@@ -920,11 +925,9 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
                            ba_resp->sta_id);
         IWL_DEBUG_TX_REPLY(priv, "TID = %d, SeqCtl = %d, bitmap = 0x%llx, "
                            "scd_flow = %d, scd_ssn = %d\n",
-                           ba_resp->tid,
-                           ba_resp->seq_ctl,
+                           ba_resp->tid, ba_resp->seq_ctl,
                            (unsigned long long)le64_to_cpu(ba_resp->bitmap),
-                           ba_resp->scd_flow,
-                           ba_resp->scd_ssn);
+                           scd_flow, ba_resp_scd_ssn);
 
         /* Mark that the expected block-ack response arrived */
         agg->wait_for_ba = false;
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index e235e84de8b4..f5fe42dbb3b0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -366,7 +366,7 @@ static void iwl_continuous_event_trace(struct iwl_priv *priv)
         u32 num_wraps;  /* # times uCode wrapped to top of log */
         u32 next_entry; /* index of next entry to be written by uCode */
 
-        base = priv->device_pointers.error_event_table;
+        base = priv->shrd->device_pointers.error_event_table;
         if (iwlagn_hw_valid_rtc_data_addr(base)) {
                 capacity = iwl_read_targ_mem(bus(priv), base);
                 num_wraps = iwl_read_targ_mem(bus(priv),
@@ -1036,6 +1036,9 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
                 priv->inst_evtlog_size =
                         priv->cfg->base_params->max_event_log_size;
         priv->inst_errlog_ptr = pieces.inst_errlog_ptr;
+#ifndef CONFIG_IWLWIFI_P2P
+        ucode_capa.flags &= ~IWL_UCODE_TLV_FLAGS_PAN;
+#endif
 
         priv->new_scan_threshold_behaviour =
                 !!(ucode_capa.flags & IWL_UCODE_TLV_FLAGS_NEWSCAN);
@@ -1057,7 +1060,6 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
                 priv->sta_key_max_num = STA_KEY_MAX_NUM;
                 priv->shrd->cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;
         }
-
         /*
          * figure out the offset of chain noise reset and gain commands
          * base on the size of standard phy calibration commands table size
@@ -1232,14 +1234,14 @@ int iwl_alive_start(struct iwl_priv *priv)
                 priv->bt_valid = IWLAGN_BT_VALID_ENABLE_FLAGS;
                 priv->cur_rssi_ctx = NULL;
 
-                iwlagn_send_prio_tbl(priv);
+                iwl_send_prio_tbl(trans(priv));
 
                 /* FIXME: w/a to force change uCode BT state machine */
-                ret = iwlagn_send_bt_env(priv, IWL_BT_COEX_ENV_OPEN,
+                ret = iwl_send_bt_env(trans(priv), IWL_BT_COEX_ENV_OPEN,
                                          BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);
                 if (ret)
                         return ret;
-                ret = iwlagn_send_bt_env(priv, IWL_BT_COEX_ENV_CLOSE,
+                ret = iwl_send_bt_env(trans(priv), IWL_BT_COEX_ENV_CLOSE,
                                          BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);
                 if (ret)
                         return ret;
@@ -1575,6 +1577,8 @@ static int iwl_init_drv(struct iwl_priv *priv)
 
         mutex_init(&priv->shrd->mutex);
 
+        INIT_LIST_HEAD(&trans(priv)->calib_results);
+
         priv->ieee_channels = NULL;
         priv->ieee_rates = NULL;
         priv->band = IEEE80211_BAND_2GHZ;
@@ -1631,7 +1635,6 @@ err:
 
 static void iwl_uninit_drv(struct iwl_priv *priv)
 {
-        iwl_calib_free_results(priv);
         iwl_free_geos(priv);
         iwl_free_channel_map(priv);
         if (priv->tx_cmd_pool)
@@ -1680,6 +1683,41 @@ static int iwl_set_hw_params(struct iwl_priv *priv)
 
 
 
+static void iwl_debug_config(struct iwl_priv *priv)
+{
+        dev_printk(KERN_INFO, bus(priv)->dev, "CONFIG_IWLWIFI_DEBUG "
+#ifdef CONFIG_IWLWIFI_DEBUG
+                "enabled\n");
+#else
+                "disabled\n");
+#endif
+        dev_printk(KERN_INFO, bus(priv)->dev, "CONFIG_IWLWIFI_DEBUGFS "
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+                "enabled\n");
+#else
+                "disabled\n");
+#endif
+        dev_printk(KERN_INFO, bus(priv)->dev, "CONFIG_IWLWIFI_DEVICE_TRACING "
+#ifdef CONFIG_IWLWIFI_DEVICE_TRACING
+                "enabled\n");
+#else
+                "disabled\n");
+#endif
+
+        dev_printk(KERN_INFO, bus(priv)->dev, "CONFIG_IWLWIFI_DEVICE_TESTMODE "
+#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE
+                "enabled\n");
+#else
+                "disabled\n");
+#endif
+        dev_printk(KERN_INFO, bus(priv)->dev, "CONFIG_IWLWIFI_P2P "
+#ifdef CONFIG_IWLWIFI_P2P
+                "enabled\n");
+#else
+                "disabled\n");
+#endif
+}
+
 int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops,
                 struct iwl_cfg *cfg)
 {
@@ -1715,6 +1753,9 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops,
 
         SET_IEEE80211_DEV(hw, bus(priv)->dev);
 
+        /* what debugging capabilities we have */
+        iwl_debug_config(priv);
+
         IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
         priv->cfg = cfg;
 
@@ -1780,11 +1821,11 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops,
                 goto out_free_eeprom;
 
         /* extract MAC Address */
-        iwl_eeprom_get_mac(priv, priv->addresses[0].addr);
+        iwl_eeprom_get_mac(priv->shrd, priv->addresses[0].addr);
         IWL_DEBUG_INFO(priv, "MAC address: %pM\n", priv->addresses[0].addr);
         priv->hw->wiphy->addresses = priv->addresses;
         priv->hw->wiphy->n_addresses = 1;
-        num_mac = iwl_eeprom_query16(priv, EEPROM_NUM_MAC_ADDRESS);
+        num_mac = iwl_eeprom_query16(priv->shrd, EEPROM_NUM_MAC_ADDRESS);
         if (num_mac > 1) {
                 memcpy(priv->addresses[1].addr, priv->addresses[0].addr,
                        ETH_ALEN);
@@ -1849,7 +1890,7 @@ out_destroy_workqueue:
         priv->shrd->workqueue = NULL;
         iwl_uninit_drv(priv);
 out_free_eeprom:
-        iwl_eeprom_free(priv);
+        iwl_eeprom_free(priv->shrd);
 out_free_trans:
         iwl_trans_free(trans(priv));
 out_free_traffic_mem:
@@ -1888,7 +1929,7 @@ void __devexit iwl_remove(struct iwl_priv * priv)
 
         iwl_dealloc_ucode(trans(priv));
 
-        iwl_eeprom_free(priv);
+        iwl_eeprom_free(priv->shrd);
 
         /*netif_stop_queue(dev); */
         flush_workqueue(priv->shrd->workqueue);
@@ -1988,9 +2029,10 @@ MODULE_PARM_DESC(plcp_check, "Check plcp health (default: 1 [enabled])");
 module_param_named(ack_check, iwlagn_mod_params.ack_check, bool, S_IRUGO);
 MODULE_PARM_DESC(ack_check, "Check ack health (default: 0 [disabled])");
 
-module_param_named(wd_disable, iwlagn_mod_params.wd_disable, bool, S_IRUGO);
+module_param_named(wd_disable, iwlagn_mod_params.wd_disable, int, S_IRUGO);
 MODULE_PARM_DESC(wd_disable,
-                "Disable stuck queue watchdog timer (default: 0 [enabled])");
+                "Disable stuck queue watchdog timer 0=system default, "
+                "1=disable, 2=enable (default: 0)");
 
 /*
  * set bt_coex_active to true, uCode will do kill/defer
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h
index 5d8d2f445923..eb453ea41c41 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.h
@@ -101,13 +101,15 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
                              struct ieee80211_vif *vif,
                              struct ieee80211_bss_conf *bss_conf,
                              u32 changes);
+void iwlagn_config_ht40(struct ieee80211_conf *conf,
+                        struct iwl_rxon_context *ctx);
 
 /* uCode */
 int iwlagn_rx_calib_result(struct iwl_priv *priv,
                             struct iwl_rx_mem_buffer *rxb,
                             struct iwl_device_cmd *cmd);
-int iwlagn_send_bt_env(struct iwl_priv *priv, u8 action, u8 type);
-void iwlagn_send_prio_tbl(struct iwl_priv *priv);
+int iwl_send_bt_env(struct iwl_trans *trans, u8 action, u8 type);
+void iwl_send_prio_tbl(struct iwl_trans *trans);
 int iwlagn_run_init_ucode(struct iwl_priv *priv);
 int iwlagn_load_ucode_wait_alive(struct iwl_priv *priv,
                                  enum iwl_ucode_type ucode_type);
@@ -115,7 +117,7 @@ int iwlagn_load_ucode_wait_alive(struct iwl_priv *priv,
 /* lib */
 int iwlagn_send_tx_power(struct iwl_priv *priv);
 void iwlagn_temperature(struct iwl_priv *priv);
-u16 iwlagn_eeprom_calib_version(struct iwl_priv *priv);
+u16 iwl_eeprom_calib_version(struct iwl_shared *shrd);
 int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control);
 void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control);
 int iwlagn_send_beacon_cmd(struct iwl_priv *priv);
@@ -352,28 +354,12 @@ static inline __le32 iwl_hw_set_rate_n_flags(u8 rate, u32 flags)
 
 /* eeprom */
 void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv);
-void iwl_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac);
-
-/* notification wait support */
-void __acquires(wait_entry)
-iwlagn_init_notification_wait(struct iwl_priv *priv,
-                              struct iwl_notification_wait *wait_entry,
-                              u8 cmd,
-                              void (*fn)(struct iwl_priv *priv,
-                                         struct iwl_rx_packet *pkt,
-                                         void *data),
-                              void *fn_data);
-int __must_check __releases(wait_entry)
-iwlagn_wait_notification(struct iwl_priv *priv,
-                         struct iwl_notification_wait *wait_entry,
-                         unsigned long timeout);
-void __releases(wait_entry)
-iwlagn_remove_notification(struct iwl_priv *priv,
-                           struct iwl_notification_wait *wait_entry);
+void iwl_eeprom_get_mac(const struct iwl_shared *shrd, u8 *mac);
+
 extern int iwlagn_init_alive_start(struct iwl_priv *priv);
 extern int iwl_alive_start(struct iwl_priv *priv);
 /* svtool */
-#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL
+#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE
 extern int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data,
                                    int len);
 extern int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index f4eccf583775..265de39d394c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -109,10 +109,10 @@ enum {
         /* RX, TX, LEDs */
         REPLY_TX = 0x1c,
         REPLY_LEDS_CMD = 0x48,
-        REPLY_TX_LINK_QUALITY_CMD = 0x4e, /* for 4965 and up */
+        REPLY_TX_LINK_QUALITY_CMD = 0x4e,
 
         /* WiMAX coexistence */
-        COEX_PRIORITY_TABLE_CMD = 0x5a, /* for 5000 series and up */
+        COEX_PRIORITY_TABLE_CMD = 0x5a,
         COEX_MEDIUM_NOTIFICATION = 0x5b,
         COEX_EVENT_CMD = 0x5c,
 
@@ -466,23 +466,27 @@ struct iwl_error_event_table {
         u32 frame_ptr;          /* frame pointer */
         u32 stack_ptr;          /* stack pointer */
         u32 hcmd;               /* last host command header */
-#if 0
-        /* no need to read the remainder, we don't use the values */
-        u32 isr0;               /* isr status register LMPM_NIC_ISR0: rxtx_flag */
-        u32 isr1;               /* isr status register LMPM_NIC_ISR1: host_flag */
-        u32 isr2;               /* isr status register LMPM_NIC_ISR2: enc_flag */
-        u32 isr3;               /* isr status register LMPM_NIC_ISR3: time_flag */
-        u32 isr4;               /* isr status register LMPM_NIC_ISR4: wico interrupt */
+        u32 isr0;               /* isr status register LMPM_NIC_ISR0:
+                                 * rxtx_flag */
+        u32 isr1;               /* isr status register LMPM_NIC_ISR1:
+                                 * host_flag */
+        u32 isr2;               /* isr status register LMPM_NIC_ISR2:
+                                 * enc_flag */
+        u32 isr3;               /* isr status register LMPM_NIC_ISR3:
+                                 * time_flag */
+        u32 isr4;               /* isr status register LMPM_NIC_ISR4:
+                                 * wico interrupt */
         u32 isr_pref;           /* isr status register LMPM_NIC_PREF_STAT */
         u32 wait_event;         /* wait event() caller address */
         u32 l2p_control;        /* L2pControlField */
         u32 l2p_duration;       /* L2pDurationField */
         u32 l2p_mhvalid;        /* L2pMhValidBits */
         u32 l2p_addr_match;     /* L2pAddrMatchStat */
-        u32 lmpm_pmg_sel;       /* indicate which clocks are turned on (LMPM_PMG_SEL) */
-        u32 u_timestamp;        /* indicate when the date and time of the compilation */
+        u32 lmpm_pmg_sel;       /* indicate which clocks are turned on
+                                 * (LMPM_PMG_SEL) */
+        u32 u_timestamp;        /* indicate when the date and time of the
+                                 * compilation */
         u32 flow_handler;       /* FH read/write pointers, RX credit */
-#endif
 } __packed;
 
 struct iwl_alive_resp {
@@ -810,7 +814,7 @@ struct iwl_qosparam_cmd {
 #define IWLAGN_STATION_COUNT    16
 
 #define IWL_INVALID_STATION     255
-#define IWL_MAX_TID_COUNT       9
+#define IWL_MAX_TID_COUNT       8
 
 #define STA_FLG_TX_RATE_MSK             cpu_to_le32(1 << 2)
 #define STA_FLG_PWR_SAVE_MSK            cpu_to_le32(1 << 8)
@@ -931,8 +935,7 @@ struct iwl_addsta_cmd {
          * corresponding to bit (e.g. bit 5 controls TID 5).
          * Set modify_mask bit STA_MODIFY_TID_DISABLE_TX to use this field. */
         __le16 tid_disable_tx;
-
-        __le16  rate_n_flags;           /* 3945 only */
+        __le16 legacy_reserved;
 
         /* TID for which to add block-ack support.
          * Set modify_mask bit STA_MODIFY_ADDBA_TID_MSK to use this field. */
@@ -1162,8 +1165,7 @@ struct iwl_rx_mpdu_res_start {
  *
  * uCode handles retrying Tx when an ACK is expected but not received.
  * This includes trying lower data rates than the one requested in the Tx
- * command, as set up by the REPLY_RATE_SCALE (for 3945) or
- * REPLY_TX_LINK_QUALITY_CMD (agn).
+ * command, as set up by the REPLY_TX_LINK_QUALITY_CMD (agn).
  *
  * Driver sets up transmit power for various rates via REPLY_TX_PWR_TABLE_CMD.
  * This command must be executed after every RXON command, before Tx can occur.
@@ -1175,25 +1177,9 @@ struct iwl_rx_mpdu_res_start {
  * 1: Use RTS/CTS protocol or CTS-to-self if spec allows it
  * before this frame. if CTS-to-self required check
  * RXON_FLG_SELF_CTS_EN status.
- * unused in 3945/4965, used in 5000 series and after
  */
 #define TX_CMD_FLG_PROT_REQUIRE_MSK cpu_to_le32(1 << 0)
 
-/*
- * 1: Use Request-To-Send protocol before this frame.
- * Mutually exclusive vs. TX_CMD_FLG_CTS_MSK.
- * used in 3945/4965, unused in 5000 series and after
- */
-#define TX_CMD_FLG_RTS_MSK cpu_to_le32(1 << 1)
-
-/*
- * 1: Transmit Clear-To-Send to self before this frame.
- * Driver should set this for AUTH/DEAUTH/ASSOC-REQ/REASSOC mgmnt frames.
- * Mutually exclusive vs. TX_CMD_FLG_RTS_MSK.
- * used in 3945/4965, unused in 5000 series and after
- */
-#define TX_CMD_FLG_CTS_MSK cpu_to_le32(1 << 2)
-
 /* 1: Expect ACK from receiving station
  * 0: Don't expect ACK (MAC header's duration field s/b 0)
  * Set this for unicast frames, but not broadcast/multicast. */
@@ -1211,18 +1197,8 @@ struct iwl_rx_mpdu_res_start {
  * Set when Txing a block-ack request frame.  Also set TX_CMD_FLG_ACK_MSK. */
 #define TX_CMD_FLG_IMM_BA_RSP_MASK  cpu_to_le32(1 << 6)
 
-/*
- * 1: Frame requires full Tx-Op protection.
- * Set this if either RTS or CTS Tx Flag gets set.
- * used in 3945/4965, unused in 5000 series and after
- */
-#define TX_CMD_FLG_FULL_TXOP_PROT_MSK cpu_to_le32(1 << 7)
-
-/* Tx antenna selection field; used only for 3945, reserved (0) for agn devices.
- * Set field to "0" to allow 3945 uCode to select antenna (normal usage). */
+/* Tx antenna selection field; reserved (0) for agn devices. */
 #define TX_CMD_FLG_ANT_SEL_MSK cpu_to_le32(0xf00)
-#define TX_CMD_FLG_ANT_A_MSK cpu_to_le32(1 << 8)
-#define TX_CMD_FLG_ANT_B_MSK cpu_to_le32(1 << 9)
 
 /* 1: Ignore Bluetooth priority for this frame.
  * 0: Delay Tx until Bluetooth device is done (normal usage). */
@@ -1568,7 +1544,6 @@ struct iwl_compressed_ba_resp {
         __le64 bitmap;
         __le16 scd_flow;
         __le16 scd_ssn;
-        /* following only for 5000 series and up */
         u8 txed;        /* number of frames sent */
         u8 txed_2_done; /* number of frames acked */
 } __packed;
@@ -1670,7 +1645,7 @@ struct iwl_link_qual_agg_params {
 /*
  * REPLY_TX_LINK_QUALITY_CMD = 0x4e (command, has simple generic response)
  *
- * For agn devices only; 3945 uses REPLY_RATE_SCALE.
+ * For agn devices
  *
  * Each station in the agn device's internal station table has its own table
  * of 16
@@ -1919,7 +1894,7 @@ struct iwl_link_quality_cmd {
 /*
  * REPLY_BT_CONFIG = 0x9b (command, has simple generic response)
  *
- * 3945 and agn devices support hardware handshake with Bluetooth device on
+ * agn devices support hardware handshake with Bluetooth device on
  * same platform.  Bluetooth device alerts wireless device when it will Tx;
  * wireless device can delay or kill its own Tx to accommodate.
  */
@@ -2203,8 +2178,8 @@ struct iwl_spectrum_notification {
 
 struct iwl_powertable_cmd {
         __le16 flags;
-        u8 keep_alive_seconds;          /* 3945 reserved */
-        u8 debug_flags;                 /* 3945 reserved */
+        u8 keep_alive_seconds;
+        u8 debug_flags;
         __le32 rx_data_timeout;
         __le32 tx_data_timeout;
         __le32 sleep_interval[IWL_POWER_VEC_SIZE];
@@ -2325,9 +2300,9 @@ struct iwl_scan_channel {
 /**
  * struct iwl_ssid_ie - directed scan network information element
  *
- * Up to 20 of these may appear in REPLY_SCAN_CMD (Note: Only 4 are in
- * 3945 SCAN api), selected by "type" bit field in struct iwl_scan_channel;
- * each channel may select different ssids from among the 20 (4) entries.
+ * Up to 20 of these may appear in REPLY_SCAN_CMD,
+ * selected by "type" bit field in struct iwl_scan_channel;
+ * each channel may select different ssids from among the 20 entries.
  * SSID IEs get transmitted in reverse order of entry.
  */
 struct iwl_ssid_ie {
@@ -2336,7 +2311,6 @@ struct iwl_ssid_ie {
         u8 ssid[32];
 } __packed;
 
-#define PROBE_OPTION_MAX_3945           4
 #define PROBE_OPTION_MAX                20
 #define TX_CMD_LIFE_TIME_INFINITE       cpu_to_le32(0xFFFFFFFF)
 #define IWL_GOOD_CRC_TH_DISABLED        0
@@ -2417,8 +2391,6 @@ struct iwl_scan_cmd {
                                  * channel */
         __le32 suspend_time;    /* pause scan this long (in "extended beacon
                                  * format") when returning to service chnl:
-                                 * 3945; 31:24 # beacons, 19:0 additional usec,
-                                 * 4965; 31:22 # beacons, 21:0 additional usec.
                                  */
         __le32 flags;           /* RXON_FLG_* */
         __le32 filter_flags;    /* RXON_FILTER_* */
@@ -2734,7 +2706,7 @@ struct statistics_div {
 
 struct statistics_general_common {
         __le32 temperature;   /* radio temperature */
-        __le32 temperature_m; /* for 5000 and up, this is radio voltage */
+        __le32 temperature_m; /* radio voltage */
         struct statistics_dbg dbg;
         __le32 sleep_time;
         __le32 slots_out;
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index f9e9170e977a..3b6f48bfe0e3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -836,19 +836,6 @@ void iwl_print_rx_config_cmd(struct iwl_priv *priv,
 }
 #endif
 
-static void iwlagn_abort_notification_waits(struct iwl_priv *priv)
-{
-        unsigned long flags;
-        struct iwl_notification_wait *wait_entry;
-
-        spin_lock_irqsave(&priv->notif_wait_lock, flags);
-        list_for_each_entry(wait_entry, &priv->notif_waits, list)
-                wait_entry->aborted = true;
-        spin_unlock_irqrestore(&priv->notif_wait_lock, flags);
-
-        wake_up_all(&priv->notif_waitq);
-}
-
 void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)
 {
         unsigned int reload_msec;
@@ -860,7 +847,7 @@ void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)
         /* Cancel currently queued command. */
         clear_bit(STATUS_HCMD_ACTIVE, &priv->shrd->status);
 
-        iwlagn_abort_notification_waits(priv);
+        iwl_abort_notification_waits(priv->shrd);
 
         /* Keep the restart process from trying to send host
          * commands by clearing the ready bit */
@@ -1505,11 +1492,23 @@ void iwl_setup_watchdog(struct iwl_priv *priv)
 {
         unsigned int timeout = priv->cfg->base_params->wd_timeout;
 
-        if (timeout && !iwlagn_mod_params.wd_disable)
-                mod_timer(&priv->watchdog,
-                          jiffies + msecs_to_jiffies(IWL_WD_TICK(timeout)));
-        else
-                del_timer(&priv->watchdog);
+        if (!iwlagn_mod_params.wd_disable) {
+                /* use system default */
+                if (timeout && !priv->cfg->base_params->wd_disable)
+                        mod_timer(&priv->watchdog,
+                                jiffies +
+                                msecs_to_jiffies(IWL_WD_TICK(timeout)));
+                else
+                        del_timer(&priv->watchdog);
+        } else {
+                /* module parameter overwrite default configuration */
+                if (timeout && iwlagn_mod_params.wd_disable == 2)
+                        mod_timer(&priv->watchdog,
+                                jiffies +
+                                msecs_to_jiffies(IWL_WD_TICK(timeout)));
+                else
+                        del_timer(&priv->watchdog);
+        }
 }
 
 /**
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index fa47f75185df..6da53a36c1be 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -113,6 +113,7 @@ struct iwl_lib_ops {
  * @shadow_reg_enable: HW shadhow register bit
  * @no_idle_support: do not support idle mode
  * @hd_v2: v2 of enhanced sensitivity value, used for 2000 series and up
+ * wd_disable: disable watchdog timer
  */
 struct iwl_base_params {
         int eeprom_size;
@@ -134,6 +135,7 @@ struct iwl_base_params {
         const bool shadow_reg_enable;
         const bool no_idle_support;
         const bool hd_v2;
+        const bool wd_disable;
 };
 /*
  * @advanced_bt_coexist: support advanced bt coexist
@@ -184,8 +186,9 @@ struct iwl_ht_params {
  * @ht_params: point to ht patameters
  * @bt_params: pointer to bt parameters
  * @pa_type: used by 6000 series only to identify the type of Power Amplifier
- * @need_dc_calib: need to perform init dc calibration
  * @need_temp_offset_calib: need to perform temperature offset calibration
+ * @no_xtal_calib: some devices do not need crystal calibration data,
+ *      don't send it to those
  * @scan_antennas: available antenna for scan operation
  * @led_mode: 0=blinking, 1=On(RF On)/Off(RF Off)
  * @adv_pm: advance power management
@@ -222,8 +225,8 @@ struct iwl_cfg {
         struct iwl_ht_params *ht_params;
         struct iwl_bt_params *bt_params;
         enum iwl_pa_type pa_type;         /* if used set to IWL_PA_SYSTEM */
-        const bool need_dc_calib;         /* if used set to true */
         const bool need_temp_offset_calib; /* if used set to true */
+        const bool no_xtal_calib;
         u8 scan_rx_antennas[IEEE80211_NUM_BANDS];
         enum iwl_led_mode led_mode;
         const bool adv_pm;
diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
index 40ef97bac1aa..f8fc2393dd4c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
@@ -47,20 +47,21 @@ do {									\
 } while (0)
 
 #ifdef CONFIG_IWLWIFI_DEBUG
-#define IWL_DEBUG(m, level, fmt, args...)                               \
+#define IWL_DEBUG(m, level, fmt, ...)                                   \
 do {                                                                    \
         if (iwl_get_debug_level((m)->shrd) & (level))                   \
-                dev_printk(KERN_ERR, bus(m)->dev,                       \
-                         "%c %s " fmt, in_interrupt() ? 'I' : 'U',      \
-                        __func__ , ## args);                            \
+                dev_err(bus(m)->dev, "%c %s " fmt,                      \
+                        in_interrupt() ? 'I' : 'U', __func__,           \
+                        ##__VA_ARGS__);                                 \
 } while (0)
 
-#define IWL_DEBUG_LIMIT(m, level, fmt, args...)                         \
+#define IWL_DEBUG_LIMIT(m, level, fmt, ...)                             \
 do {                                                                    \
-        if (iwl_get_debug_level((m)->shrd) & (level) && net_ratelimit())\
-                dev_printk(KERN_ERR, bus(m)->dev,                       \
-                        "%c %s " fmt, in_interrupt() ? 'I' : 'U',       \
-                         __func__ , ## args);                           \
+        if (iwl_get_debug_level((m)->shrd) & (level) &&                 \
+            net_ratelimit())                                            \
+                dev_err(bus(m)->dev, "%c %s " fmt,                      \
+                        in_interrupt() ? 'I' : 'U', __func__,           \
+                        ##__VA_ARGS__);                                 \
 } while (0)
 
 #define iwl_print_hex_dump(m, level, p, len)                            \
@@ -70,14 +71,18 @@ do {                                            			\
                                DUMP_PREFIX_OFFSET, 16, 1, p, len, 1);   \
 } while (0)
 
-#define IWL_DEBUG_QUIET_RFKILL(p, fmt, args...)                 \
+#define IWL_DEBUG_QUIET_RFKILL(p, fmt, ...)                             \
 do {                                                                    \
-        if (!iwl_is_rfkill(p->shrd))                            \
-                dev_printk(KERN_ERR, bus(p)->dev, "%c %s " fmt, \
-                (in_interrupt() ? 'I' : 'U'), __func__ , ##args);       \
-        else if (iwl_get_debug_level(p->shrd) & IWL_DL_RADIO)   \
-                dev_printk(KERN_ERR, bus(p)->dev, "(RFKILL) %c %s " fmt, \
-                (in_interrupt() ? 'I' : 'U'), __func__ , ##args);       \
+        if (!iwl_is_rfkill(p->shrd))                                    \
+                dev_err(bus(p)->dev, "%s%c %s " fmt,                    \
+                        "",                                             \
+                        in_interrupt() ? 'I' : 'U', __func__,           \
+                        ##__VA_ARGS__);                                 \
+        else if (iwl_get_debug_level(p->shrd) & IWL_DL_RADIO)           \
+                dev_err(bus(p)->dev, "%s%c %s " fmt,                    \
+                        "(RFKILL) ",                                    \
+                        in_interrupt() ? 'I' : 'U', __func__,           \
+                        ##__VA_ARGS__);                                 \
 } while (0)
 
 #else
@@ -129,48 +134,43 @@ static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)
  */
 
 /* 0x0000000F - 0x00000001 */
-#define IWL_DL_INFO             (1 << 0)
-#define IWL_DL_MAC80211         (1 << 1)
-#define IWL_DL_HCMD             (1 << 2)
-#define IWL_DL_STATE            (1 << 3)
+#define IWL_DL_INFO             0x00000001
+#define IWL_DL_MAC80211         0x00000002
+#define IWL_DL_HCMD             0x00000004
+#define IWL_DL_STATE            0x00000008
 /* 0x000000F0 - 0x00000010 */
-#define IWL_DL_MACDUMP          (1 << 4)
-#define IWL_DL_HCMD_DUMP        (1 << 5)
-#define IWL_DL_EEPROM           (1 << 6)
-#define IWL_DL_RADIO            (1 << 7)
+#define IWL_DL_EEPROM           0x00000040
+#define IWL_DL_RADIO            0x00000080
 /* 0x00000F00 - 0x00000100 */
-#define IWL_DL_POWER            (1 << 8)
-#define IWL_DL_TEMP             (1 << 9)
-/* reserved (1 << 10) */
-#define IWL_DL_SCAN             (1 << 11)
+#define IWL_DL_POWER            0x00000100
+#define IWL_DL_TEMP             0x00000200
+#define IWL_DL_SCAN             0x00000800
 /* 0x0000F000 - 0x00001000 */
-#define IWL_DL_ASSOC            (1 << 12)
-#define IWL_DL_DROP             (1 << 13)
-/* reserved (1 << 14) */
-#define IWL_DL_COEX             (1 << 15)
+#define IWL_DL_ASSOC            0x00001000
+#define IWL_DL_DROP             0x00002000
+#define IWL_DL_COEX             0x00008000
 /* 0x000F0000 - 0x00010000 */
-#define IWL_DL_FW               (1 << 16)
-#define IWL_DL_RF_KILL          (1 << 17)
-#define IWL_DL_FW_ERRORS        (1 << 18)
-#define IWL_DL_LED              (1 << 19)
+#define IWL_DL_FW               0x00010000
+#define IWL_DL_RF_KILL          0x00020000
+#define IWL_DL_FW_ERRORS        0x00040000
+#define IWL_DL_LED              0x00080000
 /* 0x00F00000 - 0x00100000 */
-#define IWL_DL_RATE             (1 << 20)
-#define IWL_DL_CALIB            (1 << 21)
-#define IWL_DL_WEP              (1 << 22)
-#define IWL_DL_TX               (1 << 23)
+#define IWL_DL_RATE             0x00100000
+#define IWL_DL_CALIB            0x00200000
+#define IWL_DL_WEP              0x00400000
+#define IWL_DL_TX               0x00800000
 /* 0x0F000000 - 0x01000000 */
-#define IWL_DL_RX               (1 << 24)
-#define IWL_DL_ISR              (1 << 25)
-#define IWL_DL_HT               (1 << 26)
+#define IWL_DL_RX               0x01000000
+#define IWL_DL_ISR              0x02000000
+#define IWL_DL_HT               0x04000000
 /* 0xF0000000 - 0x10000000 */
-#define IWL_DL_11H              (1 << 28)
-#define IWL_DL_STATS            (1 << 29)
-#define IWL_DL_TX_REPLY         (1 << 30)
-#define IWL_DL_TX_QUEUES        (1 << 31)
+#define IWL_DL_11H              0x10000000
+#define IWL_DL_STATS            0x20000000
+#define IWL_DL_TX_REPLY         0x40000000
+#define IWL_DL_TX_QUEUES        0x80000000
 
 #define IWL_DEBUG_INFO(p, f, a...)      IWL_DEBUG(p, IWL_DL_INFO, f, ## a)
 #define IWL_DEBUG_MAC80211(p, f, a...)  IWL_DEBUG(p, IWL_DL_MAC80211, f, ## a)
-#define IWL_DEBUG_MACDUMP(p, f, a...)   IWL_DEBUG(p, IWL_DL_MACDUMP, f, ## a)
 #define IWL_DEBUG_TEMP(p, f, a...)      IWL_DEBUG(p, IWL_DL_TEMP, f, ## a)
 #define IWL_DEBUG_SCAN(p, f, a...)      IWL_DEBUG(p, IWL_DL_SCAN, f, ## a)
 #define IWL_DEBUG_RX(p, f, a...)        IWL_DEBUG(p, IWL_DL_RX, f, ## a)
@@ -179,7 +179,6 @@ static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)
 #define IWL_DEBUG_LED(p, f, a...)       IWL_DEBUG(p, IWL_DL_LED, f, ## a)
 #define IWL_DEBUG_WEP(p, f, a...)       IWL_DEBUG(p, IWL_DL_WEP, f, ## a)
 #define IWL_DEBUG_HC(p, f, a...)        IWL_DEBUG(p, IWL_DL_HCMD, f, ## a)
-#define IWL_DEBUG_HC_DUMP(p, f, a...)   IWL_DEBUG(p, IWL_DL_HCMD_DUMP, f, ## a)
 #define IWL_DEBUG_EEPROM(p, f, a...)    IWL_DEBUG(p, IWL_DL_EEPROM, f, ## a)
 #define IWL_DEBUG_CALIB(p, f, a...)     IWL_DEBUG(p, IWL_DL_CALIB, f, ## a)
 #define IWL_DEBUG_FW(p, f, a...)        IWL_DEBUG(p, IWL_DL_FW, f, ## a)
@@ -201,8 +200,6 @@ static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)
 #define IWL_DEBUG_STATS_LIMIT(p, f, a...)       \
                 IWL_DEBUG_LIMIT(p, IWL_DL_STATS, f, ## a)
 #define IWL_DEBUG_TX_REPLY(p, f, a...)  IWL_DEBUG(p, IWL_DL_TX_REPLY, f, ## a)
-#define IWL_DEBUG_TX_REPLY_LIMIT(p, f, a...) \
-                IWL_DEBUG_LIMIT(p, IWL_DL_TX_REPLY, f, ## a)
 #define IWL_DEBUG_TX_QUEUES(p, f, a...) IWL_DEBUG(p, IWL_DL_TX_QUEUES, f, ## a)
 #define IWL_DEBUG_RADIO(p, f, a...)     IWL_DEBUG(p, IWL_DL_RADIO, f, ## a)
 #define IWL_DEBUG_POWER(p, f, a...)     IWL_DEBUG(p, IWL_DL_POWER, f, ## a)
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index 68b04f5b10ce..6bf6845e1a51 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -234,11 +234,12 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file,
 
         /* default is to dump the entire data segment */
         if (!priv->dbgfs_sram_offset && !priv->dbgfs_sram_len) {
+                struct iwl_trans *trans = trans(priv);
                 priv->dbgfs_sram_offset = 0x800000;
-                if (priv->ucode_type == IWL_UCODE_INIT)
-                        priv->dbgfs_sram_len = trans(priv)->ucode_init.data.len;
+                if (trans->shrd->ucode_type == IWL_UCODE_INIT)
+                        priv->dbgfs_sram_len = trans->ucode_init.data.len;
                 else
-                        priv->dbgfs_sram_len = trans(priv)->ucode_rt.data.len;
+                        priv->dbgfs_sram_len = trans->ucode_rt.data.len;
         }
         len = priv->dbgfs_sram_len;
 
@@ -415,7 +416,7 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file,
                 return -ENODATA;
         }
 
-        ptr = priv->eeprom;
+        ptr = priv->shrd->eeprom;
         if (!ptr) {
                 IWL_ERR(priv, "Invalid EEPROM/OTP memory\n");
                 return -ENOMEM;
@@ -427,7 +428,7 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file,
                 IWL_ERR(priv, "Can not allocate Buffer\n");
                 return -ENOMEM;
         }
-        eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION);
+        eeprom_ver = iwl_eeprom_query16(priv->shrd, EEPROM_VERSION);
         pos += scnprintf(buf + pos, buf_size - pos, "NVM Type: %s, "
                         "version: 0x%x\n",
                         (trans(priv)->nvm_device_type == NVM_DEVICE_TYPE_OTP)
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 556e4a2c19bc..69ecf6e2e658 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -60,11 +60,10 @@ struct iwl_tx_queue;
 
 /* Default noise level to report when noise measurement is not available.
  *   This may be because we're:
- *   1)  Not associated (4965, no beacon statistics being sent to driver)
+ *   1)  Not associated  no beacon statistics being sent to driver)
  *   2)  Scanning (noise measurement does not apply to associated channel)
- *   3)  Receiving CCK (3945 delivers noise info only for OFDM frames)
  * Use default noise value of -127 ... this is below the range of measurable
- *   Rx dBm for either 3945 or 4965, so it can indicate "unmeasurable" to user.
+ *   Rx dBm for all agn devices, so it can indicate "unmeasurable" to user.
  *   Also, -127 works better than 0 when averaging frames with/without
  *   noise info (e.g. averaging might be done in app); measured dBm values are
  *   always negative ... using a negative value as the default keeps all
@@ -441,29 +440,6 @@ enum iwlagn_chain_noise_state {
         IWL_CHAIN_NOISE_DONE,
 };
 
-
-/*
- * enum iwl_calib
- * defines the order in which results of initial calibrations
- * should be sent to the runtime uCode
- */
-enum iwl_calib {
-        IWL_CALIB_XTAL,
-        IWL_CALIB_DC,
-        IWL_CALIB_LO,
-        IWL_CALIB_TX_IQ,
-        IWL_CALIB_TX_IQ_PERD,
-        IWL_CALIB_BASE_BAND,
-        IWL_CALIB_TEMP_OFFSET,
-        IWL_CALIB_MAX
-};
-
-/* Opaque calibration results */
-struct iwl_calib_result {
-        void *buf;
-        size_t buf_len;
-};
-
 /* Sensitivity calib data */
 struct iwl_sensitivity_data {
         u32 auto_corr_ofdm;
@@ -703,35 +679,6 @@ struct iwl_force_reset {
  */
 #define IWLAGN_EXT_BEACON_TIME_POS      22
 
-/**
- * struct iwl_notification_wait - notification wait entry
- * @list: list head for global list
- * @fn: function called with the notification
- * @cmd: command ID
- *
- * This structure is not used directly, to wait for a
- * notification declare it on the stack, and call
- * iwlagn_init_notification_wait() with appropriate
- * parameters. Then do whatever will cause the ucode
- * to notify the driver, and to wait for that then
- * call iwlagn_wait_notification().
- *
- * Each notification is one-shot. If at some point we
- * need to support multi-shot notifications (which
- * can't be allocated on the stack) we need to modify
- * the code for them.
- */
-struct iwl_notification_wait {
-        struct list_head list;
-
-        void (*fn)(struct iwl_priv *priv, struct iwl_rx_packet *pkt,
-                   void *data);
-        void *fn_data;
-
-        u8 cmd;
-        bool triggered, aborted;
-};
-
 struct iwl_rxon_context {
         struct ieee80211_vif *vif;
 
@@ -794,7 +741,7 @@ enum iwl_scan_type {
         IWL_SCAN_ROC,
 };
 
-#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL
+#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE
 struct iwl_testmode_trace {
         u32 buff_size;
         u32 total_size;
@@ -804,6 +751,12 @@ struct iwl_testmode_trace {
         dma_addr_t dma_addr;
         bool trace_enabled;
 };
+struct iwl_testmode_sram {
+        u32 buff_size;
+        u32 num_chunks;
+        u8 *buff_addr;
+        bool sram_readed;
+};
 #endif
 
 struct iwl_wipan_noa_data {
@@ -868,9 +821,6 @@ struct iwl_priv {
         s32 temperature;        /* Celsius */
         s32 last_temperature;
 
-        /* init calibration results */
-        struct iwl_calib_result calib_results[IWL_CALIB_MAX];
-
         struct iwl_wipan_noa_data __rcu *noa_data;
 
         /* Scan related variables */
@@ -897,18 +847,12 @@ struct iwl_priv {
         u32 ucode_ver;                  /* version of ucode, copy of
                                            iwl_ucode.ver */
 
-        enum iwl_ucode_type ucode_type;
         char firmware_name[25];
 
         struct iwl_rxon_context contexts[NUM_IWL_RXON_CTX];
 
         __le16 switch_channel;
 
-        struct {
-                u32 error_event_table;
-                u32 log_event_table;
-        } device_pointers;
-
         u16 active_rate;
 
         u8 start_calib;
@@ -942,10 +886,6 @@ struct iwl_priv {
         /* Indication if ieee80211_ops->open has been called */
         u8 is_open;
 
-        /* eeprom -- this is in the card's little endian byte order */
-        u8 *eeprom;
-        struct iwl_eeprom_calib_info *calib_info;
-
         enum nl80211_iftype iw_mode;
 
         /* Last Rx'd beacon timestamp */
@@ -1001,10 +941,6 @@ struct iwl_priv {
         /* counts reply_tx error */
         struct reply_tx_error_statistics reply_tx_stats;
         struct reply_agg_tx_error_statistics reply_agg_tx_stats;
-        /* notification wait support */
-        struct list_head notif_waits;
-        spinlock_t notif_wait_lock;
-        wait_queue_head_t notif_waitq;
 
         /* remain-on-channel offload support */
         struct ieee80211_channel *hw_roc_channel;
@@ -1082,8 +1018,9 @@ struct iwl_priv {
         struct led_classdev led;
         unsigned long blink_on, blink_off;
         bool led_registered;
-#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL
+#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE
         struct iwl_testmode_trace testmode_trace;
+        struct iwl_testmode_sram testmode_sram;
         u32 tm_fixed_rate;
 #endif
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index dcada0827ea4..6fcc7d586b24 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -215,11 +215,11 @@ static int iwl_eeprom_verify_signature(struct iwl_trans *trans)
         return ret;
 }
 
-u16 iwl_eeprom_query16(const struct iwl_priv *priv, size_t offset)
+u16 iwl_eeprom_query16(const struct iwl_shared *shrd, size_t offset)
 {
-        if (!priv->eeprom)
+        if (!shrd->eeprom)
                 return 0;
-        return (u16)priv->eeprom[offset] | ((u16)priv->eeprom[offset + 1] << 8);
+        return (u16)shrd->eeprom[offset] | ((u16)shrd->eeprom[offset + 1] << 8);
 }
 
 int iwl_eeprom_check_version(struct iwl_priv *priv)
@@ -227,8 +227,8 @@ int iwl_eeprom_check_version(struct iwl_priv *priv)
         u16 eeprom_ver;
         u16 calib_ver;
 
-        eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION);
-        calib_ver = iwlagn_eeprom_calib_version(priv);
+        eeprom_ver = iwl_eeprom_query16(priv->shrd, EEPROM_VERSION);
+        calib_ver = iwl_eeprom_calib_version(priv->shrd);
 
         if (eeprom_ver < priv->cfg->eeprom_ver ||
             calib_ver < priv->cfg->eeprom_calib_ver)
@@ -249,11 +249,12 @@ err:
 
 int iwl_eeprom_check_sku(struct iwl_priv *priv)
 {
+        struct iwl_shared *shrd = priv->shrd;
         u16 radio_cfg;
 
         if (!priv->cfg->sku) {
                 /* not using sku overwrite */
-                priv->cfg->sku = iwl_eeprom_query16(priv, EEPROM_SKU_CAP);
+                priv->cfg->sku = iwl_eeprom_query16(shrd, EEPROM_SKU_CAP);
                 if (priv->cfg->sku & EEPROM_SKU_CAP_11N_ENABLE &&
                     !priv->cfg->ht_params) {
                         IWL_ERR(priv, "Invalid 11n configuration\n");
@@ -269,7 +270,7 @@ int iwl_eeprom_check_sku(struct iwl_priv *priv)
 
         if (!priv->cfg->valid_tx_ant && !priv->cfg->valid_rx_ant) {
                 /* not using .cfg overwrite */
-                radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);
+                radio_cfg = iwl_eeprom_query16(shrd, EEPROM_RADIO_CONFIG);
                 priv->cfg->valid_tx_ant = EEPROM_RF_CFG_TX_ANT_MSK(radio_cfg);
                 priv->cfg->valid_rx_ant = EEPROM_RF_CFG_RX_ANT_MSK(radio_cfg);
                 if (!priv->cfg->valid_tx_ant || !priv->cfg->valid_rx_ant) {
@@ -289,9 +290,9 @@ int iwl_eeprom_check_sku(struct iwl_priv *priv)
         return 0;
 }
 
-void iwl_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac)
+void iwl_eeprom_get_mac(const struct iwl_shared *shrd, u8 *mac)
 {
-        const u8 *addr = iwl_eeprom_query_addr(priv,
+        const u8 *addr = iwl_eeprom_query_addr(shrd,
                                         EEPROM_MAC_ADDRESS);
         memcpy(mac, addr, ETH_ALEN);
 }
@@ -582,6 +583,7 @@ iwl_eeprom_enh_txp_read_element(struct iwl_priv *priv,
 
 void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)
 {
+        struct iwl_shared *shrd = priv->shrd;
         struct iwl_eeprom_enhanced_txpwr *txp_array, *txp;
         int idx, entries;
         __le16 *txp_len;
@@ -590,10 +592,10 @@ void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)
         BUILD_BUG_ON(sizeof(struct iwl_eeprom_enhanced_txpwr) != 8);
 
         /* the length is in 16-bit words, but we want entries */
-        txp_len = (__le16 *) iwl_eeprom_query_addr(priv, EEPROM_TXP_SZ_OFFS);
+        txp_len = (__le16 *) iwl_eeprom_query_addr(shrd, EEPROM_TXP_SZ_OFFS);
         entries = le16_to_cpup(txp_len) * 2 / EEPROM_TXP_ENTRY_LEN;
 
-        txp_array = (void *) iwl_eeprom_query_addr(priv, EEPROM_TXP_OFFS);
+        txp_array = (void *) iwl_eeprom_query_addr(shrd, EEPROM_TXP_OFFS);
 
         for (idx = 0; idx < entries; idx++) {
                 txp = &txp_array[idx];
@@ -646,12 +648,13 @@ void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)
 /**
  * iwl_eeprom_init - read EEPROM contents
  *
- * Load the EEPROM contents from adapter into priv->eeprom
+ * Load the EEPROM contents from adapter into shrd->eeprom
  *
  * NOTE:  This routine uses the non-debug IO access functions.
  */
 int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev)
 {
+        struct iwl_shared *shrd = priv->shrd;
         __le16 *e;
         u32 gp = iwl_read32(bus(priv), CSR_EEPROM_GP);
         int sz;
@@ -666,12 +669,12 @@ int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev)
         /* allocate eeprom */
         sz = priv->cfg->base_params->eeprom_size;
         IWL_DEBUG_EEPROM(priv, "NVM size = %d\n", sz);
-        priv->eeprom = kzalloc(sz, GFP_KERNEL);
-        if (!priv->eeprom) {
+        shrd->eeprom = kzalloc(sz, GFP_KERNEL);
+        if (!shrd->eeprom) {
                 ret = -ENOMEM;
                 goto alloc_err;
         }
-        e = (__le16 *)priv->eeprom;
+        e = (__le16 *)shrd->eeprom;
 
         iwl_apm_init(priv);
 
@@ -746,7 +749,7 @@ int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev)
         IWL_DEBUG_EEPROM(priv, "NVM Type: %s, version: 0x%x\n",
                        (trans(priv)->nvm_device_type == NVM_DEVICE_TYPE_OTP)
                        ? "OTP" : "EEPROM",
-                       iwl_eeprom_query16(priv, EEPROM_VERSION));
+                       iwl_eeprom_query16(shrd, EEPROM_VERSION));
 
         ret = 0;
 done:
@@ -754,17 +757,17 @@ done:
 
 err:
         if (ret)
-                iwl_eeprom_free(priv);
+                iwl_eeprom_free(priv->shrd);
         /* Reset chip to save power until we load uCode during "up". */
         iwl_apm_stop(priv);
 alloc_err:
         return ret;
 }
 
-void iwl_eeprom_free(struct iwl_priv *priv)
+void iwl_eeprom_free(struct iwl_shared *shrd)
 {
-        kfree(priv->eeprom);
-        priv->eeprom = NULL;
+        kfree(shrd->eeprom);
+        shrd->eeprom = NULL;
 }
 
 static void iwl_init_band_reference(const struct iwl_priv *priv,
@@ -772,49 +775,50 @@ static void iwl_init_band_reference(const struct iwl_priv *priv,
                         const struct iwl_eeprom_channel **eeprom_ch_info,
                         const u8 **eeprom_ch_index)
 {
+        struct iwl_shared *shrd = priv->shrd;
         u32 offset = priv->cfg->lib->
                         eeprom_ops.regulatory_bands[eep_band - 1];
         switch (eep_band) {
         case 1:         /* 2.4GHz band */
                 *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_1);
                 *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
+                                iwl_eeprom_query_addr(shrd, offset);
                 *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 = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
+                                iwl_eeprom_query_addr(shrd, offset);
                 *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 = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
+                                iwl_eeprom_query_addr(shrd, offset);
                 *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 = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
+                                iwl_eeprom_query_addr(shrd, offset);
                 *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 = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
+                                iwl_eeprom_query_addr(shrd, offset);
                 *eeprom_ch_index = iwl_eeprom_band_5;
                 break;
         case 6:         /* 2.4GHz ht40 channels */
                 *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_6);
                 *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
+                                iwl_eeprom_query_addr(shrd, offset);
                 *eeprom_ch_index = iwl_eeprom_band_6;
                 break;
         case 7:         /* 5 GHz ht40 channels */
                 *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_7);
                 *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
+                                iwl_eeprom_query_addr(shrd, offset);
                 *eeprom_ch_index = iwl_eeprom_band_7;
                 break;
         default:
@@ -1064,7 +1068,7 @@ void iwl_rf_config(struct iwl_priv *priv)
 {
         u16 radio_cfg;
 
-        radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);
+        radio_cfg = iwl_eeprom_query16(priv->shrd, EEPROM_RADIO_CONFIG);
 
         /* write radio config values to register */
         if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) <= EEPROM_RF_CONFIG_TYPE_MAX) {
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
index c94747e7299e..9fa937ec35e3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
@@ -66,6 +66,7 @@
 #include <net/mac80211.h>
 
 struct iwl_priv;
+struct iwl_shared;
 
 /*
  * EEPROM access time values:
@@ -305,11 +306,11 @@ struct iwl_eeprom_ops {
 
 
 int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev);
-void iwl_eeprom_free(struct iwl_priv *priv);
+void iwl_eeprom_free(struct iwl_shared *shrd);
 int  iwl_eeprom_check_version(struct iwl_priv *priv);
 int  iwl_eeprom_check_sku(struct iwl_priv *priv);
-const u8 *iwl_eeprom_query_addr(const struct iwl_priv *priv, size_t offset);
-u16 iwl_eeprom_query16(const struct iwl_priv *priv, size_t offset);
+const u8 *iwl_eeprom_query_addr(const struct iwl_shared *shrd, size_t offset);
+u16 iwl_eeprom_query16(const struct iwl_shared *shrd, size_t offset);
 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(
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c
index 3ffa8e62b856..3464cad7e38c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/iwlwifi/iwl-io.c
@@ -143,7 +143,7 @@ u32 iwl_read_direct32(struct iwl_bus *bus, u32 reg)
 
         spin_lock_irqsave(&bus->reg_lock, flags);
         iwl_grab_nic_access(bus);
-        value = iwl_read32(bus(bus), reg);
+        value = iwl_read32(bus, reg);
         iwl_release_nic_access(bus);
         spin_unlock_irqrestore(&bus->reg_lock, flags);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index 05b1f0d2f387..e3944f4e4fd6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -427,7 +427,7 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
         iwl_write32(bus(priv), CSR_UCODE_DRV_GP1_CLR,
                           CSR_UCODE_DRV_GP1_BIT_D3_CFG_COMPLETE);
 
-        base = priv->device_pointers.error_event_table;
+        base = priv->shrd->device_pointers.error_event_table;
         if (iwlagn_hw_valid_rtc_data_addr(base)) {
                 spin_lock_irqsave(&bus(priv)->reg_lock, flags);
                 ret = iwl_grab_nic_access_silent(bus(priv));
@@ -481,15 +481,11 @@ static void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
         struct iwl_priv *priv = hw->priv;
 
-        IWL_DEBUG_MACDUMP(priv, "enter\n");
-
         IWL_DEBUG_TX(priv, "dev->xmit(%d bytes) at rate 0x%02x\n", skb->len,
                      ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate);
 
         if (iwlagn_tx_skb(priv, skb))
                 dev_kfree_skb_any(skb);
-
-        IWL_DEBUG_MACDUMP(priv, "leave\n");
 }
 
 static void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,
@@ -521,6 +517,17 @@ static int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 return -EOPNOTSUPP;
         }
 
+        switch (key->cipher) {
+        case WLAN_CIPHER_SUITE_TKIP:
+                key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
+                /* fall through */
+        case WLAN_CIPHER_SUITE_CCMP:
+                key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
+                break;
+        default:
+                break;
+        }
+
         /*
          * We could program these keys into the hardware as well, but we
          * don't expect much multicast traffic in IBSS and having keys
@@ -804,21 +811,9 @@ static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
 
         /* Configure HT40 channels */
         ctx->ht.enabled = conf_is_ht(conf);
-        if (ctx->ht.enabled) {
-                if (conf_is_ht40_minus(conf)) {
-                        ctx->ht.extension_chan_offset =
-                                IEEE80211_HT_PARAM_CHA_SEC_BELOW;
-                        ctx->ht.is_40mhz = true;
-                } else if (conf_is_ht40_plus(conf)) {
-                        ctx->ht.extension_chan_offset =
-                                IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
-                        ctx->ht.is_40mhz = true;
-                } else {
-                        ctx->ht.extension_chan_offset =
-                                IEEE80211_HT_PARAM_CHA_SEC_NONE;
-                        ctx->ht.is_40mhz = false;
-                }
-        } else
+        if (ctx->ht.enabled)
+                iwlagn_config_ht40(conf, ctx);
+        else
                 ctx->ht.is_40mhz = false;
 
         if ((le16_to_cpu(ctx->staging.channel) != ch))
@@ -1053,6 +1048,9 @@ static int iwlagn_mac_tx_sync(struct ieee80211_hw *hw,
         int ret;
         u8 sta_id;
 
+        if (ctx->ctxid != IWL_RXON_CTX_PAN)
+                return 0;
+
         IWL_DEBUG_MAC80211(priv, "enter\n");
         mutex_lock(&priv->shrd->mutex);
 
@@ -1102,6 +1100,9 @@ static void iwlagn_mac_finish_tx_sync(struct ieee80211_hw *hw,
         struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
         struct iwl_rxon_context *ctx = vif_priv->ctx;
 
+        if (ctx->ctxid != IWL_RXON_CTX_PAN)
+                return;
+
         IWL_DEBUG_MAC80211(priv, "enter\n");
         mutex_lock(&priv->shrd->mutex);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c
index 86d6a2354e8a..850ec8e51b17 100644
--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -60,6 +60,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *****************************************************************************/
+#include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/pci-aspm.h>
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h
index 1f7a93c67c45..29a7284aa3ef 100644
--- a/drivers/net/wireless/iwlwifi/iwl-shared.h
+++ b/drivers/net/wireless/iwlwifi/iwl-shared.h
@@ -97,6 +97,7 @@
 struct iwl_cfg;
 struct iwl_bus;
 struct iwl_priv;
+struct iwl_trans;
 struct iwl_sensitivity_ranges;
 struct iwl_trans_ops;
 
@@ -120,7 +121,7 @@ extern struct iwl_mod_params iwlagn_mod_params;
  * @restart_fw: restart firmware, default = 1
  * @plcp_check: enable plcp health check, default = true
  * @ack_check: disable ack health check, default = false
- * @wd_disable: enable stuck queue check, default = false
+ * @wd_disable: enable stuck queue check, default = 0
  * @bt_coex_active: enable bt coex, default = true
  * @led_mode: system default, default = 0
  * @no_sleep_autoadjust: disable autoadjust, default = true
@@ -141,7 +142,7 @@ struct iwl_mod_params {
         int restart_fw;
         bool plcp_check;
         bool ack_check;
-        bool wd_disable;
+        int  wd_disable;
         bool bt_coex_active;
         int led_mode;
         bool no_sleep_autoadjust;
@@ -174,7 +175,6 @@ struct iwl_mod_params {
  * @ct_kill_exit_threshold: when to reeable the device - in hw dependent unit
  *      relevant for 1000, 6000 and up
  * @wd_timeout: TX queues watchdog timeout
- * @calib_init_cfg: setup initial calibrations for the hw
  * @calib_rt_cfg: setup runtime calibrations for the hw
  * @struct iwl_sensitivity_ranges: range of sensitivity values
  */
@@ -195,7 +195,6 @@ struct iwl_hw_params {
         u32 ct_kill_exit_threshold;
         unsigned int wd_timeout;
 
-        u32 calib_init_cfg;
         u32 calib_rt_cfg;
         const struct iwl_sensitivity_ranges *sens;
 };
@@ -259,6 +258,52 @@ struct iwl_tid_data {
 };
 
 /**
+ * enum iwl_ucode_type
+ *
+ * The type of ucode currently loaded on the hardware.
+ *
+ * @IWL_UCODE_NONE: No ucode loaded
+ * @IWL_UCODE_REGULAR: Normal runtime ucode
+ * @IWL_UCODE_INIT: Initial ucode
+ * @IWL_UCODE_WOWLAN: Wake on Wireless enabled ucode
+ */
+enum iwl_ucode_type {
+        IWL_UCODE_NONE,
+        IWL_UCODE_REGULAR,
+        IWL_UCODE_INIT,
+        IWL_UCODE_WOWLAN,
+};
+
+/**
+ * struct iwl_notification_wait - notification wait entry
+ * @list: list head for global list
+ * @fn: function called with the notification
+ * @cmd: command ID
+ *
+ * This structure is not used directly, to wait for a
+ * notification declare it on the stack, and call
+ * iwlagn_init_notification_wait() with appropriate
+ * parameters. Then do whatever will cause the ucode
+ * to notify the driver, and to wait for that then
+ * call iwlagn_wait_notification().
+ *
+ * Each notification is one-shot. If at some point we
+ * need to support multi-shot notifications (which
+ * can't be allocated on the stack) we need to modify
+ * the code for them.
+ */
+struct iwl_notification_wait {
+        struct list_head list;
+
+        void (*fn)(struct iwl_trans *trans, struct iwl_rx_packet *pkt,
+                   void *data);
+        void *fn_data;
+
+        u8 cmd;
+        bool triggered, aborted;
+};
+
+/**
  * struct iwl_shared - shared fields for all the layers of the driver
  *
  * @dbg_level_dev: dbg level set per device. Prevails on
@@ -275,6 +320,11 @@ struct iwl_tid_data {
  * @sta_lock: protects the station table.
  *      If lock and sta_lock are needed, lock must be acquired first.
  * @mutex:
+ * @ucode_type: indicator of loaded ucode image
+ * @notif_waits: things waiting for notification
+ * @notif_wait_lock: lock protecting notification
+ * @notif_waitq: head of notification wait queue
+ * @device_pointers: pointers to ucode event tables
  */
 struct iwl_shared {
 #ifdef CONFIG_IWLWIFI_DEBUG
@@ -302,6 +352,23 @@ struct iwl_shared {
         struct iwl_tid_data tid_data[IWLAGN_STATION_COUNT][IWL_MAX_TID_COUNT];
 
         wait_queue_head_t wait_command_queue;
+
+        /* eeprom -- this is in the card's little endian byte order */
+        u8 *eeprom;
+
+        /* ucode related variables */
+        enum iwl_ucode_type ucode_type;
+
+        /* notification wait support */
+        struct list_head notif_waits;
+        spinlock_t notif_wait_lock;
+        wait_queue_head_t notif_waitq;
+
+        struct {
+                u32 error_event_table;
+                u32 log_event_table;
+        } device_pointers;
+
 };
 
 /*Whatever _m is (iwl_trans, iwl_priv, iwl_bus, these macros will work */
@@ -445,6 +512,24 @@ bool iwl_check_for_ct_kill(struct iwl_priv *priv);
 void iwl_stop_sw_queue(struct iwl_priv *priv, u8 ac);
 void iwl_wake_sw_queue(struct iwl_priv *priv, u8 ac);
 
+/* notification wait support */
+void iwl_abort_notification_waits(struct iwl_shared *shrd);
+void __acquires(wait_entry)
+iwl_init_notification_wait(struct iwl_shared *shrd,
+                              struct iwl_notification_wait *wait_entry,
+                              u8 cmd,
+                              void (*fn)(struct iwl_trans *trans,
+                                         struct iwl_rx_packet *pkt,
+                                         void *data),
+                              void *fn_data);
+int __must_check __releases(wait_entry)
+iwl_wait_notification(struct iwl_shared *shrd,
+                         struct iwl_notification_wait *wait_entry,
+                         unsigned long timeout);
+void __releases(wait_entry)
+iwl_remove_notification(struct iwl_shared *shrd,
+                           struct iwl_notification_wait *wait_entry);
+
 #ifdef CONFIG_IWLWIFI_DEBUGFS
 void iwl_reset_traffic_log(struct iwl_priv *priv);
 #endif /* CONFIG_IWLWIFI_DEBUGFS */
diff --git a/drivers/net/wireless/iwlwifi/iwl-sv-open.c b/drivers/net/wireless/iwlwifi/iwl-testmode.c
index e3882d0cfc85..a874eb7b5f8e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sv-open.c
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c
@@ -77,6 +77,7 @@
 #include "iwl-agn.h"
 #include "iwl-testmode.h"
 #include "iwl-trans.h"
+#include "iwl-bus.h"
 
 /* The TLVs used in the gnl message policy between the kernel module and
  * user space application. iwl_testmode_gnl_msg_policy is to be carried
@@ -106,6 +107,13 @@ struct nla_policy iwl_testmode_gnl_msg_policy[IWL_TM_ATTR_MAX] = {
         [IWL_TM_ATTR_FIXRATE] = { .type = NLA_U32, },
 
         [IWL_TM_ATTR_UCODE_OWNER] = { .type = NLA_U8, },
+
+        [IWL_TM_ATTR_SRAM_ADDR] = { .type = NLA_U32, },
+        [IWL_TM_ATTR_SRAM_SIZE] = { .type = NLA_U32, },
+        [IWL_TM_ATTR_SRAM_DUMP] = { .type = NLA_UNSPEC, },
+
+        [IWL_TM_ATTR_FW_VERSION] = { .type = NLA_U32, },
+        [IWL_TM_ATTR_DEVICE_ID] = { .type = NLA_U32, },
 };
 
 /*
@@ -177,6 +185,18 @@ void iwl_testmode_init(struct iwl_priv *priv)
 {
         priv->pre_rx_handler = iwl_testmode_ucode_rx_pkt;
         priv->testmode_trace.trace_enabled = false;
+        priv->testmode_sram.sram_readed = false;
+}
+
+static void iwl_sram_cleanup(struct iwl_priv *priv)
+{
+        if (priv->testmode_sram.sram_readed) {
+                kfree(priv->testmode_sram.buff_addr);
+                priv->testmode_sram.buff_addr = NULL;
+                priv->testmode_sram.buff_size = 0;
+                priv->testmode_sram.num_chunks = 0;
+                priv->testmode_sram.sram_readed = false;
+        }
 }
 
 static void iwl_trace_cleanup(struct iwl_priv *priv)
@@ -201,6 +221,7 @@ static void iwl_trace_cleanup(struct iwl_priv *priv)
 void iwl_testmode_cleanup(struct iwl_priv *priv)
 {
         iwl_trace_cleanup(priv);
+        iwl_sram_cleanup(priv);
 }
 
 /*
@@ -276,7 +297,7 @@ static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)
         IWL_INFO(priv, "testmode register access command offset 0x%x\n", ofs);
 
         switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
-        case IWL_TM_CMD_APP2DEV_REG_READ32:
+        case IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32:
                 val32 = iwl_read32(bus(priv), ofs);
                 IWL_INFO(priv, "32bit value to read 0x%x\n", val32);
 
@@ -291,7 +312,7 @@ static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)
                         IWL_DEBUG_INFO(priv,
                                        "Error sending msg : %d\n", status);
                 break;
-        case IWL_TM_CMD_APP2DEV_REG_WRITE32:
+        case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE32:
                 if (!tb[IWL_TM_ATTR_REG_VALUE32]) {
                         IWL_DEBUG_INFO(priv,
                                        "Error finding value to write\n");
@@ -302,7 +323,7 @@ static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)
                         iwl_write32(bus(priv), ofs, val32);
                 }
                 break;
-        case IWL_TM_CMD_APP2DEV_REG_WRITE8:
+        case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8:
                 if (!tb[IWL_TM_ATTR_REG_VALUE8]) {
                         IWL_DEBUG_INFO(priv, "Error finding value to write\n");
                         return -ENOMSG;
@@ -312,6 +333,32 @@ static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)
                         iwl_write8(bus(priv), ofs, val8);
                 }
                 break;
+        case IWL_TM_CMD_APP2DEV_INDIRECT_REG_READ32:
+                val32 = iwl_read_prph(bus(priv), ofs);
+                IWL_INFO(priv, "32bit value to read 0x%x\n", val32);
+
+                skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20);
+                if (!skb) {
+                        IWL_DEBUG_INFO(priv, "Error allocating memory\n");
+                        return -ENOMEM;
+                }
+                NLA_PUT_U32(skb, IWL_TM_ATTR_REG_VALUE32, val32);
+                status = cfg80211_testmode_reply(skb);
+                if (status < 0)
+                        IWL_DEBUG_INFO(priv,
+                                        "Error sending msg : %d\n", status);
+                break;
+        case IWL_TM_CMD_APP2DEV_INDIRECT_REG_WRITE32:
+                if (!tb[IWL_TM_ATTR_REG_VALUE32]) {
+                        IWL_DEBUG_INFO(priv,
+                                        "Error finding value to write\n");
+                        return -ENOMSG;
+                } else {
+                        val32 = nla_get_u32(tb[IWL_TM_ATTR_REG_VALUE32]);
+                        IWL_INFO(priv, "32bit value to write 0x%x\n", val32);
+                        iwl_write_prph(bus(priv), ofs, val32);
+                }
+                break;
         default:
                 IWL_DEBUG_INFO(priv, "Unknown testmode register command ID\n");
                 return -ENOSYS;
@@ -330,7 +377,7 @@ static int iwl_testmode_cfg_init_calib(struct iwl_priv *priv)
         struct iwl_notification_wait calib_wait;
         int ret;
 
-        iwlagn_init_notification_wait(priv, &calib_wait,
+        iwl_init_notification_wait(priv->shrd, &calib_wait,
                                       CALIBRATION_COMPLETE_NOTIFICATION,
                                       NULL, NULL);
         ret = iwlagn_init_alive_start(priv);
@@ -340,14 +387,14 @@ static int iwl_testmode_cfg_init_calib(struct iwl_priv *priv)
                 goto cfg_init_calib_error;
         }
 
-        ret = iwlagn_wait_notification(priv, &calib_wait, 2 * HZ);
+        ret = iwl_wait_notification(priv->shrd, &calib_wait, 2 * HZ);
         if (ret)
                 IWL_DEBUG_INFO(priv, "Error detecting"
                         " CALIBRATION_COMPLETE_NOTIFICATION: %d\n", ret);
         return ret;
 
 cfg_init_calib_error:
-        iwlagn_remove_notification(priv, &calib_wait);
+        iwl_remove_notification(priv->shrd, &calib_wait);
         return ret;
 }
 
@@ -373,6 +420,8 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
         struct sk_buff *skb;
         unsigned char *rsp_data_ptr = NULL;
         int status = 0, rsp_data_len = 0;
+        char buf[32], *ptr = NULL;
+        unsigned int num, devid;
 
         switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
         case IWL_TM_CMD_APP2DEV_GET_DEVICENAME:
@@ -420,8 +469,23 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
                                 "Error starting the device: %d\n", status);
                 break;
 
+        case IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW:
+                iwl_scan_cancel_timeout(priv, 200);
+                iwl_trans_stop_device(trans(priv));
+                status = iwlagn_load_ucode_wait_alive(priv, IWL_UCODE_WOWLAN);
+                if (status) {
+                        IWL_DEBUG_INFO(priv,
+                                "Error loading WOWLAN ucode: %d\n", status);
+                        break;
+                }
+                status = iwl_alive_start(priv);
+                if (status)
+                        IWL_DEBUG_INFO(priv,
+                                "Error starting the device: %d\n", status);
+                break;
+
         case IWL_TM_CMD_APP2DEV_GET_EEPROM:
-                if (priv->eeprom) {
+                if (priv->shrd->eeprom) {
                         skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy,
                                 priv->cfg->base_params->eeprom_size + 20);
                         if (!skb) {
@@ -433,7 +497,7 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
                                 IWL_TM_CMD_DEV2APP_EEPROM_RSP);
                         NLA_PUT(skb, IWL_TM_ATTR_EEPROM,
                                 priv->cfg->base_params->eeprom_size,
-                                priv->eeprom);
+                                priv->shrd->eeprom);
                         status = cfg80211_testmode_reply(skb);
                         if (status < 0)
                                 IWL_DEBUG_INFO(priv,
@@ -452,6 +516,43 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
                 priv->tm_fixed_rate = nla_get_u32(tb[IWL_TM_ATTR_FIXRATE]);
                 break;
 
+        case IWL_TM_CMD_APP2DEV_GET_FW_VERSION:
+                IWL_INFO(priv, "uCode version raw: 0x%x\n", priv->ucode_ver);
+
+                skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20);
+                if (!skb) {
+                        IWL_DEBUG_INFO(priv, "Error allocating memory\n");
+                        return -ENOMEM;
+                }
+                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_VERSION, priv->ucode_ver);
+                status = cfg80211_testmode_reply(skb);
+                if (status < 0)
+                        IWL_DEBUG_INFO(priv,
+                                        "Error sending msg : %d\n", status);
+                break;
+
+        case IWL_TM_CMD_APP2DEV_GET_DEVICE_ID:
+                bus_get_hw_id(bus(priv), buf, sizeof(buf));
+                ptr = buf;
+                strsep(&ptr, ":");
+                sscanf(strsep(&ptr, ":"), "%x", &num);
+                sscanf(strsep(&ptr, ":"), "%x", &devid);
+                IWL_INFO(priv, "Device ID = 0x%04x, SubDevice ID= 0x%04x\n",
+                                num, devid);
+                devid |= (num << 16);
+
+                skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20);
+                if (!skb) {
+                        IWL_DEBUG_INFO(priv, "Error allocating memory\n");
+                        return -ENOMEM;
+                }
+                NLA_PUT_U32(skb, IWL_TM_ATTR_DEVICE_ID, devid);
+                status = cfg80211_testmode_reply(skb);
+                if (status < 0)
+                        IWL_DEBUG_INFO(priv,
+                                        "Error sending msg : %d\n", status);
+                break;
+
         default:
                 IWL_DEBUG_INFO(priv, "Unknown testmode driver command ID\n");
                 return -ENOSYS;
@@ -532,7 +633,7 @@ static int iwl_testmode_trace(struct ieee80211_hw *hw, struct nlattr **tb)
                 }
                 priv->testmode_trace.num_chunks =
                         DIV_ROUND_UP(priv->testmode_trace.buff_size,
-                                     TRACE_CHUNK_SIZE);
+                                     DUMP_CHUNK_SIZE);
                 break;
 
         case IWL_TM_CMD_APP2DEV_END_TRACE:
@@ -564,15 +665,15 @@ static int iwl_testmode_trace_dump(struct ieee80211_hw *hw, struct nlattr **tb,
                 idx = cb->args[4];
                 if (idx >= priv->testmode_trace.num_chunks)
                         return -ENOENT;
-                length = TRACE_CHUNK_SIZE;
+                length = DUMP_CHUNK_SIZE;
                 if (((idx + 1) == priv->testmode_trace.num_chunks) &&
-                    (priv->testmode_trace.buff_size % TRACE_CHUNK_SIZE))
+                    (priv->testmode_trace.buff_size % DUMP_CHUNK_SIZE))
                         length = priv->testmode_trace.buff_size %
-                                TRACE_CHUNK_SIZE;
+                                DUMP_CHUNK_SIZE;
 
                 NLA_PUT(skb, IWL_TM_ATTR_TRACE_DUMP, length,
                         priv->testmode_trace.trace_addr +
-                        (TRACE_CHUNK_SIZE * idx));
+                        (DUMP_CHUNK_SIZE * idx));
                 idx++;
                 cb->args[4] = idx;
                 return 0;
@@ -618,6 +719,110 @@ static int iwl_testmode_ownership(struct ieee80211_hw *hw, struct nlattr **tb)
         return 0;
 }
 
+/*
+ * This function handles the user application commands for SRAM data dump
+ *
+ * It retrieves the mandatory fields IWL_TM_ATTR_SRAM_ADDR and
+ * IWL_TM_ATTR_SRAM_SIZE to decide the memory area for SRAM data reading
+ *
+ * Several error will be retured, -EBUSY if the SRAM data retrieved by
+ * previous command has not been delivered to userspace, or -ENOMSG if
+ * the mandatory fields (IWL_TM_ATTR_SRAM_ADDR,IWL_TM_ATTR_SRAM_SIZE)
+ * are missing, or -ENOMEM if the buffer allocation fails.
+ *
+ * Otherwise 0 is replied indicating the success of the SRAM reading.
+ *
+ * @hw: ieee80211_hw object that represents the device
+ * @tb: gnl message fields from the user space
+ */
+static int iwl_testmode_sram(struct ieee80211_hw *hw, struct nlattr **tb)
+{
+        struct iwl_priv *priv = hw->priv;
+        u32 base, ofs, size, maxsize;
+
+        if (priv->testmode_sram.sram_readed)
+                return -EBUSY;
+
+        if (!tb[IWL_TM_ATTR_SRAM_ADDR]) {
+                IWL_DEBUG_INFO(priv, "Error finding SRAM offset address\n");
+                return -ENOMSG;
+        }
+        ofs = nla_get_u32(tb[IWL_TM_ATTR_SRAM_ADDR]);
+        if (!tb[IWL_TM_ATTR_SRAM_SIZE]) {
+                IWL_DEBUG_INFO(priv, "Error finding size for SRAM reading\n");
+                return -ENOMSG;
+        }
+        size = nla_get_u32(tb[IWL_TM_ATTR_SRAM_SIZE]);
+        switch (priv->shrd->ucode_type) {
+        case IWL_UCODE_REGULAR:
+                maxsize = trans(priv)->ucode_rt.data.len;
+                break;
+        case IWL_UCODE_INIT:
+                maxsize = trans(priv)->ucode_init.data.len;
+                break;
+        case IWL_UCODE_WOWLAN:
+                maxsize = trans(priv)->ucode_wowlan.data.len;
+                break;
+        case IWL_UCODE_NONE:
+                IWL_DEBUG_INFO(priv, "Error, uCode does not been loaded\n");
+                return -ENOSYS;
+        default:
+                IWL_DEBUG_INFO(priv, "Error, unsupported uCode type\n");
+                return -ENOSYS;
+        }
+        if ((ofs + size) > maxsize) {
+                IWL_DEBUG_INFO(priv, "Invalid offset/size: out of range\n");
+                return -EINVAL;
+        }
+        priv->testmode_sram.buff_size = (size / 4) * 4;
+        priv->testmode_sram.buff_addr =
+                kmalloc(priv->testmode_sram.buff_size, GFP_KERNEL);
+        if (priv->testmode_sram.buff_addr == NULL) {
+                IWL_DEBUG_INFO(priv, "Error allocating memory\n");
+                return -ENOMEM;
+        }
+        base = 0x800000;
+        _iwl_read_targ_mem_words(bus(priv), base + ofs,
+                                        priv->testmode_sram.buff_addr,
+                                        priv->testmode_sram.buff_size / 4);
+        priv->testmode_sram.num_chunks =
+                DIV_ROUND_UP(priv->testmode_sram.buff_size, DUMP_CHUNK_SIZE);
+        priv->testmode_sram.sram_readed = true;
+        return 0;
+}
+
+static int iwl_testmode_sram_dump(struct ieee80211_hw *hw, struct nlattr **tb,
+                                   struct sk_buff *skb,
+                                   struct netlink_callback *cb)
+{
+        struct iwl_priv *priv = hw->priv;
+        int idx, length;
+
+        if (priv->testmode_sram.sram_readed) {
+                idx = cb->args[4];
+                if (idx >= priv->testmode_sram.num_chunks) {
+                        iwl_sram_cleanup(priv);
+                        return -ENOENT;
+                }
+                length = DUMP_CHUNK_SIZE;
+                if (((idx + 1) == priv->testmode_sram.num_chunks) &&
+                    (priv->testmode_sram.buff_size % DUMP_CHUNK_SIZE))
+                        length = priv->testmode_sram.buff_size %
+                                DUMP_CHUNK_SIZE;
+
+                NLA_PUT(skb, IWL_TM_ATTR_SRAM_DUMP, length,
+                        priv->testmode_sram.buff_addr +
+                        (DUMP_CHUNK_SIZE * idx));
+                idx++;
+                cb->args[4] = idx;
+                return 0;
+        } else
+                return -EFAULT;
+
+ nla_put_failure:
+        return -ENOBUFS;
+}
+
 
 /* The testmode gnl message handler that takes the gnl message from the
  * user space and parses it per the policy iwl_testmode_gnl_msg_policy, then
@@ -665,9 +870,11 @@ int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len)
                 IWL_DEBUG_INFO(priv, "testmode cmd to uCode\n");
                 result = iwl_testmode_ucode(hw, tb);
                 break;
-        case IWL_TM_CMD_APP2DEV_REG_READ32:
-        case IWL_TM_CMD_APP2DEV_REG_WRITE32:
-        case IWL_TM_CMD_APP2DEV_REG_WRITE8:
+        case IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32:
+        case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE32:
+        case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8:
+        case IWL_TM_CMD_APP2DEV_INDIRECT_REG_READ32:
+        case IWL_TM_CMD_APP2DEV_INDIRECT_REG_WRITE32:
                 IWL_DEBUG_INFO(priv, "testmode cmd to register\n");
                 result = iwl_testmode_reg(hw, tb);
                 break;
@@ -677,6 +884,9 @@ int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len)
         case IWL_TM_CMD_APP2DEV_LOAD_RUNTIME_FW:
         case IWL_TM_CMD_APP2DEV_GET_EEPROM:
         case IWL_TM_CMD_APP2DEV_FIXRATE_REQ:
+        case IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW:
+        case IWL_TM_CMD_APP2DEV_GET_FW_VERSION:
+        case IWL_TM_CMD_APP2DEV_GET_DEVICE_ID:
                 IWL_DEBUG_INFO(priv, "testmode cmd to driver\n");
                 result = iwl_testmode_driver(hw, tb);
                 break;
@@ -693,6 +903,11 @@ int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len)
                 result = iwl_testmode_ownership(hw, tb);
                 break;
 
+        case IWL_TM_CMD_APP2DEV_READ_SRAM:
+                IWL_DEBUG_INFO(priv, "testmode sram read cmd to driver\n");
+                result = iwl_testmode_sram(hw, tb);
+                break;
+
         default:
                 IWL_DEBUG_INFO(priv, "Unknown testmode command\n");
                 result = -ENOSYS;
@@ -741,6 +956,10 @@ int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb,
                 IWL_DEBUG_INFO(priv, "uCode trace cmd to driver\n");
                 result = iwl_testmode_trace_dump(hw, tb, skb, cb);
                 break;
+        case IWL_TM_CMD_APP2DEV_DUMP_SRAM:
+                IWL_DEBUG_INFO(priv, "testmode sram dump cmd to driver\n");
+                result = iwl_testmode_sram_dump(hw, tb, skb, cb);
+                break;
         default:
                 result = -EINVAL;
                 break;
diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.h b/drivers/net/wireless/iwlwifi/iwl-testmode.h
index b980bda4b0f8..26138f110340 100644
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.h
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.h
@@ -76,9 +76,9 @@
  *      the actual uCode host command ID is carried with
  *      IWL_TM_ATTR_UCODE_CMD_ID
  *
- * @IWL_TM_CMD_APP2DEV_REG_READ32:
- * @IWL_TM_CMD_APP2DEV_REG_WRITE32:
- * @IWL_TM_CMD_APP2DEV_REG_WRITE8:
+ * @IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32:
+ * @IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE32:
+ * @IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8:
  *      commands from user applicaiton to access register
  *
  * @IWL_TM_CMD_APP2DEV_GET_DEVICENAME: retrieve device name
@@ -103,16 +103,30 @@
  * @IWL_TM_CMD_DEV2APP_EEPROM_RSP:
  *      commands from kernel space to carry the eeprom response
  *      to user application
+ *
  * @IWL_TM_CMD_APP2DEV_OWNERSHIP:
  *      commands from user application to own change the ownership of the uCode
  *      if application has the ownership, the only host command from
  *      testmode will deliver to uCode. Default owner is driver
+ *
+ * @IWL_TM_CMD_APP2DEV_INDIRECT_REG_READ32:
+ * @IWL_TM_CMD_APP2DEV_INDIRECT_REG_WRITE32:
+ *      commands from user applicaiton to indirectly access peripheral register
+ *
+ * @IWL_TM_CMD_APP2DEV_READ_SRAM:
+ * @IWL_TM_CMD_APP2DEV_DUMP_SRAM:
+ *      commands from user applicaiton to read data in sram
+ *
+ * @IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW: load Weak On Wireless LAN uCode image
+ * @IWL_TM_CMD_APP2DEV_GET_FW_VERSION: retrieve uCode version
+ * @IWL_TM_CMD_APP2DEV_GET_DEVICE_ID: retrieve ID information in device
+ *
  */
 enum iwl_tm_cmd_t {
         IWL_TM_CMD_APP2DEV_UCODE                = 1,
-        IWL_TM_CMD_APP2DEV_REG_READ32           = 2,
-        IWL_TM_CMD_APP2DEV_REG_WRITE32          = 3,
-        IWL_TM_CMD_APP2DEV_REG_WRITE8           = 4,
+        IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32    = 2,
+        IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE32   = 3,
+        IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8    = 4,
         IWL_TM_CMD_APP2DEV_GET_DEVICENAME       = 5,
         IWL_TM_CMD_APP2DEV_LOAD_INIT_FW         = 6,
         IWL_TM_CMD_APP2DEV_CFG_INIT_CALIB       = 7,
@@ -126,7 +140,14 @@ enum iwl_tm_cmd_t {
         IWL_TM_CMD_DEV2APP_UCODE_RX_PKT         = 15,
         IWL_TM_CMD_DEV2APP_EEPROM_RSP           = 16,
         IWL_TM_CMD_APP2DEV_OWNERSHIP            = 17,
-        IWL_TM_CMD_MAX                          = 18,
+        IWL_TM_CMD_APP2DEV_INDIRECT_REG_READ32  = 18,
+        IWL_TM_CMD_APP2DEV_INDIRECT_REG_WRITE32 = 19,
+        IWL_TM_CMD_APP2DEV_READ_SRAM            = 20,
+        IWL_TM_CMD_APP2DEV_DUMP_SRAM            = 21,
+        IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW       = 22,
+        IWL_TM_CMD_APP2DEV_GET_FW_VERSION       = 23,
+        IWL_TM_CMD_APP2DEV_GET_DEVICE_ID        = 24,
+        IWL_TM_CMD_MAX                          = 25,
 };
 
 /*
@@ -196,6 +217,26 @@ enum iwl_tm_cmd_t {
  *      When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_OWNERSHIP,
  *      The mandatory fields are:
  *      IWL_TM_ATTR_UCODE_OWNER for the new owner
+ *
+ * @IWL_TM_ATTR_SRAM_ADDR:
+ * @IWL_TM_ATTR_SRAM_SIZE:
+ *      When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_READ_SRAM,
+ *      The mandatory fields are:
+ *      IWL_TM_ATTR_SRAM_ADDR for the address in sram
+ *      IWL_TM_ATTR_SRAM_SIZE for the buffer size of data reading
+ *
+ * @IWL_TM_ATTR_SRAM_DUMP:
+ *      When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_DUMP_SRAM,
+ *      IWL_TM_ATTR_SRAM_DUMP for the data in sram
+ *
+ * @IWL_TM_ATTR_FW_VERSION:
+ *      When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_GET_FW_VERSION,
+ *      IWL_TM_ATTR_FW_VERSION for the uCode version
+ *
+ * @IWL_TM_ATTR_DEVICE_ID:
+ *      When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_GET_DEVICE_ID,
+ *      IWL_TM_ATTR_DEVICE_ID for the device ID information
+ *
  */
 enum iwl_tm_attr_t {
         IWL_TM_ATTR_NOT_APPLICABLE              = 0,
@@ -213,7 +254,12 @@ enum iwl_tm_attr_t {
         IWL_TM_ATTR_TRACE_DUMP                  = 12,
         IWL_TM_ATTR_FIXRATE                     = 13,
         IWL_TM_ATTR_UCODE_OWNER                 = 14,
-        IWL_TM_ATTR_MAX                         = 15,
+        IWL_TM_ATTR_SRAM_ADDR                   = 15,
+        IWL_TM_ATTR_SRAM_SIZE                   = 16,
+        IWL_TM_ATTR_SRAM_DUMP                   = 17,
+        IWL_TM_ATTR_FW_VERSION                  = 18,
+        IWL_TM_ATTR_DEVICE_ID                   = 19,
+        IWL_TM_ATTR_MAX                         = 20,
 };
 
 /* uCode trace buffer */
@@ -221,6 +267,8 @@ enum iwl_tm_attr_t {
 #define TRACE_BUFF_SIZE_MIN     0x20000
 #define TRACE_BUFF_SIZE_DEF     TRACE_BUFF_SIZE_MIN
 #define TRACE_BUFF_PADD         0x2000
-#define TRACE_CHUNK_SIZE        (PAGE_SIZE - 1024)
+
+/* Maximum data size of each dump it packet */
+#define DUMP_CHUNK_SIZE         (PAGE_SIZE - 1024)
 
 #endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
index afaaa2a51b96..5a384b309b09 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
@@ -354,6 +354,11 @@ static inline void iwl_set_swq_id(struct iwl_tx_queue *txq, u8 ac, u8 hwq)
         txq->swq_id = (hwq << 2) | ac;
 }
 
+static inline u8 iwl_get_queue_ac(struct iwl_tx_queue *txq)
+{
+        return txq->swq_id & 0x3;
+}
+
 static inline void iwl_wake_queue(struct iwl_trans *trans,
                                   struct iwl_tx_queue *txq, const char *msg)
 {
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
index ee126f844a5c..2ee00e0f39d3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
@@ -594,8 +594,8 @@ static void iwl_dump_nic_error_log(struct iwl_trans *trans)
         struct iwl_trans_pcie *trans_pcie =
                 IWL_TRANS_GET_PCIE_TRANS(trans);
 
-        base = priv->device_pointers.error_event_table;
-        if (priv->ucode_type == IWL_UCODE_INIT) {
+        base = trans->shrd->device_pointers.error_event_table;
+        if (trans->shrd->ucode_type == IWL_UCODE_INIT) {
                 if (!base)
                         base = priv->init_errlog_ptr;
         } else {
@@ -607,7 +607,7 @@ static void iwl_dump_nic_error_log(struct iwl_trans *trans)
                 IWL_ERR(trans,
                         "Not valid error log pointer 0x%08X for %s uCode\n",
                         base,
-                        (priv->ucode_type == IWL_UCODE_INIT)
+                        (trans->shrd->ucode_type == IWL_UCODE_INIT)
                                         ? "Init" : "RT");
                 return;
         }
@@ -648,6 +648,21 @@ static void iwl_dump_nic_error_log(struct iwl_trans *trans)
         IWL_ERR(trans, "0x%08X | hw version\n", table.hw_ver);
         IWL_ERR(trans, "0x%08X | board version\n", table.brd_ver);
         IWL_ERR(trans, "0x%08X | hcmd\n", table.hcmd);
+
+        IWL_ERR(trans, "0x%08X | isr0\n", table.isr0);
+        IWL_ERR(trans, "0x%08X | isr1\n", table.isr1);
+        IWL_ERR(trans, "0x%08X | isr2\n", table.isr2);
+        IWL_ERR(trans, "0x%08X | isr3\n", table.isr3);
+        IWL_ERR(trans, "0x%08X | isr4\n", table.isr4);
+        IWL_ERR(trans, "0x%08X | isr_pref\n", table.isr_pref);
+        IWL_ERR(trans, "0x%08X | wait_event\n", table.wait_event);
+        IWL_ERR(trans, "0x%08X | l2p_control\n", table.l2p_control);
+        IWL_ERR(trans, "0x%08X | l2p_duration\n", table.l2p_duration);
+        IWL_ERR(trans, "0x%08X | l2p_mhvalid\n", table.l2p_mhvalid);
+        IWL_ERR(trans, "0x%08X | l2p_addr_match\n", table.l2p_addr_match);
+        IWL_ERR(trans, "0x%08X | lmpm_pmg_sel\n", table.lmpm_pmg_sel);
+        IWL_ERR(trans, "0x%08X | timestamp\n", table.u_timestamp);
+        IWL_ERR(trans, "0x%08X | flow_handler\n", table.flow_handler);
 }
 
 /**
@@ -709,8 +724,8 @@ static int iwl_print_event_log(struct iwl_trans *trans, u32 start_idx,
         if (num_events == 0)
                 return pos;
 
-        base = priv->device_pointers.log_event_table;
-        if (priv->ucode_type == IWL_UCODE_INIT) {
+        base = trans->shrd->device_pointers.log_event_table;
+        if (trans->shrd->ucode_type == IWL_UCODE_INIT) {
                 if (!base)
                         base = priv->init_evtlog_ptr;
         } else {
@@ -823,8 +838,8 @@ int iwl_dump_nic_event_log(struct iwl_trans *trans, bool full_log,
         size_t bufsz = 0;
         struct iwl_priv *priv = priv(trans);
 
-        base = priv->device_pointers.log_event_table;
-        if (priv->ucode_type == IWL_UCODE_INIT) {
+        base = trans->shrd->device_pointers.log_event_table;
+        if (trans->shrd->ucode_type == IWL_UCODE_INIT) {
                 logsize = priv->init_evtlog_size;
                 if (!base)
                         base = priv->init_evtlog_ptr;
@@ -838,7 +853,7 @@ int iwl_dump_nic_event_log(struct iwl_trans *trans, bool full_log,
                 IWL_ERR(trans,
                         "Invalid event log pointer 0x%08X for %s uCode\n",
                         base,
-                        (priv->ucode_type == IWL_UCODE_INIT)
+                        (trans->shrd->ucode_type == IWL_UCODE_INIT)
                                         ? "Init" : "RT");
                 return -EINVAL;
         }
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
index 6dba1515023c..79331fb10aa5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
@@ -559,7 +559,6 @@ int iwl_trans_pcie_tx_agg_alloc(struct iwl_trans *trans,
         tid_data->agg.txq_id = txq_id;
         iwl_set_swq_id(&trans_pcie->txq[txq_id], get_ac_from_tid(tid), txq_id);
 
-        tid_data = &trans->shrd->tid_data[sta_id][tid];
         if (tid_data->tfds_in_queue == 0) {
                 IWL_DEBUG_TX_QUEUES(trans, "HW queue is empty\n");
                 tid_data->agg.state = IWL_AGG_ON;
@@ -1121,9 +1120,6 @@ int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,
                 return 0;
         }
 
-        IWL_DEBUG_TX_REPLY(trans, "reclaim: [%d, %d, %d]\n", txq_id,
-                           q->read_ptr, index);
-
         if (WARN_ON(!skb_queue_empty(skbs)))
                 return 0;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index a1a58330273f..66e1b9fa0b8b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -990,29 +990,16 @@ static int iwl_trans_tx_stop(struct iwl_trans *trans)
         return 0;
 }
 
-static void iwl_trans_pcie_disable_sync_irq(struct iwl_trans *trans)
+static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
 {
         unsigned long flags;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
+        /* tell the device to stop sending interrupts */
         spin_lock_irqsave(&trans->shrd->lock, flags);
         iwl_disable_interrupts(trans);
         spin_unlock_irqrestore(&trans->shrd->lock, flags);
 
-        /* wait to make sure we flush pending tasklet*/
-        synchronize_irq(bus(trans)->irq);
-        tasklet_kill(&trans_pcie->irq_tasklet);
-}
-
-static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
-{
-        /* stop and reset the on-board processor */
-        iwl_write32(bus(trans), CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
-
-        /* tell the device to stop sending interrupts */
-        iwl_trans_pcie_disable_sync_irq(trans);
-
         /* device going down, Stop using ICT table */
         iwl_disable_ict(trans);
 
@@ -1039,6 +1026,20 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
 
         /* Stop the device, and put it in low power state */
         iwl_apm_stop(priv(trans));
+
+        /* Upon stop, the APM issues an interrupt if HW RF kill is set.
+         * Clean again the interrupt here
+         */
+        spin_lock_irqsave(&trans->shrd->lock, flags);
+        iwl_disable_interrupts(trans);
+        spin_unlock_irqrestore(&trans->shrd->lock, flags);
+
+        /* wait to make sure we flush pending tasklet*/
+        synchronize_irq(bus(trans)->irq);
+        tasklet_kill(&trans_pcie->irq_tasklet);
+
+        /* stop and reset the on-board processor */
+        iwl_write32(bus(trans), CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
 }
 
 static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
@@ -1099,13 +1100,21 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
                 hdr->seq_ctrl = hdr->seq_ctrl &
                                 cpu_to_le16(IEEE80211_SCTL_FRAG);
                 hdr->seq_ctrl |= cpu_to_le16(seq_number);
-                seq_number += 0x10;
                 /* aggregation is on for this <sta,tid> */
                 if (info->flags & IEEE80211_TX_CTL_AMPDU) {
-                        WARN_ON_ONCE(tid_data->agg.state != IWL_AGG_ON);
+                        if (WARN_ON_ONCE(tid_data->agg.state != IWL_AGG_ON)) {
+                                IWL_ERR(trans, "TX_CTL_AMPDU while not in AGG:"
+                                        " Tx flags = 0x%08x, agg.state = %d",
+                                        info->flags, tid_data->agg.state);
+                                IWL_ERR(trans, "sta_id = %d, tid = %d "
+                                        "txq_id = %d, seq_num = %d", sta_id,
+                                        tid, tid_data->agg.txq_id,
+                                        seq_number >> 4);
+                        }
                         txq_id = tid_data->agg.txq_id;
                         is_agg = true;
                 }
+                seq_number += 0x10;
         }
 
         /* Copy MAC header from skb into command buffer */
@@ -1350,9 +1359,9 @@ static void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int sta_id, int tid,
         }
 
         if (txq->q.read_ptr != tfd_num) {
-                IWL_DEBUG_TX_REPLY(trans, "Retry scheduler reclaim "
-                                "scd_ssn=%d idx=%d txq=%d swq=%d\n",
-                                ssn , tfd_num, txq_id, txq->swq_id);
+                IWL_DEBUG_TX_REPLY(trans, "[Q %d | AC %d] %d -> %d (%d)\n",
+                                txq_id, iwl_get_queue_ac(txq), txq->q.read_ptr,
+                                tfd_num, ssn);
                 freed = iwl_tx_queue_reclaim(trans, txq_id, tfd_num, skbs);
                 if (iwl_queue_space(&txq->q) > txq->q.low_mark && cond)
                         iwl_wake_queue(trans, txq, "Packets reclaimed");
@@ -1364,6 +1373,7 @@ static void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int sta_id, int tid,
 
 static void iwl_trans_pcie_free(struct iwl_trans *trans)
 {
+        iwl_calib_free_results(trans);
         iwl_trans_pcie_tx_free(trans);
         iwl_trans_pcie_rx_free(trans);
         free_irq(bus(trans)->irq, trans);
@@ -1515,8 +1525,12 @@ static int iwl_trans_pcie_check_stuck_queue(struct iwl_trans *trans, int cnt)
         if (time_after(jiffies, timeout)) {
                 IWL_ERR(trans, "Queue %d stuck for %u ms.\n", q->id,
                         hw_params(trans).wd_timeout);
-                IWL_ERR(trans, "Current read_ptr %d write_ptr %d\n",
+                IWL_ERR(trans, "Current SW read_ptr %d write_ptr %d\n",
                         q->read_ptr, q->write_ptr);
+                IWL_ERR(trans, "Current HW read_ptr %d write_ptr %d\n",
+                        iwl_read_prph(bus(trans), SCD_QUEUE_RDPTR(cnt))
+                                & (TFD_QUEUE_SIZE_MAX - 1),
+                        iwl_read_prph(bus(trans), SCD_QUEUE_WRPTR(cnt)));
                 return 1;
         }
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index 50227ebc0ee2..f94a6ee5f82f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -220,11 +220,12 @@ struct fw_img {
         struct fw_desc data;    /* firmware data image */
 };
 
-enum iwl_ucode_type {
-        IWL_UCODE_NONE,
-        IWL_UCODE_REGULAR,
-        IWL_UCODE_INIT,
-        IWL_UCODE_WOWLAN,
+/* Opaque calibration results */
+struct iwl_calib_result {
+        struct list_head list;
+        size_t cmd_len;
+        struct iwl_calib_hdr hdr;
+        /* data follows */
 };
 
 /**
@@ -236,6 +237,8 @@ enum iwl_ucode_type {
  * @ucode_rt: run time ucode image
  * @ucode_init: init ucode image
  * @ucode_wowlan: wake on wireless ucode image (optional)
+ * @nvm_device_type: indicates OTP or eeprom
+ * @calib_results: list head for init calibration results
  */
 struct iwl_trans {
         const struct iwl_trans_ops *ops;
@@ -250,6 +253,9 @@ struct iwl_trans {
         /* eeprom related variables */
         int    nvm_device_type;
 
+        /* init calibration results */
+        struct list_head calib_results;
+
         /* pointer to trans specific struct */
         /*Ensure that this pointer will always be aligned to sizeof pointer */
         char trans_specific[0] __attribute__((__aligned__(sizeof(void *))));
@@ -386,4 +392,9 @@ int iwl_alloc_fw_desc(struct iwl_bus *bus, struct fw_desc *desc,
                       const void *data, size_t len);
 void iwl_dealloc_ucode(struct iwl_trans *trans);
 
+int iwl_send_calib_results(struct iwl_trans *trans);
+int iwl_calib_set(struct iwl_trans *trans,
+                  const struct iwl_calib_hdr *cmd, int len);
+void iwl_calib_free_results(struct iwl_trans *trans);
+
 #endif /* __iwl_trans_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c b/drivers/net/wireless/iwlwifi/iwl-ucode.c
index 9ec315b31d45..0577212ad3f3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-ucode.c
@@ -122,7 +122,7 @@ int iwl_alloc_fw_desc(struct iwl_bus *bus, struct fw_desc *desc,
 /*
  * ucode
  */
-static int iwlagn_load_section(struct iwl_trans *trans, const char *name,
+static int iwl_load_section(struct iwl_trans *trans, const char *name,
                                 struct fw_desc *image, u32 dst_addr)
 {
         struct iwl_bus *bus = bus(trans);
@@ -188,7 +188,7 @@ static inline struct fw_img *iwl_get_ucode_image(struct iwl_trans *trans,
         return NULL;
 }
 
-static int iwlagn_load_given_ucode(struct iwl_trans *trans,
+static int iwl_load_given_ucode(struct iwl_trans *trans,
                                    enum iwl_ucode_type ucode_type)
 {
         int ret = 0;
@@ -201,36 +201,36 @@ static int iwlagn_load_given_ucode(struct iwl_trans *trans,
                 return -EINVAL;
         }
 
-        ret = iwlagn_load_section(trans, "INST", &image->code,
+        ret = iwl_load_section(trans, "INST", &image->code,
                                    IWLAGN_RTC_INST_LOWER_BOUND);
         if (ret)
                 return ret;
 
-        return iwlagn_load_section(trans, "DATA", &image->data,
+        return iwl_load_section(trans, "DATA", &image->data,
                                     IWLAGN_RTC_DATA_LOWER_BOUND);
 }
 
 /*
  *  Calibration
  */
-static int iwlagn_set_Xtal_calib(struct iwl_priv *priv)
+static int iwl_set_Xtal_calib(struct iwl_priv *priv)
 {
         struct iwl_calib_xtal_freq_cmd cmd;
         __le16 *xtal_calib =
-                (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_XTAL);
+                (__le16 *)iwl_eeprom_query_addr(priv->shrd, EEPROM_XTAL);
 
         iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_CRYSTAL_FRQ_CMD);
         cmd.cap_pin1 = le16_to_cpu(xtal_calib[0]);
         cmd.cap_pin2 = le16_to_cpu(xtal_calib[1]);
-        return iwl_calib_set(&priv->calib_results[IWL_CALIB_XTAL],
-                             (u8 *)&cmd, sizeof(cmd));
+        return iwl_calib_set(trans(priv), (void *)&cmd, sizeof(cmd));
 }
 
-static int iwlagn_set_temperature_offset_calib(struct iwl_priv *priv)
+static int iwl_set_temperature_offset_calib(struct iwl_priv *priv)
 {
         struct iwl_calib_temperature_offset_cmd cmd;
         __le16 *offset_calib =
-                (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_RAW_TEMPERATURE);
+                (__le16 *)iwl_eeprom_query_addr(priv->shrd,
+                                                EEPROM_RAW_TEMPERATURE);
 
         memset(&cmd, 0, sizeof(cmd));
         iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD);
@@ -240,22 +240,22 @@ static int iwlagn_set_temperature_offset_calib(struct iwl_priv *priv)
 
         IWL_DEBUG_CALIB(priv, "Radio sensor offset: %d\n",
                         le16_to_cpu(cmd.radio_sensor_offset));
-        return iwl_calib_set(&priv->calib_results[IWL_CALIB_TEMP_OFFSET],
-                             (u8 *)&cmd, sizeof(cmd));
+        return iwl_calib_set(trans(priv), (void *)&cmd, sizeof(cmd));
 }
 
-static int iwlagn_set_temperature_offset_calib_v2(struct iwl_priv *priv)
+static int iwl_set_temperature_offset_calib_v2(struct iwl_priv *priv)
 {
         struct iwl_calib_temperature_offset_v2_cmd cmd;
-        __le16 *offset_calib_high = (__le16 *)iwl_eeprom_query_addr(priv,
+        __le16 *offset_calib_high = (__le16 *)iwl_eeprom_query_addr(priv->shrd,
                                      EEPROM_KELVIN_TEMPERATURE);
         __le16 *offset_calib_low =
-                (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_RAW_TEMPERATURE);
+                (__le16 *)iwl_eeprom_query_addr(priv->shrd,
+                                                EEPROM_RAW_TEMPERATURE);
         struct iwl_eeprom_calib_hdr *hdr;
 
         memset(&cmd, 0, sizeof(cmd));
         iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD);
-        hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(priv,
+        hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(priv->shrd,
                                                         EEPROM_CALIB_ALL);
         memcpy(&cmd.radio_sensor_offset_high, offset_calib_high,
                 sizeof(*offset_calib_high));
@@ -276,11 +276,10 @@ static int iwlagn_set_temperature_offset_calib_v2(struct iwl_priv *priv)
         IWL_DEBUG_CALIB(priv, "Voltage Ref: %d\n",
                         le16_to_cpu(cmd.burntVoltageRef));
 
-        return iwl_calib_set(&priv->calib_results[IWL_CALIB_TEMP_OFFSET],
-                             (u8 *)&cmd, sizeof(cmd));
+        return iwl_calib_set(trans(priv), (void *)&cmd, sizeof(cmd));
 }
 
-static int iwlagn_send_calib_cfg(struct iwl_priv *priv)
+static int iwl_send_calib_cfg(struct iwl_trans *trans)
 {
         struct iwl_calib_cfg_cmd calib_cfg_cmd;
         struct iwl_host_cmd cmd = {
@@ -296,7 +295,7 @@ static int iwlagn_send_calib_cfg(struct iwl_priv *priv)
         calib_cfg_cmd.ucd_calib_cfg.flags =
                 IWL_CALIB_CFG_FLAG_SEND_COMPLETE_NTFY_MSK;
 
-        return iwl_trans_send_cmd(trans(priv), &cmd);
+        return iwl_trans_send_cmd(trans, &cmd);
 }
 
 int iwlagn_rx_calib_result(struct iwl_priv *priv,
@@ -306,37 +305,14 @@ int iwlagn_rx_calib_result(struct iwl_priv *priv,
         struct iwl_rx_packet *pkt = rxb_addr(rxb);
         struct iwl_calib_hdr *hdr = (struct iwl_calib_hdr *)pkt->u.raw;
         int len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
-        int index;
 
         /* reduce the size of the length field itself */
         len -= 4;
 
-        /* Define the order in which the results will be sent to the runtime
-         * uCode. iwl_send_calib_results sends them in a row according to
-         * their index. We sort them here
-         */
-        switch (hdr->op_code) {
-        case IWL_PHY_CALIBRATE_DC_CMD:
-                index = IWL_CALIB_DC;
-                break;
-        case IWL_PHY_CALIBRATE_LO_CMD:
-                index = IWL_CALIB_LO;
-                break;
-        case IWL_PHY_CALIBRATE_TX_IQ_CMD:
-                index = IWL_CALIB_TX_IQ;
-                break;
-        case IWL_PHY_CALIBRATE_TX_IQ_PERD_CMD:
-                index = IWL_CALIB_TX_IQ_PERD;
-                break;
-        case IWL_PHY_CALIBRATE_BASE_BAND_CMD:
-                index = IWL_CALIB_BASE_BAND;
-                break;
-        default:
-                IWL_ERR(priv, "Unknown calibration notification %d\n",
-                          hdr->op_code);
-                return -1;
-        }
-        iwl_calib_set(&priv->calib_results[index], pkt->u.raw, len);
+        if (iwl_calib_set(trans(priv), hdr, len))
+                IWL_ERR(priv, "Failed to record calibration data %d\n",
+                        hdr->op_code);
+
         return 0;
 }
 
@@ -352,14 +328,14 @@ int iwlagn_init_alive_start(struct iwl_priv *priv)
                  * no need to close the envlope since we are going
                  * to load the runtime uCode later.
                  */
-                ret = iwlagn_send_bt_env(priv, IWL_BT_COEX_ENV_OPEN,
+                ret = iwl_send_bt_env(trans(priv), IWL_BT_COEX_ENV_OPEN,
                         BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);
                 if (ret)
                         return ret;
 
         }
 
-        ret = iwlagn_send_calib_cfg(priv);
+        ret = iwl_send_calib_cfg(trans(priv));
         if (ret)
                 return ret;
 
@@ -369,15 +345,15 @@ int iwlagn_init_alive_start(struct iwl_priv *priv)
          */
         if (priv->cfg->need_temp_offset_calib) {
                 if (priv->cfg->temp_offset_v2)
-                        return iwlagn_set_temperature_offset_calib_v2(priv);
+                        return iwl_set_temperature_offset_calib_v2(priv);
                 else
-                        return iwlagn_set_temperature_offset_calib(priv);
+                        return iwl_set_temperature_offset_calib(priv);
         }
 
         return 0;
 }
 
-static int iwlagn_send_wimax_coex(struct iwl_priv *priv)
+static int iwl_send_wimax_coex(struct iwl_priv *priv)
 {
         struct iwl_wimax_coex_cmd coex_cmd;
 
@@ -405,7 +381,7 @@ static int iwlagn_send_wimax_coex(struct iwl_priv *priv)
                                 sizeof(coex_cmd), &coex_cmd);
 }
 
-static const u8 iwlagn_bt_prio_tbl[BT_COEX_PRIO_TBL_EVT_MAX] = {
+static const u8 iwl_bt_prio_tbl[BT_COEX_PRIO_TBL_EVT_MAX] = {
         ((BT_COEX_PRIO_TBL_PRIO_BYPASS << IWL_BT_COEX_PRIO_TBL_PRIO_POS) |
                 (0 << IWL_BT_COEX_PRIO_TBL_SHARED_ANTENNA_POS)),
         ((BT_COEX_PRIO_TBL_PRIO_BYPASS << IWL_BT_COEX_PRIO_TBL_PRIO_POS) |
@@ -427,42 +403,42 @@ static const u8 iwlagn_bt_prio_tbl[BT_COEX_PRIO_TBL_EVT_MAX] = {
         0, 0, 0, 0, 0, 0, 0
 };
 
-void iwlagn_send_prio_tbl(struct iwl_priv *priv)
+void iwl_send_prio_tbl(struct iwl_trans *trans)
 {
         struct iwl_bt_coex_prio_table_cmd prio_tbl_cmd;
 
-        memcpy(prio_tbl_cmd.prio_tbl, iwlagn_bt_prio_tbl,
-                sizeof(iwlagn_bt_prio_tbl));
-        if (iwl_trans_send_cmd_pdu(trans(priv),
+        memcpy(prio_tbl_cmd.prio_tbl, iwl_bt_prio_tbl,
+                sizeof(iwl_bt_prio_tbl));
+        if (iwl_trans_send_cmd_pdu(trans,
                                 REPLY_BT_COEX_PRIO_TABLE, CMD_SYNC,
                                 sizeof(prio_tbl_cmd), &prio_tbl_cmd))
-                IWL_ERR(priv, "failed to send BT prio tbl command\n");
+                IWL_ERR(trans, "failed to send BT prio tbl command\n");
 }
 
-int iwlagn_send_bt_env(struct iwl_priv *priv, u8 action, u8 type)
+int iwl_send_bt_env(struct iwl_trans *trans, u8 action, u8 type)
 {
         struct iwl_bt_coex_prot_env_cmd env_cmd;
         int ret;
 
         env_cmd.action = action;
         env_cmd.type = type;
-        ret = iwl_trans_send_cmd_pdu(trans(priv),
+        ret = iwl_trans_send_cmd_pdu(trans,
                                REPLY_BT_COEX_PROT_ENV, CMD_SYNC,
                                sizeof(env_cmd), &env_cmd);
         if (ret)
-                IWL_ERR(priv, "failed to send BT env command\n");
+                IWL_ERR(trans, "failed to send BT env command\n");
         return ret;
 }
 
 
-static int iwlagn_alive_notify(struct iwl_priv *priv)
+static int iwl_alive_notify(struct iwl_priv *priv)
 {
         struct iwl_rxon_context *ctx;
         int ret;
 
         if (!priv->tx_cmd_pool)
                 priv->tx_cmd_pool =
-                        kmem_cache_create("iwlagn_dev_cmd",
+                        kmem_cache_create("iwl_dev_cmd",
                                           sizeof(struct iwl_device_cmd),
                                           sizeof(void *), 0, NULL);
 
@@ -473,15 +449,17 @@ static int iwlagn_alive_notify(struct iwl_priv *priv)
         for_each_context(priv, ctx)
                 ctx->last_tx_rejected = false;
 
-        ret = iwlagn_send_wimax_coex(priv);
+        ret = iwl_send_wimax_coex(priv);
         if (ret)
                 return ret;
 
-        ret = iwlagn_set_Xtal_calib(priv);
-        if (ret)
-                return ret;
+        if (!priv->cfg->no_xtal_calib) {
+                ret = iwl_set_Xtal_calib(priv);
+                if (ret)
+                        return ret;
+        }
 
-        return iwl_send_calib_results(priv);
+        return iwl_send_calib_results(trans(priv));
 }
 
 
@@ -572,7 +550,7 @@ struct iwlagn_alive_data {
         u8 subtype;
 };
 
-static void iwlagn_alive_fn(struct iwl_priv *priv,
+static void iwl_alive_fn(struct iwl_trans *trans,
                             struct iwl_rx_packet *pkt,
                             void *data)
 {
@@ -581,20 +559,84 @@ static void iwlagn_alive_fn(struct iwl_priv *priv,
 
         palive = &pkt->u.alive_frame;
 
-        IWL_DEBUG_FW(priv, "Alive ucode status 0x%08X revision "
+        IWL_DEBUG_FW(trans, "Alive ucode status 0x%08X revision "
                        "0x%01X 0x%01X\n",
                        palive->is_valid, palive->ver_type,
                        palive->ver_subtype);
 
-        priv->device_pointers.error_event_table =
+        trans->shrd->device_pointers.error_event_table =
                 le32_to_cpu(palive->error_event_table_ptr);
-        priv->device_pointers.log_event_table =
+        trans->shrd->device_pointers.log_event_table =
                 le32_to_cpu(palive->log_event_table_ptr);
 
         alive_data->subtype = palive->ver_subtype;
         alive_data->valid = palive->is_valid == UCODE_VALID_OK;
 }
 
+/* notification wait support */
+void iwl_init_notification_wait(struct iwl_shared *shrd,
+                                   struct iwl_notification_wait *wait_entry,
+                                   u8 cmd,
+                                   void (*fn)(struct iwl_trans *trans,
+                                              struct iwl_rx_packet *pkt,
+                                              void *data),
+                                   void *fn_data)
+{
+        wait_entry->fn = fn;
+        wait_entry->fn_data = fn_data;
+        wait_entry->cmd = cmd;
+        wait_entry->triggered = false;
+        wait_entry->aborted = false;
+
+        spin_lock_bh(&shrd->notif_wait_lock);
+        list_add(&wait_entry->list, &shrd->notif_waits);
+        spin_unlock_bh(&shrd->notif_wait_lock);
+}
+
+int iwl_wait_notification(struct iwl_shared *shrd,
+                             struct iwl_notification_wait *wait_entry,
+                             unsigned long timeout)
+{
+        int ret;
+
+        ret = wait_event_timeout(shrd->notif_waitq,
+                                 wait_entry->triggered || wait_entry->aborted,
+                                 timeout);
+
+        spin_lock_bh(&shrd->notif_wait_lock);
+        list_del(&wait_entry->list);
+        spin_unlock_bh(&shrd->notif_wait_lock);
+
+        if (wait_entry->aborted)
+                return -EIO;
+
+        /* return value is always >= 0 */
+        if (ret <= 0)
+                return -ETIMEDOUT;
+        return 0;
+}
+
+void iwl_remove_notification(struct iwl_shared *shrd,
+                                struct iwl_notification_wait *wait_entry)
+{
+        spin_lock_bh(&shrd->notif_wait_lock);
+        list_del(&wait_entry->list);
+        spin_unlock_bh(&shrd->notif_wait_lock);
+}
+
+void iwl_abort_notification_waits(struct iwl_shared *shrd)
+{
+        unsigned long flags;
+        struct iwl_notification_wait *wait_entry;
+
+        spin_lock_irqsave(&shrd->notif_wait_lock, flags);
+        list_for_each_entry(wait_entry, &shrd->notif_waits, list)
+                wait_entry->aborted = true;
+        spin_unlock_irqrestore(&shrd->notif_wait_lock, flags);
+
+        wake_up_all(&shrd->notif_waitq);
+}
+
 #define UCODE_ALIVE_TIMEOUT     HZ
 #define UCODE_CALIB_TIMEOUT     (2*HZ)
 
@@ -603,41 +645,43 @@ int iwlagn_load_ucode_wait_alive(struct iwl_priv *priv,
 {
         struct iwl_notification_wait alive_wait;
         struct iwlagn_alive_data alive_data;
+        struct iwl_trans *trans = trans(priv);
         int ret;
         enum iwl_ucode_type old_type;
 
-        ret = iwl_trans_start_device(trans(priv));
+        ret = iwl_trans_start_device(trans);
         if (ret)
                 return ret;
 
-        iwlagn_init_notification_wait(priv, &alive_wait, REPLY_ALIVE,
-                                      iwlagn_alive_fn, &alive_data);
+        iwl_init_notification_wait(trans->shrd, &alive_wait, REPLY_ALIVE,
+                                      iwl_alive_fn, &alive_data);
 
-        old_type = priv->ucode_type;
-        priv->ucode_type = ucode_type;
+        old_type = trans->shrd->ucode_type;
+        trans->shrd->ucode_type = ucode_type;
 
-        ret = iwlagn_load_given_ucode(trans(priv), ucode_type);
+        ret = iwl_load_given_ucode(trans, ucode_type);
         if (ret) {
-                priv->ucode_type = old_type;
-                iwlagn_remove_notification(priv, &alive_wait);
+                trans->shrd->ucode_type = old_type;
+                iwl_remove_notification(trans->shrd, &alive_wait);
                 return ret;
         }
 
-        iwl_trans_kick_nic(trans(priv));
+        iwl_trans_kick_nic(trans);
 
         /*
          * Some things may run in the background now, but we
          * just wait for the ALIVE notification here.
          */
-        ret = iwlagn_wait_notification(priv, &alive_wait, UCODE_ALIVE_TIMEOUT);
+        ret = iwl_wait_notification(trans->shrd, &alive_wait,
+                                        UCODE_ALIVE_TIMEOUT);
         if (ret) {
-                priv->ucode_type = old_type;
+                trans->shrd->ucode_type = old_type;
                 return ret;
         }
 
         if (!alive_data.valid) {
                 IWL_ERR(priv, "Loaded ucode is not valid!\n");
-                priv->ucode_type = old_type;
+                trans->shrd->ucode_type = old_type;
                 return -EIO;
         }
 
@@ -647,9 +691,9 @@ int iwlagn_load_ucode_wait_alive(struct iwl_priv *priv,
          * skip it for WoWLAN.
          */
         if (ucode_type != IWL_UCODE_WOWLAN) {
-                ret = iwl_verify_ucode(trans(priv), ucode_type);
+                ret = iwl_verify_ucode(trans, ucode_type);
                 if (ret) {
-                        priv->ucode_type = old_type;
+                        trans->shrd->ucode_type = old_type;
                         return ret;
                 }
 
@@ -657,11 +701,11 @@ int iwlagn_load_ucode_wait_alive(struct iwl_priv *priv,
                 msleep(5);
         }
 
-        ret = iwlagn_alive_notify(priv);
+        ret = iwl_alive_notify(priv);
         if (ret) {
                 IWL_WARN(priv,
                         "Could not complete ALIVE transition: %d\n", ret);
-                priv->ucode_type = old_type;
+                trans->shrd->ucode_type = old_type;
                 return ret;
         }
 
@@ -679,10 +723,10 @@ int iwlagn_run_init_ucode(struct iwl_priv *priv)
         if (!trans(priv)->ucode_init.code.len)
                 return 0;
 
-        if (priv->ucode_type != IWL_UCODE_NONE)
+        if (priv->shrd->ucode_type != IWL_UCODE_NONE)
                 return 0;
 
-        iwlagn_init_notification_wait(priv, &calib_wait,
+        iwl_init_notification_wait(priv->shrd, &calib_wait,
                                       CALIBRATION_COMPLETE_NOTIFICATION,
                                       NULL, NULL);
 
@@ -699,12 +743,13 @@ int iwlagn_run_init_ucode(struct iwl_priv *priv)
          * Some things may run in the background now, but we
          * just wait for the calibration complete notification.
          */
-        ret = iwlagn_wait_notification(priv, &calib_wait, UCODE_CALIB_TIMEOUT);
+        ret = iwl_wait_notification(priv->shrd, &calib_wait,
+                                        UCODE_CALIB_TIMEOUT);
 
         goto out;
 
  error:
-        iwlagn_remove_notification(priv, &calib_wait);
+        iwl_remove_notification(priv->shrd, &calib_wait);
  out:
         /* Whatever happened, stop the device */
         iwl_trans_stop_device(trans(priv));
diff --git a/drivers/net/wireless/iwmc3200wifi/commands.c b/drivers/net/wireless/iwmc3200wifi/commands.c
index 50dee6a0a5ca..bd75078c454b 100644
--- a/drivers/net/wireless/iwmc3200wifi/commands.c
+++ b/drivers/net/wireless/iwmc3200wifi/commands.c
@@ -42,6 +42,7 @@
 #include <linux/ieee80211.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/moduleparam.h>
 
 #include "iwm.h"
 #include "bus.h"
diff --git a/drivers/net/wireless/iwmc3200wifi/debugfs.c b/drivers/net/wireless/iwmc3200wifi/debugfs.c
index 0a0cc9667cd6..87eef5773a02 100644
--- a/drivers/net/wireless/iwmc3200wifi/debugfs.c
+++ b/drivers/net/wireless/iwmc3200wifi/debugfs.c
@@ -25,6 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/bitops.h>
 #include <linux/debugfs.h>
+#include <linux/export.h>
 
 #include "iwm.h"
 #include "bus.h"
diff --git a/drivers/net/wireless/iwmc3200wifi/main.c b/drivers/net/wireless/iwmc3200wifi/main.c
index 362002735b12..98a179f98ea1 100644
--- a/drivers/net/wireless/iwmc3200wifi/main.c
+++ b/drivers/net/wireless/iwmc3200wifi/main.c
@@ -42,6 +42,7 @@
 #include <linux/ieee80211.h>
 #include <linux/wireless.h>
 #include <linux/slab.h>
+#include <linux/moduleparam.h>
 
 #include "iwm.h"
 #include "debug.h"
diff --git a/drivers/net/wireless/iwmc3200wifi/sdio.c b/drivers/net/wireless/iwmc3200wifi/sdio.c
index 56383e7be835..764b40dd24ad 100644
--- a/drivers/net/wireless/iwmc3200wifi/sdio.c
+++ b/drivers/net/wireless/iwmc3200wifi/sdio.c
@@ -63,6 +63,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/netdevice.h>
 #include <linux/debugfs.h>
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index 89f34ad8d34a..d1d84e0e30fc 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -635,7 +635,7 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy,
                         if (channel &&
                             !(channel->flags & IEEE80211_CHAN_DISABLED)) {
                                 bss = cfg80211_inform_bss(wiphy, channel,
-                                        bssid, le64_to_cpu(*(__le64 *)tsfdesc),
+                                        bssid, get_unaligned_le64(tsfdesc),
                                         capa, intvl, ie, ielen,
                                         LBS_SCAN_RSSI_TO_MBM(rssi),
                                         GFP_KERNEL);
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index e08ab1de3d9d..d798bcc0d83a 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -8,6 +8,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/if_arp.h>
+#include <linux/export.h>
 
 #include "decl.h"
 #include "cfg.h"
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 1af182778844..d8d8f0d0899f 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -5,6 +5,7 @@
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 
 #include "decl.h"
 #include "cmd.h"
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index c962e21762dc..9804ebc892d4 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -29,7 +29,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/kernel.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/firmware.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
index 622ae6de0d8b..50b1ee7721e9 100644
--- a/drivers/net/wireless/libertas/if_spi.c
+++ b/drivers/net/wireless/libertas/if_spi.c
@@ -21,7 +21,7 @@
 
 #include <linux/hardirq.h>
 #include <linux/interrupt.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/firmware.h>
 #include <linux/jiffies.h>
 #include <linux/list.h>
@@ -995,6 +995,7 @@ static int if_spi_host_to_card(struct lbs_private *priv,
                 spin_unlock_irqrestore(&card->buffer_lock, flags);
                 break;
         default:
+                kfree(packet);
                 netdev_err(priv->dev, "can't transfer buffer of type %d\n",
                            type);
                 err = -EINVAL;
@@ -1290,7 +1291,6 @@ static struct spi_driver libertas_spi_driver = {
         .remove = __devexit_p(libertas_spi_remove),
         .driver = {
                 .name   = "libertas_spi",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
                 .pm     = &if_spi_pm_ops,
         },
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 8147f1e2a0b0..db879c364ebf 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -5,7 +5,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/delay.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/firmware.h>
 #include <linux/netdevice.h>
 #include <linux/slab.h>
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 39a6a7a40244..957681dede17 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -6,7 +6,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
 #include <linux/hardirq.h>
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 62e10eeadd7e..c7366b07b568 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -8,6 +8,7 @@
 #include <linux/hardirq.h>
 #include <linux/slab.h>
 #include <linux/types.h>
+#include <linux/export.h>
 #include <net/cfg80211.h>
 
 #include "defs.h"
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c
index 8f127520d786..c025f9c18282 100644
--- a/drivers/net/wireless/libertas/tx.c
+++ b/drivers/net/wireless/libertas/tx.c
@@ -5,6 +5,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/sched.h>
+#include <linux/export.h>
 #include <net/cfg80211.h>
 
 #include "host.h"
diff --git a/drivers/net/wireless/libertas_tf/cmd.c b/drivers/net/wireless/libertas_tf/cmd.c
index 13557fe0bf95..909ac3685010 100644
--- a/drivers/net/wireless/libertas_tf/cmd.c
+++ b/drivers/net/wireless/libertas_tf/cmd.c
@@ -11,6 +11,7 @@
 
 #include <linux/hardirq.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 
 #include "libertas_tf.h"
 
diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c
index ba7d96584cb6..68202e63873a 100644
--- a/drivers/net/wireless/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/libertas_tf/if_usb.c
@@ -15,7 +15,7 @@
 #include "if_usb.h"
 
 #include <linux/delay.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/firmware.h>
 #include <linux/netdevice.h>
 #include <linux/slab.h>
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c
index acc461aa385e..ceb51b6e6702 100644
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 
 #include <linux/etherdevice.h>
+#include <linux/module.h>
 #include "libertas_tf.h"
 
 #define DRIVER_RELEASE_VERSION "004.p0"
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 477100d0b117..52bcdf40d5bd 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -26,6 +26,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/etherdevice.h>
 #include <linux/debugfs.h>
+#include <linux/module.h>
 #include <net/genetlink.h>
 #include "mac80211_hwsim.h"
 
@@ -36,7 +37,8 @@ MODULE_AUTHOR("Jouni Malinen");
 MODULE_DESCRIPTION("Software simulator of 802.11 radio(s) for mac80211");
 MODULE_LICENSE("GPL");
 
-int wmediumd_pid;
+static u32 wmediumd_pid;
+
 static int radios = 2;
 module_param(radios, int, 0444);
 MODULE_PARM_DESC(radios, "Number of simulated radios");
@@ -664,7 +666,7 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
         bool ack;
         struct ieee80211_tx_info *txi;
-        int _pid;
+        u32 _pid;
 
         mac80211_hwsim_monitor_rx(hw, skb);
 
@@ -675,7 +677,7 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
         }
 
         /* wmediumd mode check */
-        _pid = wmediumd_pid;
+        _pid = ACCESS_ONCE(wmediumd_pid);
 
         if (_pid)
                 return mac80211_hwsim_tx_frame_nl(hw, skb, _pid);
@@ -763,7 +765,7 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac,
         struct ieee80211_hw *hw = arg;
         struct sk_buff *skb;
         struct ieee80211_tx_info *info;
-        int _pid;
+        u32 _pid;
 
         hwsim_check_magic(vif);
 
@@ -780,7 +782,7 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac,
         mac80211_hwsim_monitor_rx(hw, skb);
 
         /* wmediumd mode check */
-        _pid = wmediumd_pid;
+        _pid = ACCESS_ONCE(wmediumd_pid);
 
         if (_pid)
                 return mac80211_hwsim_tx_frame_nl(hw, skb, _pid);
@@ -1253,7 +1255,7 @@ static void hwsim_send_ps_poll(void *dat, u8 *mac, struct ieee80211_vif *vif)
         struct hwsim_vif_priv *vp = (void *)vif->drv_priv;
         struct sk_buff *skb;
         struct ieee80211_pspoll *pspoll;
-        int _pid;
+        u32 _pid;
 
         if (!vp->assoc)
                 return;
@@ -1274,7 +1276,7 @@ static void hwsim_send_ps_poll(void *dat, u8 *mac, struct ieee80211_vif *vif)
         memcpy(pspoll->ta, mac, ETH_ALEN);
 
         /* wmediumd mode check */
-        _pid = wmediumd_pid;
+        _pid = ACCESS_ONCE(wmediumd_pid);
 
         if (_pid)
                 return mac80211_hwsim_tx_frame_nl(data->hw, skb, _pid);
@@ -1291,7 +1293,7 @@ static void hwsim_send_nullfunc(struct mac80211_hwsim_data *data, u8 *mac,
         struct hwsim_vif_priv *vp = (void *)vif->drv_priv;
         struct sk_buff *skb;
         struct ieee80211_hdr *hdr;
-        int _pid;
+        u32 _pid;
 
         if (!vp->assoc)
                 return;
@@ -1313,7 +1315,7 @@ static void hwsim_send_nullfunc(struct mac80211_hwsim_data *data, u8 *mac,
         memcpy(hdr->addr3, vp->bssid, ETH_ALEN);
 
         /* wmediumd mode check */
-        _pid = wmediumd_pid;
+        _pid = ACCESS_ONCE(wmediumd_pid);
 
         if (_pid)
                 return mac80211_hwsim_tx_frame_nl(data->hw, skb, _pid);
@@ -1633,8 +1635,6 @@ static int hwsim_init_netlink(void)
         int rc;
         printk(KERN_INFO "mac80211_hwsim: initializing netlink\n");
 
-        wmediumd_pid = 0;
-
         rc = genl_register_family_with_ops(&hwsim_genl_family,
                 hwsim_ops, ARRAY_SIZE(hwsim_ops));
         if (rc)
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index e9ab9a3fbe9c..787dbe2aa408 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -120,10 +120,11 @@ mwifiex_cfg80211_del_key(struct wiphy *wiphy, struct net_device *netdev,
 static int
 mwifiex_cfg80211_set_tx_power(struct wiphy *wiphy,
                               enum nl80211_tx_power_setting type,
-                              int dbm)
+                              int mbm)
 {
         struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
         struct mwifiex_power_cfg power_cfg;
+        int dbm = MBM_TO_DBM(mbm);
 
         if (type == NL80211_TX_POWER_FIXED) {
                 power_cfg.is_power_auto = 0;
@@ -750,17 +751,13 @@ mwifiex_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
 {
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
 
-        if (priv->disconnect)
-                return -EBUSY;
-
-        priv->disconnect = 1;
         if (mwifiex_deauthenticate(priv, NULL))
                 return -EFAULT;
 
         wiphy_dbg(wiphy, "info: successfully disconnected from %pM:"
                 " reason code %d\n", priv->cfg_bssid, reason_code);
 
-        queue_work(priv->workqueue, &priv->cfg_workqueue);
+        memset(priv->cfg_bssid, 0, ETH_ALEN);
 
         return 0;
 }
@@ -980,27 +977,32 @@ mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
         int ret = 0;
 
-        if (priv->assoc_request)
-                return -EBUSY;
-
         if (priv->bss_mode == NL80211_IFTYPE_ADHOC) {
                 wiphy_err(wiphy, "received infra assoc request "
                                 "when station is in ibss mode\n");
                 goto done;
         }
 
-        priv->assoc_request = -EINPROGRESS;
-
         wiphy_dbg(wiphy, "info: Trying to associate to %s and bssid %pM\n",
                (char *) sme->ssid, sme->bssid);
 
         ret = mwifiex_cfg80211_assoc(priv, sme->ssid_len, sme->ssid, sme->bssid,
                                      priv->bss_mode, sme->channel, sme, 0);
-
-        priv->assoc_request = 1;
 done:
-        priv->assoc_result = ret;
-        queue_work(priv->workqueue, &priv->cfg_workqueue);
+        if (!ret) {
+                cfg80211_connect_result(priv->netdev, priv->cfg_bssid, NULL, 0,
+                                        NULL, 0, WLAN_STATUS_SUCCESS,
+                                        GFP_KERNEL);
+                dev_dbg(priv->adapter->dev,
+                        "info: associated to bssid %pM successfully\n",
+                        priv->cfg_bssid);
+        } else {
+                dev_dbg(priv->adapter->dev,
+                        "info: association to bssid %pM failed\n",
+                        priv->cfg_bssid);
+                memset(priv->cfg_bssid, 0, ETH_ALEN);
+        }
+
         return ret;
 }
 
@@ -1017,28 +1019,29 @@ mwifiex_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
         struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
         int ret = 0;
 
-        if (priv->ibss_join_request)
-                return -EBUSY;
-
         if (priv->bss_mode != NL80211_IFTYPE_ADHOC) {
                 wiphy_err(wiphy, "request to join ibss received "
                                 "when station is not in ibss mode\n");
                 goto done;
         }
 
-        priv->ibss_join_request = -EINPROGRESS;
-
         wiphy_dbg(wiphy, "info: trying to join to %s and bssid %pM\n",
                (char *) params->ssid, params->bssid);
 
         ret = mwifiex_cfg80211_assoc(priv, params->ssid_len, params->ssid,
                                 params->bssid, priv->bss_mode,
                                 params->channel, NULL, params->privacy);
-
-        priv->ibss_join_request = 1;
 done:
-        priv->ibss_join_result = ret;
-        queue_work(priv->workqueue, &priv->cfg_workqueue);
+        if (!ret) {
+                cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid, GFP_KERNEL);
+                dev_dbg(priv->adapter->dev,
+                        "info: joined/created adhoc network with bssid"
+                        " %pM successfully\n", priv->cfg_bssid);
+        } else {
+                dev_dbg(priv->adapter->dev,
+                        "info: failed creating/joining adhoc network\n");
+        }
+
         return ret;
 }
 
@@ -1053,17 +1056,12 @@ mwifiex_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
 {
         struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
 
-        if (priv->disconnect)
-                return -EBUSY;
-
-        priv->disconnect = 1;
-
         wiphy_dbg(wiphy, "info: disconnecting from essid %pM\n",
                         priv->cfg_bssid);
         if (mwifiex_deauthenticate(priv, NULL))
                 return -EFAULT;
 
-        queue_work(priv->workqueue, &priv->cfg_workqueue);
+        memset(priv->cfg_bssid, 0, ETH_ALEN);
 
         return 0;
 }
@@ -1080,15 +1078,42 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev,
                       struct cfg80211_scan_request *request)
 {
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+        int i;
+        struct ieee80211_channel *chan;
 
         wiphy_dbg(wiphy, "info: received scan request on %s\n", dev->name);
 
-        if (priv->scan_request && priv->scan_request != request)
-                return -EBUSY;
-
         priv->scan_request = request;
 
-        queue_work(priv->workqueue, &priv->cfg_workqueue);
+        priv->user_scan_cfg = kzalloc(sizeof(struct mwifiex_user_scan_cfg),
+                                        GFP_KERNEL);
+        if (!priv->user_scan_cfg) {
+                dev_err(priv->adapter->dev, "failed to alloc scan_req\n");
+                return -ENOMEM;
+        }
+        for (i = 0; i < request->n_ssids; i++) {
+                memcpy(priv->user_scan_cfg->ssid_list[i].ssid,
+                        request->ssids[i].ssid, request->ssids[i].ssid_len);
+                priv->user_scan_cfg->ssid_list[i].max_len =
+                        request->ssids[i].ssid_len;
+        }
+        for (i = 0; i < request->n_channels; i++) {
+                chan = request->channels[i];
+                priv->user_scan_cfg->chan_list[i].chan_number = chan->hw_value;
+                priv->user_scan_cfg->chan_list[i].radio_type = chan->band;
+
+                if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN)
+                        priv->user_scan_cfg->chan_list[i].scan_type =
+                                MWIFIEX_SCAN_TYPE_PASSIVE;
+                else
+                        priv->user_scan_cfg->chan_list[i].scan_type =
+                                MWIFIEX_SCAN_TYPE_ACTIVE;
+
+                priv->user_scan_cfg->chan_list[i].scan_time = 0;
+        }
+        if (mwifiex_set_user_scan_ioctl(priv, priv->user_scan_cfg))
+                return -EFAULT;
+
         return 0;
 }
 
@@ -1294,10 +1319,6 @@ int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev)
 
         priv->media_connected = false;
 
-        cancel_work_sync(&priv->cfg_workqueue);
-        flush_workqueue(priv->workqueue);
-        destroy_workqueue(priv->workqueue);
-
         priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
 
         return 0;
@@ -1375,9 +1396,6 @@ int mwifiex_register_cfg80211(struct mwifiex_private *priv)
         memcpy(wdev->wiphy->perm_addr, priv->curr_addr, ETH_ALEN);
         wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
 
-        /* We are using custom domains */
-        wdev->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
-
         /* Reserve space for bss band information */
         wdev->wiphy->bss_priv_size = sizeof(u8);
 
@@ -1406,100 +1424,3 @@ int mwifiex_register_cfg80211(struct mwifiex_private *priv)
 
         return ret;
 }
-
-/*
- * This function handles the result of different pending network operations.
- *
- * The following operations are handled and CFG802.11 subsystem is
- * notified accordingly -
- *      - Scan request completion
- *      - Association request completion
- *      - IBSS join request completion
- *      - Disconnect request completion
- */
-void
-mwifiex_cfg80211_results(struct work_struct *work)
-{
-        struct mwifiex_private *priv =
-                container_of(work, struct mwifiex_private, cfg_workqueue);
-        struct mwifiex_user_scan_cfg *scan_req;
-        int ret = 0, i;
-        struct ieee80211_channel *chan;
-
-        if (priv->scan_request) {
-                scan_req = kzalloc(sizeof(struct mwifiex_user_scan_cfg),
-                                   GFP_KERNEL);
-                if (!scan_req) {
-                        dev_err(priv->adapter->dev, "failed to alloc "
-                                                    "scan_req\n");
-                        return;
-                }
-                for (i = 0; i < priv->scan_request->n_ssids; i++) {
-                        memcpy(scan_req->ssid_list[i].ssid,
-                                        priv->scan_request->ssids[i].ssid,
-                                        priv->scan_request->ssids[i].ssid_len);
-                        scan_req->ssid_list[i].max_len =
-                                        priv->scan_request->ssids[i].ssid_len;
-                }
-                for (i = 0; i < priv->scan_request->n_channels; i++) {
-                        chan = priv->scan_request->channels[i];
-                        scan_req->chan_list[i].chan_number = chan->hw_value;
-                        scan_req->chan_list[i].radio_type = chan->band;
-                        if (chan->flags & IEEE80211_CHAN_DISABLED)
-                                scan_req->chan_list[i].scan_type =
-                                        MWIFIEX_SCAN_TYPE_PASSIVE;
-                        else
-                                scan_req->chan_list[i].scan_type =
-                                        MWIFIEX_SCAN_TYPE_ACTIVE;
-                        scan_req->chan_list[i].scan_time = 0;
-                }
-                if (mwifiex_set_user_scan_ioctl(priv, scan_req))
-                        ret = -EFAULT;
-                priv->scan_result_status = ret;
-                dev_dbg(priv->adapter->dev, "info: %s: sending scan results\n",
-                                                        __func__);
-                cfg80211_scan_done(priv->scan_request,
-                                (priv->scan_result_status < 0));
-                priv->scan_request = NULL;
-                kfree(scan_req);
-        }
-
-        if (priv->assoc_request == 1) {
-                if (!priv->assoc_result) {
-                        cfg80211_connect_result(priv->netdev, priv->cfg_bssid,
-                                                NULL, 0, NULL, 0,
-                                                WLAN_STATUS_SUCCESS,
-                                                GFP_KERNEL);
-                        dev_dbg(priv->adapter->dev,
-                                "info: associated to bssid %pM successfully\n",
-                               priv->cfg_bssid);
-                } else {
-                        dev_dbg(priv->adapter->dev,
-                                "info: association to bssid %pM failed\n",
-                               priv->cfg_bssid);
-                        memset(priv->cfg_bssid, 0, ETH_ALEN);
-                }
-                priv->assoc_request = 0;
-                priv->assoc_result = 0;
-        }
-
-        if (priv->ibss_join_request == 1) {
-                if (!priv->ibss_join_result) {
-                        cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid,
-                                             GFP_KERNEL);
-                        dev_dbg(priv->adapter->dev,
-                                "info: joined/created adhoc network with bssid"
-                                        " %pM successfully\n", priv->cfg_bssid);
-                } else {
-                        dev_dbg(priv->adapter->dev,
-                                "info: failed creating/joining adhoc network\n");
-                }
-                priv->ibss_join_request = 0;
-                priv->ibss_join_result = 0;
-        }
-
-        if (priv->disconnect) {
-                memset(priv->cfg_bssid, 0, ETH_ALEN);
-                priv->disconnect = 0;
-        }
-}
diff --git a/drivers/net/wireless/mwifiex/cfg80211.h b/drivers/net/wireless/mwifiex/cfg80211.h
index 8d010f2500c5..76c76c60438b 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.h
+++ b/drivers/net/wireless/mwifiex/cfg80211.h
@@ -26,5 +26,4 @@
 
 int mwifiex_register_cfg80211(struct mwifiex_private *);
 
-void mwifiex_cfg80211_results(struct work_struct *work);
 #endif
diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c
index ac278156d390..6e0a3eaecf70 100644
--- a/drivers/net/wireless/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/mwifiex/cmdevt.c
@@ -939,7 +939,6 @@ mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter)
 {
         struct cmd_ctrl_node *cmd_node = NULL, *tmp_node = NULL;
         unsigned long cmd_flags;
-        unsigned long cmd_pending_q_flags;
         unsigned long scan_pending_q_flags;
         uint16_t cancel_scan_cmd = false;
 
@@ -949,12 +948,9 @@ mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter)
                 cmd_node = adapter->curr_cmd;
                 cmd_node->wait_q_enabled = false;
                 cmd_node->cmd_flag |= CMD_F_CANCELED;
-                spin_lock_irqsave(&adapter->cmd_pending_q_lock,
-                                  cmd_pending_q_flags);
-                list_del(&cmd_node->list);
-                spin_unlock_irqrestore(&adapter->cmd_pending_q_lock,
-                                       cmd_pending_q_flags);
                 mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
+                mwifiex_complete_cmd(adapter, adapter->curr_cmd);
+                adapter->curr_cmd = NULL;
                 spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, cmd_flags);
         }
 
@@ -981,7 +977,6 @@ mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter)
                 spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, cmd_flags);
         }
         adapter->cmd_wait_q.status = -1;
-        mwifiex_complete_cmd(adapter, adapter->curr_cmd);
 }
 
 /*
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index 26940455255b..244c728ef9dc 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -283,6 +283,45 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
 }
 
 /*
+ * This function sets trans_start per tx_queue
+ */
+void mwifiex_set_trans_start(struct net_device *dev)
+{
+        int i;
+
+        for (i = 0; i < dev->num_tx_queues; i++)
+                netdev_get_tx_queue(dev, i)->trans_start = jiffies;
+
+        dev->trans_start = jiffies;
+}
+
+/*
+ * This function wakes up all queues in net_device
+ */
+void mwifiex_wake_up_net_dev_queue(struct net_device *netdev,
+                                        struct mwifiex_adapter *adapter)
+{
+        unsigned long dev_queue_flags;
+
+        spin_lock_irqsave(&adapter->queue_lock, dev_queue_flags);
+        netif_tx_wake_all_queues(netdev);
+        spin_unlock_irqrestore(&adapter->queue_lock, dev_queue_flags);
+}
+
+/*
+ * This function stops all queues in net_device
+ */
+void mwifiex_stop_net_dev_queue(struct net_device *netdev,
+                                        struct mwifiex_adapter *adapter)
+{
+        unsigned long dev_queue_flags;
+
+        spin_lock_irqsave(&adapter->queue_lock, dev_queue_flags);
+        netif_tx_stop_all_queues(netdev);
+        spin_unlock_irqrestore(&adapter->queue_lock, dev_queue_flags);
+}
+
+/*
  *  This function releases the lock variables and frees the locks and
  *  associated locks.
  */
@@ -359,6 +398,7 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter)
         spin_lock_init(&adapter->int_lock);
         spin_lock_init(&adapter->main_proc_lock);
         spin_lock_init(&adapter->mwifiex_cmd_lock);
+        spin_lock_init(&adapter->queue_lock);
         for (i = 0; i < adapter->priv_num; i++) {
                 if (adapter->priv[i]) {
                         priv = adapter->priv[i];
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index 67e6db7d672d..84be196188cc 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -401,7 +401,7 @@ mwifiex_fill_buffer(struct sk_buff *skb)
 static int
 mwifiex_open(struct net_device *dev)
 {
-        netif_start_queue(dev);
+        netif_tx_start_all_queues(dev);
         return 0;
 }
 
@@ -465,8 +465,8 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         atomic_inc(&priv->adapter->tx_pending);
 
         if (atomic_read(&priv->adapter->tx_pending) >= MAX_TX_PENDING) {
-                netif_stop_queue(priv->netdev);
-                dev->trans_start = jiffies;
+                mwifiex_set_trans_start(dev);
+                mwifiex_stop_net_dev_queue(priv->netdev, priv->adapter);
         }
 
         queue_work(priv->adapter->workqueue, &priv->adapter->main_work);
@@ -533,7 +533,7 @@ mwifiex_tx_timeout(struct net_device *dev)
 
         dev_err(priv->adapter->dev, "%lu : Tx timeout, bss_index=%d\n",
                                 jiffies, priv->bss_index);
-        dev->trans_start = jiffies;
+        mwifiex_set_trans_start(dev);
         priv->num_tx_timeout++;
 }
 
@@ -586,8 +586,6 @@ void mwifiex_init_priv_params(struct mwifiex_private *priv,
         priv->media_connected = false;
         memset(&priv->nick_name, 0, sizeof(priv->nick_name));
         priv->num_tx_timeout = 0;
-        priv->workqueue = create_singlethread_workqueue("cfg80211_wq");
-        INIT_WORK(&priv->cfg_workqueue, mwifiex_cfg80211_results);
         memcpy(dev->dev_addr, priv->curr_addr, ETH_ALEN);
 }
 
@@ -793,7 +791,8 @@ int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem)
                 priv = adapter->priv[i];
                 if (priv && priv->netdev) {
                         if (!netif_queue_stopped(priv->netdev))
-                                netif_stop_queue(priv->netdev);
+                                mwifiex_stop_net_dev_queue(priv->netdev,
+                                                                adapter);
                         if (netif_carrier_ok(priv->netdev))
                                 netif_carrier_off(priv->netdev);
                 }
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 3861a617c0e1..9207fc64641e 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -453,15 +453,8 @@ struct mwifiex_private {
         u8 scan_pending_on_block;
         u8 report_scan_result;
         struct cfg80211_scan_request *scan_request;
-        int scan_result_status;
-        int assoc_request;
-        u16 assoc_result;
-        int ibss_join_request;
-        u16 ibss_join_result;
-        bool disconnect;
+        struct mwifiex_user_scan_cfg *user_scan_cfg;
         u8 cfg_bssid[6];
-        struct workqueue_struct *workqueue;
-        struct work_struct cfg_workqueue;
         u8 country_code[IEEE80211_COUNTRY_STRING_LEN];
         struct wps wps;
         u8 scan_block;
@@ -655,10 +648,19 @@ struct mwifiex_adapter {
         struct mwifiex_wait_queue cmd_wait_q;
         u8 scan_wait_q_woken;
         struct cmd_ctrl_node *cmd_queued;
+        spinlock_t queue_lock;          /* lock for tx queues */
 };
 
 int mwifiex_init_lock_list(struct mwifiex_adapter *adapter);
 
+void mwifiex_set_trans_start(struct net_device *dev);
+
+void mwifiex_stop_net_dev_queue(struct net_device *netdev,
+                struct mwifiex_adapter *adapter);
+
+void mwifiex_wake_up_net_dev_queue(struct net_device *netdev,
+                struct mwifiex_adapter *adapter);
+
 int mwifiex_init_fw(struct mwifiex_adapter *adapter);
 
 int mwifiex_init_fw_complete(struct mwifiex_adapter *adapter);
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
index a2f32008f9a8..405350940a45 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -386,7 +386,7 @@ static int mwifiex_pcie_create_txbd_ring(struct mwifiex_adapter *adapter)
         card->txbd_ring_vbase = kzalloc(card->txbd_ring_size, GFP_KERNEL);
         if (!card->txbd_ring_vbase) {
                 dev_err(adapter->dev, "Unable to allocate buffer for txbd ring.\n");
-                return -1;
+                return -ENOMEM;
         }
         card->txbd_ring_pbase = virt_to_phys(card->txbd_ring_vbase);
 
@@ -476,7 +476,7 @@ static int mwifiex_pcie_create_rxbd_ring(struct mwifiex_adapter *adapter)
         if (!card->rxbd_ring_vbase) {
                 dev_err(adapter->dev, "Unable to allocate buffer for "
                                 "rxbd_ring.\n");
-                return -1;
+                return -ENOMEM;
         }
         card->rxbd_ring_pbase = virt_to_phys(card->rxbd_ring_vbase);
 
@@ -569,7 +569,7 @@ static int mwifiex_pcie_create_evtbd_ring(struct mwifiex_adapter *adapter)
         if (!card->evtbd_ring_vbase) {
                 dev_err(adapter->dev, "Unable to allocate buffer. "
                                 "Terminating download\n");
-                return -1;
+                return -ENOMEM;
         }
         card->evtbd_ring_pbase = virt_to_phys(card->evtbd_ring_vbase);
 
@@ -1231,15 +1231,13 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter,
         if (rdptr >= MWIFIEX_MAX_EVT_BD) {
                 dev_err(adapter->dev, "event_complete: Invalid rdptr 0x%x\n",
                                         rdptr);
-                ret = -EINVAL;
-                goto done;
+                return -EINVAL;
         }
 
         /* Read the event ring write pointer set by firmware */
         if (mwifiex_read_reg(adapter, REG_EVTBD_WRPTR, &wrptr)) {
                 dev_err(adapter->dev, "event_complete: failed to read REG_EVTBD_WRPTR\n");
-                ret = -1;
-                goto done;
+                return -1;
         }
 
         if (!card->evt_buf_list[rdptr]) {
@@ -1268,15 +1266,9 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter,
         /* Write the event ring read pointer in to REG_EVTBD_RDPTR */
         if (mwifiex_write_reg(adapter, REG_EVTBD_RDPTR, card->evtbd_rdptr)) {
                 dev_err(adapter->dev, "event_complete: failed to read REG_EVTBD_RDPTR\n");
-                ret = -1;
-                goto done;
+                return -1;
         }
 
-done:
-        /* Free the buffer for failure case */
-        if (ret && skb)
-                dev_kfree_skb_any(skb);
-
         dev_dbg(adapter->dev, "info: Check Events Again\n");
         ret = mwifiex_pcie_process_event_ready(adapter);
 
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 8a18bcc23b26..e2e715666bca 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -819,8 +819,10 @@ mwifiex_scan_setup_scan_config(struct mwifiex_private *priv,
                         wildcard_ssid_tlv->header.len = cpu_to_le16(
                                 (u16) (ssid_len + sizeof(wildcard_ssid_tlv->
                                                          max_ssid_length)));
-                        wildcard_ssid_tlv->max_ssid_length =
-                                user_scan_in->ssid_list[ssid_idx].max_len;
+
+                        /* max_ssid_length = 0 tells firmware to perform
+                           specific scan for the SSID filled */
+                        wildcard_ssid_tlv->max_ssid_length = 0;
 
                         memcpy(wildcard_ssid_tlv->ssid,
                                user_scan_in->ssid_list[ssid_idx].ssid,
@@ -1389,11 +1391,8 @@ int mwifiex_set_user_scan_ioctl(struct mwifiex_private *priv,
 {
         int status;
 
-        priv->adapter->scan_wait_q_woken = false;
-
         status = mwifiex_scan_networks(priv, scan_req);
-        if (!status)
-                status = mwifiex_wait_queue_complete(priv->adapter);
+        queue_work(priv->adapter->workqueue, &priv->adapter->main_work);
 
         return status;
 }
@@ -1794,6 +1793,14 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
                         up(&priv->async_sem);
                 }
 
+                if (priv->user_scan_cfg) {
+                        dev_dbg(priv->adapter->dev, "info: %s: sending scan "
+                                                        "results\n", __func__);
+                        cfg80211_scan_done(priv->scan_request, 0);
+                        priv->scan_request = NULL;
+                        kfree(priv->user_scan_cfg);
+                        priv->user_scan_cfg = NULL;
+                }
         } else {
                 /* Get scan command from scan_pending_q and put to
                    cmd_pending_q */
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index 702452b505c3..d39d8457f252 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -1087,7 +1087,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
                                            (adapter->ioport | 0x1000 |
                                             (card->mpa_rx.ports << 4)) +
                                            card->mpa_rx.start_port, 1))
-                        return -1;
+                        goto error;
 
                 curr_ptr = card->mpa_rx.buf;
 
@@ -1130,12 +1130,29 @@ rx_curr_single:
                 if (mwifiex_sdio_card_to_host(adapter, &pkt_type,
                                               skb->data, skb->len,
                                               adapter->ioport + port))
-                        return -1;
+                        goto error;
 
                 mwifiex_decode_rx_packet(adapter, skb, pkt_type);
         }
 
         return 0;
+
+error:
+        if (MP_RX_AGGR_IN_PROGRESS(card)) {
+                /* Multiport-aggregation transfer failed - cleanup */
+                for (pind = 0; pind < card->mpa_rx.pkt_cnt; pind++) {
+                        /* copy pkt to deaggr buf */
+                        skb_deaggr = card->mpa_rx.skb_arr[pind];
+                        dev_kfree_skb_any(skb_deaggr);
+                }
+                MP_RX_AGGR_BUF_RESET(card);
+        }
+
+        if (f_do_rx_cur)
+                /* Single transfer pending. Free curr buff also */
+                dev_kfree_skb_any(skb);
+
+        return -1;
 }
 
 /*
@@ -1271,7 +1288,6 @@ static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
 
                                 dev_dbg(adapter->dev,
                                                 "info: CFG reg val =%x\n", cr);
-                                dev_kfree_skb_any(skb);
                                 return -1;
                         }
                 }
diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c
index f204810e8338..d7aa21da84d0 100644
--- a/drivers/net/wireless/mwifiex/sta_event.c
+++ b/drivers/net/wireless/mwifiex/sta_event.c
@@ -115,18 +115,17 @@ mwifiex_reset_connect_state(struct mwifiex_private *priv)
         if (adapter->num_cmd_timeout && adapter->curr_cmd)
                 return;
         priv->media_connected = false;
-        if (!priv->disconnect) {
-                priv->disconnect = 1;
-                dev_dbg(adapter->dev, "info: successfully disconnected from"
-                                " %pM: reason code %d\n", priv->cfg_bssid,
-                                WLAN_REASON_DEAUTH_LEAVING);
-                cfg80211_disconnected(priv->netdev,
-                                WLAN_REASON_DEAUTH_LEAVING, NULL, 0,
-                                GFP_KERNEL);
-                queue_work(priv->workqueue, &priv->cfg_workqueue);
+        dev_dbg(adapter->dev, "info: successfully disconnected from"
+                        " %pM: reason code %d\n", priv->cfg_bssid,
+                        WLAN_REASON_DEAUTH_LEAVING);
+        if (priv->bss_mode == NL80211_IFTYPE_STATION) {
+                cfg80211_disconnected(priv->netdev, WLAN_REASON_DEAUTH_LEAVING,
+                                      NULL, 0, GFP_KERNEL);
         }
+        memset(priv->cfg_bssid, 0, ETH_ALEN);
+
         if (!netif_queue_stopped(priv->netdev))
-                netif_stop_queue(priv->netdev);
+                mwifiex_stop_net_dev_queue(priv->netdev, adapter);
         if (netif_carrier_ok(priv->netdev))
                 netif_carrier_off(priv->netdev);
         /* Reset wireless stats signal info */
@@ -201,7 +200,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                 if (!netif_carrier_ok(priv->netdev))
                         netif_carrier_on(priv->netdev);
                 if (netif_queue_stopped(priv->netdev))
-                        netif_wake_queue(priv->netdev);
+                        mwifiex_wake_up_net_dev_queue(priv->netdev, adapter);
                 break;
 
         case EVENT_DEAUTHENTICATED:
@@ -292,7 +291,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                 priv->adhoc_is_link_sensed = false;
                 mwifiex_clean_txrx(priv);
                 if (!netif_queue_stopped(priv->netdev))
-                        netif_stop_queue(priv->netdev);
+                        mwifiex_stop_net_dev_queue(priv->netdev, adapter);
                 if (netif_carrier_ok(priv->netdev))
                         netif_carrier_off(priv->netdev);
                 break;
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index 4b6f5539657d..6d990c798a20 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -234,7 +234,7 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
                                       "associating...\n");
 
                 if (!netif_queue_stopped(priv->netdev))
-                        netif_stop_queue(priv->netdev);
+                        mwifiex_stop_net_dev_queue(priv->netdev, adapter);
 
                 /* Clear any past association response stored for
                  * application retrieval */
@@ -265,7 +265,7 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
                 ret = mwifiex_check_network_compatibility(priv, bss_desc);
 
                 if (!netif_queue_stopped(priv->netdev))
-                        netif_stop_queue(priv->netdev);
+                        mwifiex_stop_net_dev_queue(priv->netdev, adapter);
 
                 if (!ret) {
                         dev_dbg(adapter->dev, "info: network found in scan"
diff --git a/drivers/net/wireless/mwifiex/txrx.c b/drivers/net/wireless/mwifiex/txrx.c
index a206f412875f..d9274a1b77ac 100644
--- a/drivers/net/wireless/mwifiex/txrx.c
+++ b/drivers/net/wireless/mwifiex/txrx.c
@@ -134,7 +134,7 @@ int mwifiex_write_data_complete(struct mwifiex_adapter *adapter,
         if (!priv)
                 goto done;
 
-        priv->netdev->trans_start = jiffies;
+        mwifiex_set_trans_start(priv->netdev);
         if (!status) {
                 priv->stats.tx_packets++;
                 priv->stats.tx_bytes += skb->len;
@@ -152,7 +152,8 @@ int mwifiex_write_data_complete(struct mwifiex_adapter *adapter,
                 if ((GET_BSS_ROLE(tpriv) == MWIFIEX_BSS_ROLE_STA)
                                 && (tpriv->media_connected)) {
                         if (netif_queue_stopped(tpriv->netdev))
-                                netif_wake_queue(tpriv->netdev);
+                                mwifiex_wake_up_net_dev_queue(tpriv->netdev,
+                                                                adapter);
                 }
         }
 done:
diff --git a/drivers/net/wireless/orinoco/fw.c b/drivers/net/wireless/orinoco/fw.c
index 527cf5333db5..4df8cf64b56c 100644
--- a/drivers/net/wireless/orinoco/fw.c
+++ b/drivers/net/wireless/orinoco/fw.c
@@ -6,6 +6,7 @@
 #include <linux/slab.h>
 #include <linux/firmware.h>
 #include <linux/device.h>
+#include <linux/module.h>
 
 #include "hermes.h"
 #include "hermes_dld.h"
diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c
index 8b6f363b3f7d..fa8ce5104781 100644
--- a/drivers/net/wireless/p54/eeprom.c
+++ b/drivers/net/wireless/p54/eeprom.c
@@ -24,6 +24,7 @@
 
 #include <net/mac80211.h>
 #include <linux/crc-ccitt.h>
+#include <linux/export.h>
 
 #include "p54.h"
 #include "eeprom.h"
diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c
index 53a3408931be..18e82b31afa6 100644
--- a/drivers/net/wireless/p54/fwio.c
+++ b/drivers/net/wireless/p54/fwio.c
@@ -20,6 +20,7 @@
 #include <linux/slab.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
+#include <linux/export.h>
 
 #include <net/mac80211.h>
 
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index ad9ae04d07aa..db4d9a02f264 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -20,6 +20,7 @@
 #include <linux/slab.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
+#include <linux/module.h>
 
 #include <net/mac80211.h>
 
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index 1b753173680f..b1f51a215792 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -20,6 +20,7 @@
 #include <linux/etherdevice.h>
 #include <linux/delay.h>
 #include <linux/completion.h>
+#include <linux/module.h>
 #include <net/mac80211.h>
 
 #include "p54.h"
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
index a454d487b14f..7faed62c6378 100644
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@ -584,8 +584,6 @@ static void p54spi_op_stop(struct ieee80211_hw *dev)
         mutex_lock(&priv->mutex);
         WARN_ON(priv->fw_state != FW_STATE_READY);
 
-        cancel_work_sync(&priv->work);
-
         p54spi_power_off(priv);
         spin_lock_irqsave(&priv->tx_lock, flags);
         INIT_LIST_HEAD(&priv->tx_pending);
@@ -593,6 +591,8 @@ static void p54spi_op_stop(struct ieee80211_hw *dev)
 
         priv->fw_state = FW_STATE_OFF;
         mutex_unlock(&priv->mutex);
+
+        cancel_work_sync(&priv->work);
 }
 
 static int __devinit p54spi_probe(struct spi_device *spi)
@@ -652,6 +652,7 @@ static int __devinit p54spi_probe(struct spi_device *spi)
         init_completion(&priv->fw_comp);
         INIT_LIST_HEAD(&priv->tx_pending);
         mutex_init(&priv->mutex);
+        spin_lock_init(&priv->tx_lock);
         SET_IEEE80211_DEV(hw, &spi->dev);
         priv->common.open = p54spi_op_start;
         priv->common.stop = p54spi_op_stop;
@@ -699,7 +700,6 @@ static int __devexit p54spi_remove(struct spi_device *spi)
 static struct spi_driver p54spi_driver = {
         .driver = {
                 .name           = "p54spi",
-                .bus            = &spi_bus_type,
                 .owner          = THIS_MODULE,
         },
 
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index a8f3bc740dfa..9b6096866427 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -20,6 +20,7 @@
 #include <linux/etherdevice.h>
 #include <linux/delay.h>
 #include <linux/crc32.h>
+#include <linux/module.h>
 #include <net/mac80211.h>
 
 #include "p54.h"
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index f485784a60ae..42b97bc38477 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -16,6 +16,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
@@ -241,7 +242,7 @@ void p54_free_skb(struct ieee80211_hw *dev, struct sk_buff *skb)
 
         skb_unlink(skb, &priv->tx_queue);
         p54_tx_qos_accounting_free(priv, skb);
-        dev_kfree_skb_any(skb);
+        ieee80211_free_txskb(dev, skb);
 }
 EXPORT_SYMBOL_GPL(p54_free_skb);
 
@@ -787,7 +788,7 @@ void p54_tx_80211(struct ieee80211_hw *dev, struct sk_buff *skb)
                             &hdr_flags, &aid, &burst_allowed);
 
         if (p54_tx_qos_accounting_alloc(priv, skb, queue)) {
-                dev_kfree_skb_any(skb);
+                ieee80211_free_txskb(dev, skb);
                 return;
         }
 
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index d97a2caf582b..4e44b1af119a 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -778,7 +778,7 @@ prism54_get_essid(struct net_device *ndev, struct iw_request_info *info,
                 dwrq->flags = 0;
                 dwrq->length = 0;
         }
-        essid->octets[essid->length] = '\0';
+        essid->octets[dwrq->length] = '\0';
         memcpy(extra, essid->octets, dwrq->length);
         kfree(essid);
 
@@ -2493,323 +2493,7 @@ prism54_set_mac_address(struct net_device *ndev, void *addr)
         return ret;
 }
 
-/* Note: currently, use hostapd ioctl from the Host AP driver for WPA
- * support. This is to be replaced with Linux wireless extensions once they
- * get WPA support. */
-
-/* Note II: please leave all this together as it will be easier to remove later,
- * once wireless extensions add WPA support -mcgrof */
-
-/* PRISM54_HOSTAPD ioctl() cmd: */
-enum {
-        PRISM2_SET_ENCRYPTION = 6,
-        PRISM2_HOSTAPD_SET_GENERIC_ELEMENT = 12,
-        PRISM2_HOSTAPD_MLME = 13,
-        PRISM2_HOSTAPD_SCAN_REQ = 14,
-};
-
 #define PRISM54_SET_WPA                 SIOCIWFIRSTPRIV+12
-#define PRISM54_HOSTAPD                 SIOCIWFIRSTPRIV+25
-#define PRISM54_DROP_UNENCRYPTED        SIOCIWFIRSTPRIV+26
-
-#define PRISM2_HOSTAPD_MAX_BUF_SIZE 1024
-#define PRISM2_HOSTAPD_GENERIC_ELEMENT_HDR_LEN \
-        offsetof(struct prism2_hostapd_param, u.generic_elem.data)
-
-/* Maximum length for algorithm names (-1 for nul termination)
- * used in ioctl() */
-#define HOSTAP_CRYPT_ALG_NAME_LEN 16
-
-struct prism2_hostapd_param {
-        u32 cmd;
-        u8 sta_addr[ETH_ALEN];
-        union {
-               struct {
-                       u8 alg[HOSTAP_CRYPT_ALG_NAME_LEN];
-                       u32 flags;
-                       u32 err;
-                       u8 idx;
-                       u8 seq[8]; /* sequence counter (set: RX, get: TX) */
-                       u16 key_len;
-                       u8 key[0];
-                       } crypt;
-               struct {
-                       u8 len;
-                       u8 data[0];
-               } generic_elem;
-               struct {
-#define MLME_STA_DEAUTH 0
-#define MLME_STA_DISASSOC 1
-                       u16 cmd;
-                       u16 reason_code;
-               } mlme;
-               struct {
-                       u8 ssid_len;
-                       u8 ssid[32];
-               } scan_req;
-       } u;
-};
-
-
-static int
-prism2_ioctl_set_encryption(struct net_device *dev,
-        struct prism2_hostapd_param *param,
-        int param_len)
-{
-        islpci_private *priv = netdev_priv(dev);
-        int rvalue = 0, force = 0;
-        int authen = DOT11_AUTH_OS, invoke = 0, exunencrypt = 0;
-        union oid_res_t r;
-
-        /* with the new API, it's impossible to get a NULL pointer.
-         * New version of iwconfig set the IW_ENCODE_NOKEY flag
-         * when no key is given, but older versions don't. */
-
-        if (param->u.crypt.key_len > 0) {
-                /* we have a key to set */
-                int index = param->u.crypt.idx;
-                int current_index;
-                struct obj_key key = { DOT11_PRIV_TKIP, 0, "" };
-
-                /* get the current key index */
-                rvalue = mgt_get_request(priv, DOT11_OID_DEFKEYID, 0, NULL, &r);
-                current_index = r.u;
-                /* Verify that the key is not marked as invalid */
-                if (!(param->u.crypt.flags & IW_ENCODE_NOKEY)) {
-                        key.length = param->u.crypt.key_len > sizeof (param->u.crypt.key) ?
-                            sizeof (param->u.crypt.key) : param->u.crypt.key_len;
-                        memcpy(key.key, param->u.crypt.key, key.length);
-                        if (key.length == 32)
-                                /* we want WPA-PSK */
-                                key.type = DOT11_PRIV_TKIP;
-                        if ((index < 0) || (index > 3))
-                                /* no index provided use the current one */
-                                index = current_index;
-
-                        /* now send the key to the card  */
-                        rvalue |=
-                            mgt_set_request(priv, DOT11_OID_DEFKEYX, index,
-                                            &key);
-                }
-                /*
-                 * If a valid key is set, encryption should be enabled
-                 * (user may turn it off later).
-                 * This is also how "iwconfig ethX key on" works
-                 */
-                if ((index == current_index) && (key.length > 0))
-                        force = 1;
-        } else {
-                int index = (param->u.crypt.flags & IW_ENCODE_INDEX) - 1;
-                if ((index >= 0) && (index <= 3)) {
-                        /* we want to set the key index */
-                        rvalue |=
-                            mgt_set_request(priv, DOT11_OID_DEFKEYID, 0,
-                                            &index);
-                } else {
-                        if (!(param->u.crypt.flags & IW_ENCODE_MODE)) {
-                                /* we cannot do anything. Complain. */
-                                return -EINVAL;
-                        }
-                }
-        }
-        /* now read the flags */
-        if (param->u.crypt.flags & IW_ENCODE_DISABLED) {
-                /* Encoding disabled,
-                 * authen = DOT11_AUTH_OS;
-                 * invoke = 0;
-                 * exunencrypt = 0; */
-        }
-        if (param->u.crypt.flags & IW_ENCODE_OPEN)
-                /* Encode but accept non-encoded packets. No auth */
-                invoke = 1;
-        if ((param->u.crypt.flags & IW_ENCODE_RESTRICTED) || force) {
-                /* Refuse non-encoded packets. Auth */
-                authen = DOT11_AUTH_BOTH;
-                invoke = 1;
-                exunencrypt = 1;
-        }
-        /* do the change if requested  */
-        if ((param->u.crypt.flags & IW_ENCODE_MODE) || force) {
-                rvalue |=
-                    mgt_set_request(priv, DOT11_OID_AUTHENABLE, 0, &authen);
-                rvalue |=
-                    mgt_set_request(priv, DOT11_OID_PRIVACYINVOKED, 0, &invoke);
-                rvalue |=
-                    mgt_set_request(priv, DOT11_OID_EXUNENCRYPTED, 0,
-                                    &exunencrypt);
-        }
-        return rvalue;
-}
-
-static int
-prism2_ioctl_set_generic_element(struct net_device *ndev,
-        struct prism2_hostapd_param *param,
-        int param_len)
-{
-       islpci_private *priv = netdev_priv(ndev);
-       int max_len, len, alen, ret=0;
-       struct obj_attachment *attach;
-
-       len = param->u.generic_elem.len;
-       max_len = param_len - PRISM2_HOSTAPD_GENERIC_ELEMENT_HDR_LEN;
-       if (max_len < 0 || max_len < len)
-               return -EINVAL;
-
-       alen = sizeof(*attach) + len;
-       attach = kzalloc(alen, GFP_KERNEL);
-       if (attach == NULL)
-               return -ENOMEM;
-
-#define WLAN_FC_TYPE_MGMT 0
-#define WLAN_FC_STYPE_ASSOC_REQ 0
-#define WLAN_FC_STYPE_REASSOC_REQ 2
-
-       /* Note: endianness is covered by mgt_set_varlen */
-
-       attach->type = (WLAN_FC_TYPE_MGMT << 2) |
-               (WLAN_FC_STYPE_ASSOC_REQ << 4);
-       attach->id = -1;
-       attach->size = len;
-       memcpy(attach->data, param->u.generic_elem.data, len);
-
-       ret = mgt_set_varlen(priv, DOT11_OID_ATTACHMENT, attach, len);
-
-       if (ret == 0) {
-               attach->type = (WLAN_FC_TYPE_MGMT << 2) |
-                       (WLAN_FC_STYPE_REASSOC_REQ << 4);
-
-               ret = mgt_set_varlen(priv, DOT11_OID_ATTACHMENT, attach, len);
-
-               if (ret == 0)
-                       printk(KERN_DEBUG "%s: WPA IE Attachment was set\n",
-                                       ndev->name);
-       }
-
-       kfree(attach);
-       return ret;
-
-}
-
-static int
-prism2_ioctl_mlme(struct net_device *dev, struct prism2_hostapd_param *param)
-{
-        return -EOPNOTSUPP;
-}
-
-static int
-prism2_ioctl_scan_req(struct net_device *ndev,
-                     struct prism2_hostapd_param *param)
-{
-        islpci_private *priv = netdev_priv(ndev);
-        struct iw_request_info info;
-        int i, rvalue;
-        struct obj_bsslist *bsslist;
-        u32 noise = 0;
-        char *extra = "";
-        char *current_ev = "foo";
-        union oid_res_t r;
-
-        if (islpci_get_state(priv) < PRV_STATE_INIT) {
-                /* device is not ready, fail gently */
-                return 0;
-        }
-
-        /* first get the noise value. We will use it to report the link quality */
-        rvalue = mgt_get_request(priv, DOT11_OID_NOISEFLOOR, 0, NULL, &r);
-        noise = r.u;
-
-        /* Ask the device for a list of known bss. We can report at most
-         * IW_MAX_AP=64 to the range struct. But the device won't repport anything
-         * if you change the value of IWMAX_BSS=24.
-         */
-        rvalue |= mgt_get_request(priv, DOT11_OID_BSSLIST, 0, NULL, &r);
-        bsslist = r.ptr;
-
-        info.cmd = PRISM54_HOSTAPD;
-        info.flags = 0;
-
-        /* ok now, scan the list and translate its info */
-        for (i = 0; i < min(IW_MAX_AP, (int) bsslist->nr); i++)
-                current_ev = prism54_translate_bss(ndev, &info, current_ev,
-                                                   extra + IW_SCAN_MAX_DATA,
-                                                   &(bsslist->bsslist[i]),
-                                                   noise);
-        kfree(bsslist);
-
-        return rvalue;
-}
-
-static int
-prism54_hostapd(struct net_device *ndev, struct iw_point *p)
-{
-       struct prism2_hostapd_param *param;
-       int ret = 0;
-       u32 uwrq;
-
-       printk(KERN_DEBUG "prism54_hostapd - len=%d\n", p->length);
-       if (p->length < sizeof(struct prism2_hostapd_param) ||
-           p->length > PRISM2_HOSTAPD_MAX_BUF_SIZE || !p->pointer)
-               return -EINVAL;
-
-        param = memdup_user(p->pointer, p->length);
-        if (IS_ERR(param))
-                return PTR_ERR(param);
-
-       switch (param->cmd) {
-       case PRISM2_SET_ENCRYPTION:
-               printk(KERN_DEBUG "%s: Caught WPA supplicant set encryption request\n",
-                               ndev->name);
-               ret = prism2_ioctl_set_encryption(ndev, param, p->length);
-               break;
-       case PRISM2_HOSTAPD_SET_GENERIC_ELEMENT:
-               printk(KERN_DEBUG "%s: Caught WPA supplicant set WPA IE request\n",
-                               ndev->name);
-               ret = prism2_ioctl_set_generic_element(ndev, param,
-                                                      p->length);
-               break;
-       case PRISM2_HOSTAPD_MLME:
-               printk(KERN_DEBUG "%s: Caught WPA supplicant MLME request\n",
-                               ndev->name);
-               ret = prism2_ioctl_mlme(ndev, param);
-               break;
-       case PRISM2_HOSTAPD_SCAN_REQ:
-               printk(KERN_DEBUG "%s: Caught WPA supplicant scan request\n",
-                               ndev->name);
-               ret = prism2_ioctl_scan_req(ndev, param);
-               break;
-        case PRISM54_SET_WPA:
-               printk(KERN_DEBUG "%s: Caught WPA supplicant wpa init request\n",
-                               ndev->name);
-               uwrq = 1;
-               ret = prism54_set_wpa(ndev, NULL, &uwrq, NULL);
-               break;
-        case PRISM54_DROP_UNENCRYPTED:
-               printk(KERN_DEBUG "%s: Caught WPA drop unencrypted request\n",
-                               ndev->name);
-#if 0
-               uwrq = 0x01;
-               mgt_set(priv, DOT11_OID_EXUNENCRYPTED, &uwrq);
-               down_write(&priv->mib_sem);
-               mgt_commit(priv);
-               up_write(&priv->mib_sem);
-#endif
-               /* Not necessary, as set_wpa does it, should we just do it here though? */
-               ret = 0;
-               break;
-       default:
-               printk(KERN_DEBUG "%s: Caught a WPA supplicant request that is not supported\n",
-                               ndev->name);
-               ret = -EOPNOTSUPP;
-               break;
-       }
-
-       if (ret == 0 && copy_to_user(p->pointer, param, p->length))
-               ret = -EFAULT;
-
-       kfree(param);
-
-       return ret;
-}
 
 static int
 prism54_set_wpa(struct net_device *ndev, struct iw_request_info *info,
@@ -3223,20 +2907,3 @@ const struct iw_handler_def prism54_handler_def = {
         .private_args = (struct iw_priv_args *) prism54_private_args,
         .get_wireless_stats = prism54_get_wireless_stats,
 };
-
-/* For wpa_supplicant */
-
-int
-prism54_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
-{
-        struct iwreq *wrq = (struct iwreq *) rq;
-        int ret = -1;
-        switch (cmd) {
-                case PRISM54_HOSTAPD:
-                if (!capable(CAP_NET_ADMIN))
-                        return -EPERM;
-                ret = prism54_hostapd(ndev, &wrq->u.data);
-                return ret;
-        }
-        return -EOPNOTSUPP;
-}
diff --git a/drivers/net/wireless/prism54/isl_ioctl.h b/drivers/net/wireless/prism54/isl_ioctl.h
index bcfbfb9281d2..a34bceb6e3cd 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.h
+++ b/drivers/net/wireless/prism54/isl_ioctl.h
@@ -43,8 +43,6 @@ void prism54_wpa_bss_ie_clean(islpci_private *priv);
 
 int prism54_set_mac_address(struct net_device *, void *);
 
-int prism54_ioctl(struct net_device *, struct ifreq *, int);
-
 extern const struct iw_handler_def prism54_handler_def;
 
 #endif                          /* _ISL_IOCTL_H */
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index 8a3cf4fe376f..5970ff6f40cc 100644
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -804,7 +804,6 @@ static const struct ethtool_ops islpci_ethtool_ops = {
 static const struct net_device_ops islpci_netdev_ops = {
         .ndo_open               = islpci_open,
         .ndo_stop               = islpci_close,
-        .ndo_do_ioctl           = prism54_ioctl,
         .ndo_start_xmit         = islpci_eth_transmit,
         .ndo_tx_timeout         = islpci_eth_tx_timeout,
         .ndo_set_mac_address    = prism54_set_mac_address,
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 620e3c0e88e0..3802c31fefcd 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -244,6 +244,10 @@ enum ndis_80211_power_mode {
         NDIS_80211_POWER_MODE_FAST_PSP,
 };
 
+enum ndis_80211_pmkid_cand_list_flag_bits {
+        NDIS_80211_PMKID_CAND_PREAUTH = cpu_to_le32(1 << 0)
+};
+
 struct ndis_80211_auth_request {
         __le32 length;
         u8 bssid[6];
@@ -387,19 +391,17 @@ struct ndis_80211_capability {
 struct ndis_80211_bssid_info {
         u8 bssid[6];
         u8 pmkid[16];
-};
+} __packed;
 
 struct ndis_80211_pmkid {
         __le32 length;
         __le32 bssid_info_count;
         struct ndis_80211_bssid_info bssid_info[0];
-};
+} __packed;
 
 /*
  *  private data
  */
-#define NET_TYPE_11FB   0
-
 #define CAP_MODE_80211A         1
 #define CAP_MODE_80211B         2
 #define CAP_MODE_80211G         4
@@ -1347,6 +1349,32 @@ static int set_channel(struct usbnet *usbdev, int channel)
         return ret;
 }
 
+static struct ieee80211_channel *get_current_channel(struct usbnet *usbdev,
+                                                     u16 *beacon_interval)
+{
+        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+        struct ieee80211_channel *channel;
+        struct ndis_80211_conf config;
+        int len, ret;
+
+        /* Get channel and beacon interval */
+        len = sizeof(config);
+        ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &config, &len);
+        netdev_dbg(usbdev->net, "%s(): OID_802_11_CONFIGURATION -> %d\n",
+                                __func__, ret);
+        if (ret < 0)
+                return NULL;
+
+        channel = ieee80211_get_channel(priv->wdev.wiphy,
+                                KHZ_TO_MHZ(le32_to_cpu(config.ds_config)));
+        if (!channel)
+                return NULL;
+
+        if (beacon_interval)
+                *beacon_interval = le16_to_cpu(config.beacon_period);
+        return channel;
+}
+
 /* index must be 0 - N, as per NDIS  */
 static int add_wep_key(struct usbnet *usbdev, const u8 *key, int key_len,
                                                                 int index)
@@ -2650,13 +2678,12 @@ static void rndis_wlan_craft_connected_bss(struct usbnet *usbdev, u8 *bssid,
 {
         struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
         struct ieee80211_channel *channel;
-        struct ndis_80211_conf config;
         struct ndis_80211_ssid ssid;
         struct cfg80211_bss *bss;
         s32 signal;
         u64 timestamp;
         u16 capability;
-        u16 beacon_interval;
+        u16 beacon_interval = 0;
         __le32 rssi;
         u8 ie_buf[34];
         int len, ret, ie_len;
@@ -2681,22 +2708,10 @@ static void rndis_wlan_craft_connected_bss(struct usbnet *usbdev, u8 *bssid,
         }
 
         /* Get channel and beacon interval */
-        len = sizeof(config);
-        ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &config, &len);
-        netdev_dbg(usbdev->net, "%s(): OID_802_11_CONFIGURATION -> %d\n",
-                                __func__, ret);
-        if (ret >= 0) {
-                beacon_interval = le16_to_cpu(config.beacon_period);
-                channel = ieee80211_get_channel(priv->wdev.wiphy,
-                                KHZ_TO_MHZ(le32_to_cpu(config.ds_config)));
-                if (!channel) {
-                        netdev_warn(usbdev->net, "%s(): could not get channel."
-                                                 "\n", __func__);
-                        return;
-                }
-        } else {
-                netdev_warn(usbdev->net, "%s(): could not get configuration.\n",
-                                         __func__);
+        channel = get_current_channel(usbdev, &beacon_interval);
+        if (!channel) {
+                netdev_warn(usbdev->net, "%s(): could not get channel.\n",
+                                        __func__);
                 return;
         }
 
@@ -2841,8 +2856,9 @@ static void rndis_wlan_do_link_up_work(struct usbnet *usbdev)
                                                 req_ie_len, resp_ie,
                                                 resp_ie_len, 0, GFP_KERNEL);
                 else
-                        cfg80211_roamed(usbdev->net, NULL, bssid,
-                                        req_ie, req_ie_len,
+                        cfg80211_roamed(usbdev->net,
+                                        get_current_channel(usbdev, NULL),
+                                        bssid, req_ie, req_ie_len,
                                         resp_ie, resp_ie_len, GFP_KERNEL);
         } else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC)
                 cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL);
@@ -3008,25 +3024,13 @@ static void rndis_wlan_pmkid_cand_list_indication(struct usbnet *usbdev,
         for (i = 0; i < le32_to_cpu(cand_list->num_candidates); i++) {
                 struct ndis_80211_pmkid_candidate *cand =
                                                 &cand_list->candidate_list[i];
+                bool preauth = !!(cand->flags & NDIS_80211_PMKID_CAND_PREAUTH);
 
-                netdev_dbg(usbdev->net, "cand[%i]: flags: 0x%08x, bssid: %pM\n",
-                           i, le32_to_cpu(cand->flags), cand->bssid);
-
-#if 0
-                struct iw_pmkid_cand pcand;
-                union iwreq_data wrqu;
+                netdev_dbg(usbdev->net, "cand[%i]: flags: 0x%08x, preauth: %d, bssid: %pM\n",
+                           i, le32_to_cpu(cand->flags), preauth, cand->bssid);
 
-                memset(&pcand, 0, sizeof(pcand));
-                if (le32_to_cpu(cand->flags) & 0x01)
-                        pcand.flags |= IW_PMKID_CAND_PREAUTH;
-                pcand.index = i;
-                memcpy(pcand.bssid.sa_data, cand->bssid, ETH_ALEN);
-
-                memset(&wrqu, 0, sizeof(wrqu));
-                wrqu.data.length = sizeof(pcand);
-                wireless_send_event(usbdev->net, IWEVPMKIDCAND, &wrqu,
-                                                                (u8 *)&pcand);
-#endif
+                cfg80211_pmksa_candidate_notify(usbdev->net, i, cand->bssid,
+                                                preauth, GFP_ATOMIC);
         }
 }
 
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 3f183a15186e..e5df380d4fbe 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1203,8 +1203,10 @@ void rt2800_config_filter(struct rt2x00_dev *rt2x00dev,
                            !(filter_flags & FIF_CONTROL));
         rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_PSPOLL,
                            !(filter_flags & FIF_PSPOLL));
-        rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_BA, 1);
-        rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_BAR, 0);
+        rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_BA,
+                           !(filter_flags & FIF_CONTROL));
+        rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_BAR,
+                           !(filter_flags & FIF_CONTROL));
         rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_CNTL,
                            !(filter_flags & FIF_CONTROL));
         rt2800_register_write(rt2x00dev, RX_FILTER_CFG, reg);
@@ -3771,7 +3773,7 @@ static void rt2800_efuse_read(struct rt2x00_dev *rt2x00dev, unsigned int i)
         /* Apparently the data is read from end to start */
         rt2800_register_read_lock(rt2x00dev, EFUSE_DATA3, &reg);
         /* The returned value is in CPU order, but eeprom is le */
-        rt2x00dev->eeprom[i] = cpu_to_le32(reg);
+        *(u32 *)&rt2x00dev->eeprom[i] = cpu_to_le32(reg);
         rt2800_register_read_lock(rt2x00dev, EFUSE_DATA2, &reg);
         *(u32 *)&rt2x00dev->eeprom[i + 2] = cpu_to_le32(reg);
         rt2800_register_read_lock(rt2x00dev, EFUSE_DATA1, &reg);
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index f1565792f270..377876315b8d 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -919,6 +919,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x050d, 0x935b) },
         /* Buffalo */
         { USB_DEVICE(0x0411, 0x00e8) },
+        { USB_DEVICE(0x0411, 0x0158) },
         { USB_DEVICE(0x0411, 0x016f) },
         { USB_DEVICE(0x0411, 0x01a2) },
         /* Corega */
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 2ec5c00235e6..99ff12d0c29d 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -943,6 +943,7 @@ struct rt2x00_dev {
          * Powersaving work
          */
         struct delayed_work autowakeup_work;
+        struct work_struct sleep_work;
 
         /*
          * Data queue arrays for RX, TX, Beacon and ATIM.
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index e1fb2a8569be..c3e1aa7c1a80 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -465,6 +465,23 @@ static u8 *rt2x00lib_find_ie(u8 *data, unsigned int len, u8 ie)
         return NULL;
 }
 
+static void rt2x00lib_sleep(struct work_struct *work)
+{
+        struct rt2x00_dev *rt2x00dev =
+            container_of(work, struct rt2x00_dev, sleep_work);
+
+        if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
+                return;
+
+        /*
+         * Check again is powersaving is enabled, to prevent races from delayed
+         * work execution.
+         */
+        if (!test_bit(CONFIG_POWERSAVING, &rt2x00dev->flags))
+                rt2x00lib_config(rt2x00dev, &rt2x00dev->hw->conf,
+                                 IEEE80211_CONF_CHANGE_PS);
+}
+
 static void rt2x00lib_rxdone_check_ps(struct rt2x00_dev *rt2x00dev,
                                       struct sk_buff *skb,
                                       struct rxdone_entry_desc *rxdesc)
@@ -512,8 +529,7 @@ static void rt2x00lib_rxdone_check_ps(struct rt2x00_dev *rt2x00dev,
         cam |= (tim_ie->bitmap_ctrl & 0x01);
 
         if (!cam && !test_bit(CONFIG_POWERSAVING, &rt2x00dev->flags))
-                rt2x00lib_config(rt2x00dev, &rt2x00dev->hw->conf,
-                                 IEEE80211_CONF_CHANGE_PS);
+                queue_work(rt2x00dev->workqueue, &rt2x00dev->sleep_work);
 }
 
 static int rt2x00lib_rxdone_read_signal(struct rt2x00_dev *rt2x00dev,
@@ -815,11 +831,11 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
         if (spec->supported_rates & SUPPORT_RATE_OFDM)
                 num_rates += 8;
 
-        channels = kzalloc(sizeof(*channels) * spec->num_channels, GFP_KERNEL);
+        channels = kcalloc(spec->num_channels, sizeof(*channels), GFP_KERNEL);
         if (!channels)
                 return -ENOMEM;
 
-        rates = kzalloc(sizeof(*rates) * num_rates, GFP_KERNEL);
+        rates = kcalloc(num_rates, sizeof(*rates), GFP_KERNEL);
         if (!rates)
                 goto exit_free_channels;
 
@@ -1141,6 +1157,7 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
 
         INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled);
         INIT_DELAYED_WORK(&rt2x00dev->autowakeup_work, rt2x00lib_autowakeup);
+        INIT_WORK(&rt2x00dev->sleep_work, rt2x00lib_sleep);
 
         /*
          * Let the driver probe the device to detect the capabilities.
@@ -1197,6 +1214,7 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
          */
         cancel_work_sync(&rt2x00dev->intf_work);
         cancel_delayed_work_sync(&rt2x00dev->autowakeup_work);
+        cancel_work_sync(&rt2x00dev->sleep_work);
         if (rt2x00_is_usb(rt2x00dev)) {
                 del_timer_sync(&rt2x00dev->txstatus_timer);
                 cancel_work_sync(&rt2x00dev->rxdone_work);
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index bf0acff07807..ede3c58e6783 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -160,7 +160,7 @@ void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
  exit_fail:
         rt2x00queue_pause_queue(queue);
  exit_free_skb:
-        dev_kfree_skb_any(skb);
+        ieee80211_free_txskb(hw, skb);
 }
 EXPORT_SYMBOL_GPL(rt2x00mac_tx);
 
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c
index 0082015ff664..2f14a5fb0cbb 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
 #include <linux/eeprom_93cx6.h>
+#include <linux/module.h>
 #include <net/mac80211.h>
 
 #include "rtl8180.h"
diff --git a/drivers/net/wireless/rtl818x/rtl8187/dev.c b/drivers/net/wireless/rtl818x/rtl8187/dev.c
index 24873b55b55c..4a78f9e39dfa 100644
--- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
 #include <linux/eeprom_93cx6.h>
+#include <linux/module.h>
 #include <net/mac80211.h>
 
 #include "rtl8187.h"
diff --git a/drivers/net/wireless/rtlwifi/Kconfig b/drivers/net/wireless/rtlwifi/Kconfig
index 45e14760c16e..d6c42e69bdbd 100644
--- a/drivers/net/wireless/rtlwifi/Kconfig
+++ b/drivers/net/wireless/rtlwifi/Kconfig
@@ -12,7 +12,7 @@ config RTL8192CE
 
 config RTL8192SE
         tristate "Realtek RTL8192SE/RTL8191SE PCIe Wireless Network Adapter"
-        depends on MAC80211 && EXPERIMENTAL
+        depends on MAC80211 && EXPERIMENTAL && PCI
         select FW_LOADER
         select RTLWIFI
         ---help---
@@ -23,7 +23,7 @@ config RTL8192SE
 
 config RTL8192DE
         tristate "Realtek RTL8192DE/RTL8188DE PCIe Wireless Network Adapter"
-        depends on MAC80211 && EXPERIMENTAL
+        depends on MAC80211 && EXPERIMENTAL && PCI
         select FW_LOADER
         select RTLWIFI
         ---help---
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index d4fdd2a5a739..d81a6021a30f 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -30,6 +30,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/ip.h>
+#include <linux/module.h>
 #include "wifi.h"
 #include "rc.h"
 #include "base.h"
@@ -344,9 +345,9 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
         if (is_valid_ether_addr(rtlefuse->dev_addr)) {
                 SET_IEEE80211_PERM_ADDR(hw, rtlefuse->dev_addr);
         } else {
-                u8 rtlmac[] = { 0x00, 0xe0, 0x4c, 0x81, 0x92, 0x00 };
-                get_random_bytes((rtlmac + (ETH_ALEN - 1)), 1);
-                SET_IEEE80211_PERM_ADDR(hw, rtlmac);
+                u8 rtlmac1[] = { 0x00, 0xe0, 0x4c, 0x81, 0x92, 0x00 };
+                get_random_bytes((rtlmac1 + (ETH_ALEN - 1)), 1);
+                SET_IEEE80211_PERM_ADDR(hw, rtlmac1);
         }
 
 }
@@ -447,12 +448,11 @@ int rtl_init_core(struct ieee80211_hw *hw)
 
         /* <4> locks */
         mutex_init(&rtlpriv->locks.conf_mutex);
-        spin_lock_init(&rtlpriv->locks.ips_lock);
+        mutex_init(&rtlpriv->locks.ps_mutex);
         spin_lock_init(&rtlpriv->locks.irq_th_lock);
         spin_lock_init(&rtlpriv->locks.h2c_lock);
         spin_lock_init(&rtlpriv->locks.rf_ps_lock);
         spin_lock_init(&rtlpriv->locks.rf_lock);
-        spin_lock_init(&rtlpriv->locks.lps_lock);
         spin_lock_init(&rtlpriv->locks.waitq_lock);
         spin_lock_init(&rtlpriv->locks.cck_and_rw_pagea_lock);
 
diff --git a/drivers/net/wireless/rtlwifi/base.h b/drivers/net/wireless/rtlwifi/base.h
index 4ae905983d0d..f66b5757f6b9 100644
--- a/drivers/net/wireless/rtlwifi/base.h
+++ b/drivers/net/wireless/rtlwifi/base.h
@@ -76,7 +76,7 @@ enum ap_peer {
         SET_BITS_TO_LE_2BYTE(_hdr, 8, 1, _val)
 
 #define SET_80211_PS_POLL_AID(_hdr, _val)               \
-        (*(u16 *)((u8 *)(_hdr) + 2) = le16_to_cpu(_val))
+        (*(u16 *)((u8 *)(_hdr) + 2) = _val)
 #define SET_80211_PS_POLL_BSSID(_hdr, _val)             \
         memcpy(((u8 *)(_hdr)) + 4, (u8 *)(_val), ETH_ALEN)
 #define SET_80211_PS_POLL_TA(_hdr, _val)                \
diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c
index 7babb6acd957..dc36d7461caa 100644
--- a/drivers/net/wireless/rtlwifi/cam.c
+++ b/drivers/net/wireless/rtlwifi/cam.c
@@ -29,6 +29,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/export.h>
 #include "wifi.h"
 #include "cam.h"
 
diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c
index 3fc21f60bb04..ed1058b71587 100644
--- a/drivers/net/wireless/rtlwifi/efuse.c
+++ b/drivers/net/wireless/rtlwifi/efuse.c
@@ -27,6 +27,7 @@
  *
  *****************************************************************************/
 
+#include <linux/export.h>
 #include "wifi.h"
 #include "efuse.h"
 
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 177a8e669241..0d4d242849b4 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -27,6 +27,7 @@
  *
  *****************************************************************************/
 
+#include <linux/export.h>
 #include "core.h"
 #include "wifi.h"
 #include "pci.h"
@@ -609,7 +610,7 @@ tx_status_ok:
         if (((rtlpriv->link_info.num_rx_inperiod +
                 rtlpriv->link_info.num_tx_inperiod) > 8) ||
                 (rtlpriv->link_info.num_rx_inperiod > 2)) {
-                tasklet_schedule(&rtlpriv->works.ips_leave_tasklet);
+                schedule_work(&rtlpriv->works.lps_leave_work);
         }
 }
 
@@ -735,7 +736,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
                 if (((rtlpriv->link_info.num_rx_inperiod +
                         rtlpriv->link_info.num_tx_inperiod) > 8) ||
                         (rtlpriv->link_info.num_rx_inperiod > 2)) {
-                        tasklet_schedule(&rtlpriv->works.ips_leave_tasklet);
+                        schedule_work(&rtlpriv->works.lps_leave_work);
                 }
 
                 dev_kfree_skb_any(skb);
@@ -779,6 +780,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
         unsigned long flags;
         u32 inta = 0;
         u32 intb = 0;
+        irqreturn_t ret = IRQ_HANDLED;
 
         spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
 
@@ -786,8 +788,10 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
         rtlpriv->cfg->ops->interrupt_recognized(hw, &inta, &intb);
 
         /*Shared IRQ or HW disappared */
-        if (!inta || inta == 0xffff)
+        if (!inta || inta == 0xffff) {
+                ret = IRQ_NONE;
                 goto done;
+        }
 
         /*<1> beacon related */
         if (inta & rtlpriv->cfg->maps[RTL_IMR_TBDOK]) {
@@ -889,12 +893,9 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
         if (rtlpriv->rtlhal.earlymode_enable)
                 tasklet_schedule(&rtlpriv->works.irq_tasklet);
 
-        spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
-        return IRQ_HANDLED;
-
 done:
         spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
-        return IRQ_HANDLED;
+        return ret;
 }
 
 static void _rtl_pci_irq_tasklet(struct ieee80211_hw *hw)
@@ -902,11 +903,6 @@ static void _rtl_pci_irq_tasklet(struct ieee80211_hw *hw)
         _rtl_pci_tx_chk_waitq(hw);
 }
 
-static void _rtl_pci_ips_leave_tasklet(struct ieee80211_hw *hw)
-{
-        rtl_lps_leave(hw);
-}
-
 static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -944,6 +940,15 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)
         return;
 }
 
+static void rtl_lps_leave_work_callback(struct work_struct *work)
+{
+        struct rtl_works *rtlworks =
+            container_of(work, struct rtl_works, lps_leave_work);
+        struct ieee80211_hw *hw = rtlworks->hw;
+
+        rtl_lps_leave(hw);
+}
+
 static void _rtl_pci_init_trx_var(struct ieee80211_hw *hw)
 {
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
@@ -1005,9 +1010,7 @@ static void _rtl_pci_init_struct(struct ieee80211_hw *hw,
         tasklet_init(&rtlpriv->works.irq_prepare_bcn_tasklet,
                      (void (*)(unsigned long))_rtl_pci_prepare_bcn_tasklet,
                      (unsigned long)hw);
-        tasklet_init(&rtlpriv->works.ips_leave_tasklet,
-                     (void (*)(unsigned long))_rtl_pci_ips_leave_tasklet,
-                     (unsigned long)hw);
+        INIT_WORK(&rtlpriv->works.lps_leave_work, rtl_lps_leave_work_callback);
 }
 
 static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw,
@@ -1477,7 +1480,7 @@ static void rtl_pci_deinit(struct ieee80211_hw *hw)
 
         synchronize_irq(rtlpci->pdev->irq);
         tasklet_kill(&rtlpriv->works.irq_tasklet);
-        tasklet_kill(&rtlpriv->works.ips_leave_tasklet);
+        cancel_work_sync(&rtlpriv->works.lps_leave_work);
 
         flush_workqueue(rtlpriv->works.rtl_wq);
         destroy_workqueue(rtlpriv->works.rtl_wq);
@@ -1552,7 +1555,7 @@ static void rtl_pci_stop(struct ieee80211_hw *hw)
         set_hal_stop(rtlhal);
 
         rtlpriv->cfg->ops->disable_interrupt(hw);
-        tasklet_kill(&rtlpriv->works.ips_leave_tasklet);
+        cancel_work_sync(&rtlpriv->works.lps_leave_work);
 
         spin_lock_irqsave(&rtlpriv->locks.rf_ps_lock, flags);
         while (ppsc->rfchange_inprogress) {
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
index a693feffbe72..a14a68b24635 100644
--- a/drivers/net/wireless/rtlwifi/ps.c
+++ b/drivers/net/wireless/rtlwifi/ps.c
@@ -27,6 +27,7 @@
  *
  *****************************************************************************/
 
+#include <linux/export.h>
 #include "wifi.h"
 #include "base.h"
 #include "ps.h"
@@ -240,7 +241,7 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw)
         if (mac->opmode != NL80211_IFTYPE_STATION)
                 return;
 
-        spin_lock(&rtlpriv->locks.ips_lock);
+        mutex_lock(&rtlpriv->locks.ps_mutex);
 
         if (ppsc->inactiveps) {
                 rtstate = ppsc->rfpwr_state;
@@ -256,7 +257,7 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw)
                 }
         }
 
-        spin_unlock(&rtlpriv->locks.ips_lock);
+        mutex_unlock(&rtlpriv->locks.ps_mutex);
 }
 
 /*for FW LPS*/
@@ -394,7 +395,7 @@ void rtl_lps_enter(struct ieee80211_hw *hw)
         if (mac->link_state != MAC80211_LINKED)
                 return;
 
-        spin_lock(&rtlpriv->locks.lps_lock);
+        mutex_lock(&rtlpriv->locks.ps_mutex);
 
         /* Idle for a while if we connect to AP a while ago. */
         if (mac->cnt_after_linked >= 2) {
@@ -406,7 +407,7 @@ void rtl_lps_enter(struct ieee80211_hw *hw)
                 }
         }
 
-        spin_unlock(&rtlpriv->locks.lps_lock);
+        mutex_unlock(&rtlpriv->locks.ps_mutex);
 }
 
 /*Leave the leisure power save mode.*/
@@ -416,7 +417,7 @@ void rtl_lps_leave(struct ieee80211_hw *hw)
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
-        spin_lock(&rtlpriv->locks.lps_lock);
+        mutex_lock(&rtlpriv->locks.ps_mutex);
 
         if (ppsc->fwctrl_lps) {
                 if (ppsc->dot11_psmode != EACTIVE) {
@@ -437,7 +438,7 @@ void rtl_lps_leave(struct ieee80211_hw *hw)
                         rtl_lps_set_psmode(hw, EACTIVE);
                 }
         }
-        spin_unlock(&rtlpriv->locks.lps_lock);
+        mutex_unlock(&rtlpriv->locks.ps_mutex);
 }
 
 /* For sw LPS*/
@@ -538,9 +539,9 @@ void rtl_swlps_rf_awake(struct ieee80211_hw *hw)
                 RT_CLEAR_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM);
         }
 
-        spin_lock(&rtlpriv->locks.lps_lock);
+        mutex_lock(&rtlpriv->locks.ps_mutex);
         rtl_ps_set_rf_state(hw, ERFON, RF_CHANGE_BY_PS);
-        spin_unlock(&rtlpriv->locks.lps_lock);
+        mutex_unlock(&rtlpriv->locks.ps_mutex);
 }
 
 void rtl_swlps_rfon_wq_callback(void *data)
@@ -573,9 +574,9 @@ void rtl_swlps_rf_sleep(struct ieee80211_hw *hw)
         if (rtlpriv->link_info.busytraffic)
                 return;
 
-        spin_lock(&rtlpriv->locks.lps_lock);
+        mutex_lock(&rtlpriv->locks.ps_mutex);
         rtl_ps_set_rf_state(hw, ERFSLEEP, RF_CHANGE_BY_PS);
-        spin_unlock(&rtlpriv->locks.lps_lock);
+        mutex_unlock(&rtlpriv->locks.ps_mutex);
 
         if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_ASPM &&
                 !RT_IN_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM)) {
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index a00774e7090d..72a98cab6f69 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -27,6 +27,7 @@
  *
  *****************************************************************************/
 
+#include <linux/export.h>
 #include "dm_common.h"
 #include "phy_common.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
index 49a064bdbce6..931d97979b04 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
@@ -30,6 +30,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/firmware.h>
+#include <linux/export.h>
 #include "../wifi.h"
 #include "../pci.h"
 #include "../base.h"
@@ -72,6 +73,34 @@ static void _rtl92c_enable_fw_download(struct ieee80211_hw *hw, bool enable)
         }
 }
 
+static void rtl_block_fw_writeN(struct ieee80211_hw *hw, const u8 *buffer,
+                                u32 size)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 blockSize = REALTEK_USB_VENQT_MAX_BUF_SIZE - 20;
+        u8 *bufferPtr = (u8 *) buffer;
+        u32 i, offset, blockCount, remainSize;
+
+        blockCount = size / blockSize;
+        remainSize = size % blockSize;
+
+        for (i = 0; i < blockCount; i++) {
+                offset = i * blockSize;
+                rtlpriv->io.writeN_sync(rtlpriv,
+                                        (FW_8192C_START_ADDRESS + offset),
+                                        (void *)(bufferPtr + offset),
+                                        blockSize);
+        }
+
+        if (remainSize) {
+                offset = blockCount * blockSize;
+                rtlpriv->io.writeN_sync(rtlpriv,
+                                        (FW_8192C_START_ADDRESS + offset),
+                                        (void *)(bufferPtr + offset),
+                                        remainSize);
+        }
+}
+
 static void _rtl92c_fw_block_write(struct ieee80211_hw *hw,
                                    const u8 *buffer, u32 size)
 {
@@ -80,23 +109,30 @@ static void _rtl92c_fw_block_write(struct ieee80211_hw *hw,
         u8 *bufferPtr = (u8 *) buffer;
         u32 *pu4BytePtr = (u32 *) buffer;
         u32 i, offset, blockCount, remainSize;
+        u32 data;
 
+        if (rtlpriv->io.writeN_sync) {
+                rtl_block_fw_writeN(hw, buffer, size);
+                return;
+        }
         blockCount = size / blockSize;
         remainSize = size % blockSize;
+        if (remainSize) {
+                /* the last word is < 4 bytes - pad it with zeros */
+                for (i = 0; i < 4 - remainSize; i++)
+                        *(bufferPtr + size + i) = 0;
+                blockCount++;
+        }
 
         for (i = 0; i < blockCount; i++) {
                 offset = i * blockSize;
+                /* for big-endian platforms, the firmware data need to be byte
+                 * swapped as it was read as a byte string and will be written
+                 * as 32-bit dwords and byte swapped when written
+                 */
+                data = le32_to_cpu(*(__le32 *)(pu4BytePtr + i));
                 rtl_write_dword(rtlpriv, (FW_8192C_START_ADDRESS + offset),
-                                *(pu4BytePtr + i));
-        }
-
-        if (remainSize) {
-                offset = blockCount * blockSize;
-                bufferPtr += offset;
-                for (i = 0; i < remainSize; i++) {
-                        rtl_write_byte(rtlpriv, (FW_8192C_START_ADDRESS +
-                                                 offset + i), *(bufferPtr + i));
-                }
+                                data);
         }
 }
 
@@ -226,10 +262,10 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
         u32 fwsize;
         enum version_8192c version = rtlhal->version;
 
-        pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
         if (!rtlhal->pfirmware)
                 return 1;
 
+        pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
         pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
         pfwdata = (u8 *) rtlhal->pfirmware;
         fwsize = rtlhal->fwsize;
@@ -237,8 +273,9 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
         if (IS_FW_HEADER_EXIST(pfwheader)) {
                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
                          ("Firmware Version(%d), Signature(%#x),Size(%d)\n",
-                          pfwheader->version, pfwheader->signature,
-                          (uint)sizeof(struct rtl92c_firmware_header)));
+                         le16_to_cpu(pfwheader->version),
+                         le16_to_cpu(pfwheader->signature),
+                         (uint)sizeof(struct rtl92c_firmware_header)));
 
                 pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);
                 fwsize = fwsize - sizeof(struct rtl92c_firmware_header);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
index 3d5823c12621..cec5a3a1cc53 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
@@ -32,32 +32,32 @@
 
 #define FW_8192C_SIZE                           0x3000
 #define FW_8192C_START_ADDRESS                  0x1000
-#define FW_8192C_END_ADDRESS                    0x3FFF
+#define FW_8192C_END_ADDRESS                    0x1FFF
 #define FW_8192C_PAGE_SIZE                      4096
 #define FW_8192C_POLLING_DELAY                  5
 #define FW_8192C_POLLING_TIMEOUT_COUNT          100
 
 #define IS_FW_HEADER_EXIST(_pfwhdr)     \
-        ((_pfwhdr->signature&0xFFF0) == 0x92C0 ||\
-        (_pfwhdr->signature&0xFFF0) == 0x88C0)
+        ((le16_to_cpu(_pfwhdr->signature)&0xFFF0) == 0x92C0 ||\
+        (le16_to_cpu(_pfwhdr->signature)&0xFFF0) == 0x88C0)
 
 struct rtl92c_firmware_header {
-        u16 signature;
+        __le16 signature;
         u8 category;
         u8 function;
-        u16 version;
+        __le16 version;
         u8 subversion;
         u8 rsvd1;
         u8 month;
         u8 date;
         u8 hour;
         u8 minute;
-        u16 ramcodeSize;
-        u16 rsvd2;
-        u32 svnindex;
-        u32 rsvd3;
-        u32 rsvd4;
-        u32 rsvd5;
+        __le16 ramcodeSize;
+        __le16 rsvd2;
+        __le32 svnindex;
+        __le32 rsvd3;
+        __le32 rsvd4;
+        __le32 rsvd5;
 };
 
 enum rtl8192c_h2c_cmd {
@@ -94,5 +94,6 @@ void rtl92c_firmware_selfreset(struct ieee80211_hw *hw);
 void rtl92c_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode);
 void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished);
 void rtl92c_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus);
+void usb_writeN_async(struct rtl_priv *rtlpriv, u32 addr, void *data, u16 len);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/main.c b/drivers/net/wireless/rtlwifi/rtl8192c/main.c
index 2f624fc27499..605ff191aeb7 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/main.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/main.c
@@ -27,6 +27,7 @@
  *
  *****************************************************************************/
 
+#include <linux/module.h>
 #include "../wifi.h"
 
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
index 3b11642d3f7d..1f07558debf2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
@@ -27,6 +27,7 @@
  *
  *****************************************************************************/
 
+#include <linux/export.h>
 #include "../wifi.h"
 #include "../rtl8192ce/reg.h"
 #include "../rtl8192ce/def.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
index 592a10ac5929..3b585aadabfc 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
@@ -569,7 +569,7 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
                 }
         case ERFSLEEP:{
                         if (ppsc->rfpwr_state == ERFOFF)
-                                break;
+                                return false;
                         for (queue_id = 0, i = 0;
                              queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
                                 ring = &pcipriv->dev.tx_ring[queue_id];
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
index a48404cc2b96..f2aa33dc4d78 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
@@ -28,6 +28,7 @@
  *****************************************************************************/
 
 #include <linux/vmalloc.h>
+#include <linux/module.h>
 
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index 814c05df51e8..4ed973a3aa17 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -498,7 +498,7 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
         }
         RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD, ("MAP\n"),
                       hwinfo, HWSET_MAX_SIZE);
-        eeprom_id = *((u16 *)&hwinfo[0]);
+        eeprom_id = le16_to_cpu(*((__le16 *)&hwinfo[0]));
         if (eeprom_id != RTL8190_EEPROM_ID) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          ("EEPROM ID(%#x) is invalid!!\n", eeprom_id));
@@ -516,13 +516,14 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
         pr_info("MAC address: %pM\n", rtlefuse->dev_addr);
         _rtl92cu_read_txpower_info_from_hwpg(hw,
                                            rtlefuse->autoload_failflag, hwinfo);
-        rtlefuse->eeprom_vid = *(u16 *)&hwinfo[EEPROM_VID];
-        rtlefuse->eeprom_did = *(u16 *)&hwinfo[EEPROM_DID];
+        rtlefuse->eeprom_vid = le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_VID]);
+        rtlefuse->eeprom_did = le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_DID]);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
                  (" VID = 0x%02x PID = 0x%02x\n",
                  rtlefuse->eeprom_vid, rtlefuse->eeprom_did));
         rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
-        rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION];
+        rtlefuse->eeprom_version =
+                         le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_VERSION]);
         rtlefuse->txpwr_fromeprom = true;
         rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
index 060a06f4a885..9e0c8fcdf90f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
@@ -84,6 +84,7 @@ void rtl92c_read_chip_version(struct ieee80211_hw *hw)
                 }
         }
         rtlhal->version  = (enum version_8192c)chip_version;
+        pr_info("rtl8192cu: Chip version 0x%x\n", chip_version);
         switch (rtlhal->version) {
         case VERSION_NORMAL_TSMC_CHIP_92C_1T2R:
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
index 72852900df84..e49cf2244c75 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
@@ -548,7 +548,7 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
                 break;
         case ERFSLEEP:
                 if (ppsc->rfpwr_state == ERFOFF)
-                        break;
+                        return false;
                 for (queue_id = 0, i = 0;
                      queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
                         ring = &pcipriv->dev.tx_ring[queue_id];
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index b9a158e5eb0e..94a3e1706158 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -42,6 +42,7 @@
 #include "led.h"
 #include "hw.h"
 #include <linux/vmalloc.h>
+#include <linux/module.h>
 
 MODULE_AUTHOR("Georgia          <georgia@realtek.com>");
 MODULE_AUTHOR("Ziv Huang        <ziv_huang@realtek.com>");
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index bc33b147f44f..b3cc7b949992 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -491,7 +491,7 @@ static void _rtl_tx_desc_checksum(u8 *txdesc)
         SET_TX_DESC_TX_DESC_CHECKSUM(txdesc, 0);
         for (index = 0; index < 16; index++)
                 checksum = checksum ^ (*(ptr + index));
-        SET_TX_DESC_TX_DESC_CHECKSUM(txdesc, checksum);
+        SET_TX_DESC_TX_DESC_CHECKSUM(txdesc, cpu_to_le16(checksum));
 }
 
 void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
index 3ac7af1c5509..0883349e1c83 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
@@ -3374,7 +3374,7 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw,
                 break;
         case ERFSLEEP:
                 if (ppsc->rfpwr_state == ERFOFF)
-                        break;
+                        return false;
 
                 for (queue_id = 0, i = 0;
                      queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
index 691f80092185..149493f4c25c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
@@ -30,6 +30,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/vmalloc.h>
+#include <linux/module.h>
 
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
index f27171af979c..f10ac1ad9087 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
@@ -602,7 +602,7 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
                 }
         case ERFSLEEP:
                         if (ppsc->rfpwr_state == ERFOFF)
-                                break;
+                                return false;
 
                         for (queue_id = 0, i = 0;
                              queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index 3ec9a0d41baf..92f49d522c56 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@ -30,6 +30,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/vmalloc.h>
+#include <linux/module.h>
 
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index b42c2e2b2055..e956fa71d040 100644
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -28,18 +28,20 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/usb.h>
+#include <linux/export.h>
 #include "core.h"
 #include "wifi.h"
 #include "usb.h"
 #include "base.h"
 #include "ps.h"
+#include "rtl8192c/fw_common.h"
 
 #define REALTEK_USB_VENQT_READ                  0xC0
 #define REALTEK_USB_VENQT_WRITE                 0x40
 #define REALTEK_USB_VENQT_CMD_REQ               0x05
 #define REALTEK_USB_VENQT_CMD_IDX               0x00
 
-#define REALTEK_USB_VENQT_MAX_BUF_SIZE          254
+#define MAX_USBCTRL_VENDORREQ_TIMES             10
 
 static void usbctrl_async_callback(struct urb *urb)
 {
@@ -81,6 +83,7 @@ static int _usbctrl_vendorreq_async_write(struct usb_device *udev, u8 request,
         dr->wValue = cpu_to_le16(value);
         dr->wIndex = cpu_to_le16(index);
         dr->wLength = cpu_to_le16(len);
+        /* data are already in little-endian order */
         memcpy(buf, pdata, len);
         usb_fill_control_urb(urb, udev, pipe,
                              (unsigned char *)dr, buf, len,
@@ -99,16 +102,28 @@ static int _usbctrl_vendorreq_sync_read(struct usb_device *udev, u8 request,
         unsigned int pipe;
         int status;
         u8 reqtype;
+        int vendorreq_times = 0;
+        static int count;
 
         pipe = usb_rcvctrlpipe(udev, 0); /* read_in */
         reqtype =  REALTEK_USB_VENQT_READ;
 
-        status = usb_control_msg(udev, pipe, request, reqtype, value, index,
-                                 pdata, len, 0); /* max. timeout */
+        do {
+                status = usb_control_msg(udev, pipe, request, reqtype, value,
+                                         index, pdata, len, 0); /*max. timeout*/
+                if (status < 0) {
+                        /* firmware download is checksumed, don't retry */
+                        if ((value >= FW_8192C_START_ADDRESS &&
+                            value <= FW_8192C_END_ADDRESS))
+                                break;
+                } else {
+                        break;
+                }
+        } while (++vendorreq_times < MAX_USBCTRL_VENDORREQ_TIMES);
 
-        if (status < 0)
+        if (status < 0 && count++ < 4)
                 pr_err("reg 0x%x, usbctrl_vendorreq TimeOut! status:0x%x value=0x%x\n",
-                       value, status, *(u32 *)pdata);
+                       value, status, le32_to_cpu(*(u32 *)pdata));
         return status;
 }
 
@@ -128,7 +143,7 @@ static u32 _usb_read_sync(struct usb_device *udev, u32 addr, u16 len)
 
         wvalue = (u16)addr;
         _usbctrl_vendorreq_sync_read(udev, request, wvalue, index, data, len);
-        ret = *data;
+        ret = le32_to_cpu(*data);
         kfree(data);
         return ret;
 }
@@ -160,12 +175,12 @@ static void _usb_write_async(struct usb_device *udev, u32 addr, u32 val,
         u8 request;
         u16 wvalue;
         u16 index;
-        u32 data;
+        __le32 data;
 
         request = REALTEK_USB_VENQT_CMD_REQ;
         index = REALTEK_USB_VENQT_CMD_IDX; /* n/a */
         wvalue = (u16)(addr&0x0000ffff);
-        data = val;
+        data = cpu_to_le32(val);
         _usbctrl_vendorreq_async_write(udev, request, wvalue, index, &data,
                                        len);
 }
@@ -191,6 +206,30 @@ static void _usb_write32_async(struct rtl_priv *rtlpriv, u32 addr, u32 val)
         _usb_write_async(to_usb_device(dev), addr, val, 4);
 }
 
+static void _usb_writeN_sync(struct rtl_priv *rtlpriv, u32 addr, void *data,
+                             u16 len)
+{
+        struct device *dev = rtlpriv->io.dev;
+        struct usb_device *udev = to_usb_device(dev);
+        u8 request = REALTEK_USB_VENQT_CMD_REQ;
+        u8 reqtype =  REALTEK_USB_VENQT_WRITE;
+        u16 wvalue;
+        u16 index = REALTEK_USB_VENQT_CMD_IDX;
+        int pipe = usb_sndctrlpipe(udev, 0); /* write_out */
+        u8 *buffer;
+        dma_addr_t dma_addr;
+
+        wvalue = (u16)(addr&0x0000ffff);
+        buffer = usb_alloc_coherent(udev, (size_t)len, GFP_ATOMIC, &dma_addr);
+        if (!buffer)
+                return;
+        memcpy(buffer, data, len);
+        usb_control_msg(udev, pipe, request, reqtype, wvalue,
+                        index, buffer, len, 50);
+
+        usb_free_coherent(udev, (size_t)len, buffer, dma_addr);
+}
+
 static void _rtl_usb_io_handler_init(struct device *dev,
                                      struct ieee80211_hw *hw)
 {
@@ -204,6 +243,7 @@ static void _rtl_usb_io_handler_init(struct device *dev,
         rtlpriv->io.read8_sync          = _usb_read8_sync;
         rtlpriv->io.read16_sync         = _usb_read16_sync;
         rtlpriv->io.read32_sync         = _usb_read32_sync;
+        rtlpriv->io.writeN_sync         = _usb_writeN_sync;
 }
 
 static void _rtl_usb_io_handler_release(struct ieee80211_hw *hw)
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 713c7ddba8eb..085dccdbd1b6 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -63,6 +63,7 @@
 #define AC_MAX                                  4
 #define QOS_QUEUE_NUM                           4
 #define RTL_MAC80211_NUM_QUEUE                  5
+#define REALTEK_USB_VENQT_MAX_BUF_SIZE          254
 
 #define QBSS_LOAD_SIZE                          5
 #define MAX_WMMELE_LENGTH                       64
@@ -943,8 +944,10 @@ struct rtl_io {
         unsigned long pci_base_addr;    /*device I/O address */
 
         void (*write8_async) (struct rtl_priv *rtlpriv, u32 addr, u8 val);
-        void (*write16_async) (struct rtl_priv *rtlpriv, u32 addr, __le16 val);
-        void (*write32_async) (struct rtl_priv *rtlpriv, u32 addr, __le32 val);
+        void (*write16_async) (struct rtl_priv *rtlpriv, u32 addr, u16 val);
+        void (*write32_async) (struct rtl_priv *rtlpriv, u32 addr, u32 val);
+        void (*writeN_sync) (struct rtl_priv *rtlpriv, u32 addr, void *buf,
+                             u16 len);
 
         u8(*read8_sync) (struct rtl_priv *rtlpriv, u32 addr);
         u16(*read16_sync) (struct rtl_priv *rtlpriv, u32 addr);
@@ -1541,14 +1544,13 @@ struct rtl_hal_cfg {
 struct rtl_locks {
         /* mutex */
         struct mutex conf_mutex;
+        struct mutex ps_mutex;
 
         /*spin lock */
-        spinlock_t ips_lock;
         spinlock_t irq_th_lock;
         spinlock_t h2c_lock;
         spinlock_t rf_ps_lock;
         spinlock_t rf_lock;
-        spinlock_t lps_lock;
         spinlock_t waitq_lock;
 
         /*Dual mac*/
@@ -1573,7 +1575,8 @@ struct rtl_works {
         /* For SW LPS */
         struct delayed_work ps_work;
         struct delayed_work ps_rfon_wq;
-        struct tasklet_struct ips_leave_tasklet;
+
+        struct work_struct lps_leave_work;
 };
 
 struct rtl_debug {
diff --git a/drivers/net/wireless/wl1251/spi.c b/drivers/net/wireless/wl1251/spi.c
index eaa5f9556200..6248c354fc5c 100644
--- a/drivers/net/wireless/wl1251/spi.c
+++ b/drivers/net/wireless/wl1251/spi.c
@@ -319,7 +319,6 @@ static int __devexit wl1251_spi_remove(struct spi_device *spi)
 static struct spi_driver wl1251_spi_driver = {
         .driver = {
                 .name           = DRIVER_NAME,
-                .bus            = &spi_bus_type,
                 .owner          = THIS_MODULE,
         },
 
diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
index 3fe388b87c2e..af08c8609c63 100644
--- a/drivers/net/wireless/wl12xx/Kconfig
+++ b/drivers/net/wireless/wl12xx/Kconfig
@@ -42,16 +42,6 @@ config WL12XX_SDIO
           If you choose to build a module, it'll be called wl12xx_sdio.
           Say N if unsure.
 
-config WL12XX_SDIO_TEST
-        tristate "TI wl12xx SDIO testing support"
-        depends on WL12XX && MMC && WL12XX_SDIO
-        default n
-        ---help---
-          This module adds support for the SDIO bus testing with the
-          TI wl12xx chipsets.  You probably don't want this unless you are
-          testing a new hardware platform.  Select this if you want to test the
-          SDIO bus which is connected to the wl12xx chip.
-
 config WL12XX_PLATFORM_DATA
         bool
         depends on WL12XX_SDIO != n || WL1251_SDIO != n
diff --git a/drivers/net/wireless/wl12xx/Makefile b/drivers/net/wireless/wl12xx/Makefile
index 621b3483ca2c..fe67262ba19f 100644
--- a/drivers/net/wireless/wl12xx/Makefile
+++ b/drivers/net/wireless/wl12xx/Makefile
@@ -3,14 +3,11 @@ wl12xx-objs		= main.o cmd.o io.o event.o tx.o rx.o ps.o acx.o \
 
 wl12xx_spi-objs         = spi.o
 wl12xx_sdio-objs        = sdio.o
-wl12xx_sdio_test-objs   = sdio_test.o
 
 wl12xx-$(CONFIG_NL80211_TESTMODE)       += testmode.o
 obj-$(CONFIG_WL12XX)                    += wl12xx.o
 obj-$(CONFIG_WL12XX_SPI)                += wl12xx_spi.o
 obj-$(CONFIG_WL12XX_SDIO)               += wl12xx_sdio.o
 
-obj-$(CONFIG_WL12XX_SDIO_TEST)          += wl12xx_sdio_test.o
-
 # small builtin driver bit
 obj-$(CONFIG_WL12XX_PLATFORM_DATA)      += wl12xx_platform_data.o
diff --git a/drivers/net/wireless/wl12xx/acx.c b/drivers/net/wireless/wl12xx/acx.c
index ca044a743191..7537c401a448 100644
--- a/drivers/net/wireless/wl12xx/acx.c
+++ b/drivers/net/wireless/wl12xx/acx.c
@@ -29,11 +29,12 @@
 #include <linux/slab.h>
 
 #include "wl12xx.h"
+#include "debug.h"
 #include "wl12xx_80211.h"
 #include "reg.h"
 #include "ps.h"
 
-int wl1271_acx_wake_up_conditions(struct wl1271 *wl)
+int wl1271_acx_wake_up_conditions(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         struct acx_wake_up_condition *wake_up;
         int ret;
@@ -46,7 +47,7 @@ int wl1271_acx_wake_up_conditions(struct wl1271 *wl)
                 goto out;
         }
 
-        wake_up->role_id = wl->role_id;
+        wake_up->role_id = wlvif->role_id;
         wake_up->wake_up_event = wl->conf.conn.wake_up_event;
         wake_up->listen_interval = wl->conf.conn.listen_interval;
 
@@ -84,7 +85,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_tx_power(struct wl1271 *wl, int power)
+int wl1271_acx_tx_power(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                        int power)
 {
         struct acx_current_tx_power *acx;
         int ret;
@@ -100,7 +102,7 @@ int wl1271_acx_tx_power(struct wl1271 *wl, int power)
                 goto out;
         }
 
-        acx->role_id = wl->role_id;
+        acx->role_id = wlvif->role_id;
         acx->current_tx_power = power * 10;
 
         ret = wl1271_cmd_configure(wl, DOT11_CUR_TX_PWR, acx, sizeof(*acx));
@@ -114,7 +116,7 @@ out:
         return ret;
 }
 
-int wl1271_acx_feature_cfg(struct wl1271 *wl)
+int wl1271_acx_feature_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         struct acx_feature_config *feature;
         int ret;
@@ -128,7 +130,7 @@ int wl1271_acx_feature_cfg(struct wl1271 *wl)
         }
 
         /* DF_ENCRYPTION_DISABLE and DF_SNIFF_MODE_ENABLE are disabled */
-        feature->role_id = wl->role_id;
+        feature->role_id = wlvif->role_id;
         feature->data_flow_options = 0;
         feature->options = 0;
 
@@ -184,33 +186,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_pd_threshold(struct wl1271 *wl)
-{
-        struct acx_packet_detection *pd;
-        int ret;
-
-        wl1271_debug(DEBUG_ACX, "acx data pd threshold");
-
-        pd = kzalloc(sizeof(*pd), GFP_KERNEL);
-        if (!pd) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        pd->threshold = cpu_to_le32(wl->conf.rx.packet_detection_threshold);
-
-        ret = wl1271_cmd_configure(wl, ACX_PD_THRESHOLD, pd, sizeof(*pd));
-        if (ret < 0) {
-                wl1271_warning("failed to set pd threshold: %d", ret);
-                goto out;
-        }
-
-out:
-        kfree(pd);
-        return ret;
-}
-
-int wl1271_acx_slot(struct wl1271 *wl, enum acx_slot_type slot_time)
+int wl1271_acx_slot(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                    enum acx_slot_type slot_time)
 {
         struct acx_slot *slot;
         int ret;
@@ -223,7 +200,7 @@ int wl1271_acx_slot(struct wl1271 *wl, enum acx_slot_type slot_time)
                 goto out;
         }
 
-        slot->role_id = wl->role_id;
+        slot->role_id = wlvif->role_id;
         slot->wone_index = STATION_WONE_INDEX;
         slot->slot_time = slot_time;
 
@@ -238,8 +215,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_group_address_tbl(struct wl1271 *wl, bool enable,
-                                 void *mc_list, u32 mc_list_len)
+int wl1271_acx_group_address_tbl(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                                 bool enable, void *mc_list, u32 mc_list_len)
 {
         struct acx_dot11_grp_addr_tbl *acx;
         int ret;
@@ -253,7 +230,7 @@ int wl1271_acx_group_address_tbl(struct wl1271 *wl, bool enable,
         }
 
         /* MAC filtering */
-        acx->role_id = wl->role_id;
+        acx->role_id = wlvif->role_id;
         acx->enabled = enable;
         acx->num_groups = mc_list_len;
         memcpy(acx->mac_table, mc_list, mc_list_len * ETH_ALEN);
@@ -270,7 +247,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_service_period_timeout(struct wl1271 *wl)
+int wl1271_acx_service_period_timeout(struct wl1271 *wl,
+                                      struct wl12xx_vif *wlvif)
 {
         struct acx_rx_timeout *rx_timeout;
         int ret;
@@ -283,7 +261,7 @@ int wl1271_acx_service_period_timeout(struct wl1271 *wl)
 
         wl1271_debug(DEBUG_ACX, "acx service period timeout");
 
-        rx_timeout->role_id = wl->role_id;
+        rx_timeout->role_id = wlvif->role_id;
         rx_timeout->ps_poll_timeout = cpu_to_le16(wl->conf.rx.ps_poll_timeout);
         rx_timeout->upsd_timeout = cpu_to_le16(wl->conf.rx.upsd_timeout);
 
@@ -300,7 +278,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_rts_threshold(struct wl1271 *wl, u32 rts_threshold)
+int wl1271_acx_rts_threshold(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                             u32 rts_threshold)
 {
         struct acx_rts_threshold *rts;
         int ret;
@@ -320,7 +299,7 @@ int wl1271_acx_rts_threshold(struct wl1271 *wl, u32 rts_threshold)
                 goto out;
         }
 
-        rts->role_id = wl->role_id;
+        rts->role_id = wlvif->role_id;
         rts->threshold = cpu_to_le16((u16)rts_threshold);
 
         ret = wl1271_cmd_configure(wl, DOT11_RTS_THRESHOLD, rts, sizeof(*rts));
@@ -363,7 +342,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, bool enable_filter)
+int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                                 bool enable_filter)
 {
         struct acx_beacon_filter_option *beacon_filter = NULL;
         int ret = 0;
@@ -380,7 +360,7 @@ int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, bool enable_filter)
                 goto out;
         }
 
-        beacon_filter->role_id = wl->role_id;
+        beacon_filter->role_id = wlvif->role_id;
         beacon_filter->enable = enable_filter;
 
         /*
@@ -401,7 +381,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_beacon_filter_table(struct wl1271 *wl)
+int wl1271_acx_beacon_filter_table(struct wl1271 *wl,
+                                   struct wl12xx_vif *wlvif)
 {
         struct acx_beacon_filter_ie_table *ie_table;
         int i, idx = 0;
@@ -417,7 +398,7 @@ int wl1271_acx_beacon_filter_table(struct wl1271 *wl)
         }
 
         /* configure default beacon pass-through rules */
-        ie_table->role_id = wl->role_id;
+        ie_table->role_id = wlvif->role_id;
         ie_table->num_ie = 0;
         for (i = 0; i < wl->conf.conn.bcn_filt_ie_count; i++) {
                 struct conf_bcn_filt_rule *r = &(wl->conf.conn.bcn_filt_ie[i]);
@@ -458,7 +439,8 @@ out:
 
 #define ACX_CONN_MONIT_DISABLE_VALUE  0xffffffff
 
-int wl1271_acx_conn_monit_params(struct wl1271 *wl, bool enable)
+int wl1271_acx_conn_monit_params(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                                 bool enable)
 {
         struct acx_conn_monit_params *acx;
         u32 threshold = ACX_CONN_MONIT_DISABLE_VALUE;
@@ -479,7 +461,7 @@ int wl1271_acx_conn_monit_params(struct wl1271 *wl, bool enable)
                 timeout = wl->conf.conn.bss_lose_timeout;
         }
 
-        acx->role_id = wl->role_id;
+        acx->role_id = wlvif->role_id;
         acx->synch_fail_thold = cpu_to_le32(threshold);
         acx->bss_lose_timeout = cpu_to_le32(timeout);
 
@@ -582,7 +564,7 @@ out:
         return ret;
 }
 
-int wl1271_acx_bcn_dtim_options(struct wl1271 *wl)
+int wl1271_acx_bcn_dtim_options(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         struct acx_beacon_broadcast *bb;
         int ret;
@@ -595,7 +577,7 @@ int wl1271_acx_bcn_dtim_options(struct wl1271 *wl)
                 goto out;
         }
 
-        bb->role_id = wl->role_id;
+        bb->role_id = wlvif->role_id;
         bb->beacon_rx_timeout = cpu_to_le16(wl->conf.conn.beacon_rx_timeout);
         bb->broadcast_timeout = cpu_to_le16(wl->conf.conn.broadcast_timeout);
         bb->rx_broadcast_in_ps = wl->conf.conn.rx_broadcast_in_ps;
@@ -612,7 +594,7 @@ out:
         return ret;
 }
 
-int wl1271_acx_aid(struct wl1271 *wl, u16 aid)
+int wl1271_acx_aid(struct wl1271 *wl, struct wl12xx_vif *wlvif, u16 aid)
 {
         struct acx_aid *acx_aid;
         int ret;
@@ -625,7 +607,7 @@ int wl1271_acx_aid(struct wl1271 *wl, u16 aid)
                 goto out;
         }
 
-        acx_aid->role_id = wl->role_id;
+        acx_aid->role_id = wlvif->role_id;
         acx_aid->aid = cpu_to_le16(aid);
 
         ret = wl1271_cmd_configure(wl, ACX_AID, acx_aid, sizeof(*acx_aid));
@@ -668,7 +650,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_set_preamble(struct wl1271 *wl, enum acx_preamble_type preamble)
+int wl1271_acx_set_preamble(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                            enum acx_preamble_type preamble)
 {
         struct acx_preamble *acx;
         int ret;
@@ -681,7 +664,7 @@ int wl1271_acx_set_preamble(struct wl1271 *wl, enum acx_preamble_type preamble)
                 goto out;
         }
 
-        acx->role_id = wl->role_id;
+        acx->role_id = wlvif->role_id;
         acx->preamble = preamble;
 
         ret = wl1271_cmd_configure(wl, ACX_PREAMBLE_TYPE, acx, sizeof(*acx));
@@ -695,7 +678,7 @@ out:
         return ret;
 }
 
-int wl1271_acx_cts_protect(struct wl1271 *wl,
+int wl1271_acx_cts_protect(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                            enum acx_ctsprotect_type ctsprotect)
 {
         struct acx_ctsprotect *acx;
@@ -709,7 +692,7 @@ int wl1271_acx_cts_protect(struct wl1271 *wl,
                 goto out;
         }
 
-        acx->role_id = wl->role_id;
+        acx->role_id = wlvif->role_id;
         acx->ctsprotect = ctsprotect;
 
         ret = wl1271_cmd_configure(wl, ACX_CTS_PROTECTION, acx, sizeof(*acx));
@@ -739,7 +722,7 @@ int wl1271_acx_statistics(struct wl1271 *wl, struct acx_statistics *stats)
         return 0;
 }
 
-int wl1271_acx_sta_rate_policies(struct wl1271 *wl)
+int wl1271_acx_sta_rate_policies(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         struct acx_rate_policy *acx;
         struct conf_tx_rate_class *c = &wl->conf.tx.sta_rc_conf;
@@ -755,11 +738,11 @@ int wl1271_acx_sta_rate_policies(struct wl1271 *wl)
         }
 
         wl1271_debug(DEBUG_ACX, "basic_rate: 0x%x, full_rate: 0x%x",
-                wl->basic_rate, wl->rate_set);
+                wlvif->basic_rate, wlvif->rate_set);
 
         /* configure one basic rate class */
-        acx->rate_policy_idx = cpu_to_le32(ACX_TX_BASIC_RATE);
-        acx->rate_policy.enabled_rates = cpu_to_le32(wl->basic_rate);
+        acx->rate_policy_idx = cpu_to_le32(wlvif->sta.basic_rate_idx);
+        acx->rate_policy.enabled_rates = cpu_to_le32(wlvif->basic_rate);
         acx->rate_policy.short_retry_limit = c->short_retry_limit;
         acx->rate_policy.long_retry_limit = c->long_retry_limit;
         acx->rate_policy.aflags = c->aflags;
@@ -771,8 +754,8 @@ int wl1271_acx_sta_rate_policies(struct wl1271 *wl)
         }
 
         /* configure one AP supported rate class */
-        acx->rate_policy_idx = cpu_to_le32(ACX_TX_AP_FULL_RATE);
-        acx->rate_policy.enabled_rates = cpu_to_le32(wl->rate_set);
+        acx->rate_policy_idx = cpu_to_le32(wlvif->sta.ap_rate_idx);
+        acx->rate_policy.enabled_rates = cpu_to_le32(wlvif->rate_set);
         acx->rate_policy.short_retry_limit = c->short_retry_limit;
         acx->rate_policy.long_retry_limit = c->long_retry_limit;
         acx->rate_policy.aflags = c->aflags;
@@ -788,7 +771,7 @@ int wl1271_acx_sta_rate_policies(struct wl1271 *wl)
          * (p2p packets should always go out with OFDM rates, even
          * if we are currently connected to 11b AP)
          */
-        acx->rate_policy_idx = cpu_to_le32(ACX_TX_BASIC_RATE_P2P);
+        acx->rate_policy_idx = cpu_to_le32(wlvif->sta.p2p_rate_idx);
         acx->rate_policy.enabled_rates =
                                 cpu_to_le32(CONF_TX_RATE_MASK_BASIC_P2P);
         acx->rate_policy.short_retry_limit = c->short_retry_limit;
@@ -839,8 +822,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_ac_cfg(struct wl1271 *wl, u8 ac, u8 cw_min, u16 cw_max,
-                      u8 aifsn, u16 txop)
+int wl1271_acx_ac_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                      u8 ac, u8 cw_min, u16 cw_max, u8 aifsn, u16 txop)
 {
         struct acx_ac_cfg *acx;
         int ret = 0;
@@ -855,7 +838,7 @@ int wl1271_acx_ac_cfg(struct wl1271 *wl, u8 ac, u8 cw_min, u16 cw_max,
                 goto out;
         }
 
-        acx->role_id = wl->role_id;
+        acx->role_id = wlvif->role_id;
         acx->ac = ac;
         acx->cw_min = cw_min;
         acx->cw_max = cpu_to_le16(cw_max);
@@ -873,7 +856,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_tid_cfg(struct wl1271 *wl, u8 queue_id, u8 channel_type,
+int wl1271_acx_tid_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                       u8 queue_id, u8 channel_type,
                        u8 tsid, u8 ps_scheme, u8 ack_policy,
                        u32 apsd_conf0, u32 apsd_conf1)
 {
@@ -889,7 +873,7 @@ int wl1271_acx_tid_cfg(struct wl1271 *wl, u8 queue_id, u8 channel_type,
                 goto out;
         }
 
-        acx->role_id = wl->role_id;
+        acx->role_id = wlvif->role_id;
         acx->queue_id = queue_id;
         acx->channel_type = channel_type;
         acx->tsid = tsid;
@@ -1098,7 +1082,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_bet_enable(struct wl1271 *wl, bool enable)
+int wl1271_acx_bet_enable(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                          bool enable)
 {
         struct wl1271_acx_bet_enable *acx = NULL;
         int ret = 0;
@@ -1114,7 +1099,7 @@ int wl1271_acx_bet_enable(struct wl1271 *wl, bool enable)
                 goto out;
         }
 
-        acx->role_id = wl->role_id;
+        acx->role_id = wlvif->role_id;
         acx->enable = enable ? CONF_BET_MODE_ENABLE : CONF_BET_MODE_DISABLE;
         acx->max_consecutive = wl->conf.conn.bet_max_consecutive;
 
@@ -1129,7 +1114,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_arp_ip_filter(struct wl1271 *wl, u8 enable, __be32 address)
+int wl1271_acx_arp_ip_filter(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                             u8 enable, __be32 address)
 {
         struct wl1271_acx_arp_filter *acx;
         int ret;
@@ -1142,7 +1128,7 @@ int wl1271_acx_arp_ip_filter(struct wl1271 *wl, u8 enable, __be32 address)
                 goto out;
         }
 
-        acx->role_id = wl->role_id;
+        acx->role_id = wlvif->role_id;
         acx->version = ACX_IPV4_VERSION;
         acx->enable = enable;
 
@@ -1189,7 +1175,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_keep_alive_mode(struct wl1271 *wl, bool enable)
+int wl1271_acx_keep_alive_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                               bool enable)
 {
         struct wl1271_acx_keep_alive_mode *acx = NULL;
         int ret = 0;
@@ -1202,7 +1189,7 @@ int wl1271_acx_keep_alive_mode(struct wl1271 *wl, bool enable)
                 goto out;
         }
 
-        acx->role_id = wl->role_id;
+        acx->role_id = wlvif->role_id;
         acx->enabled = enable;
 
         ret = wl1271_cmd_configure(wl, ACX_KEEP_ALIVE_MODE, acx, sizeof(*acx));
@@ -1216,7 +1203,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_keep_alive_config(struct wl1271 *wl, u8 index, u8 tpl_valid)
+int wl1271_acx_keep_alive_config(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                                 u8 index, u8 tpl_valid)
 {
         struct wl1271_acx_keep_alive_config *acx = NULL;
         int ret = 0;
@@ -1229,7 +1217,7 @@ int wl1271_acx_keep_alive_config(struct wl1271 *wl, u8 index, u8 tpl_valid)
                 goto out;
         }
 
-        acx->role_id = wl->role_id;
+        acx->role_id = wlvif->role_id;
         acx->period = cpu_to_le32(wl->conf.conn.keep_alive_interval);
         acx->index = index;
         acx->tpl_validation = tpl_valid;
@@ -1247,8 +1235,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, bool enable,
-                                s16 thold, u8 hyst)
+int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                                bool enable, s16 thold, u8 hyst)
 {
         struct wl1271_acx_rssi_snr_trigger *acx = NULL;
         int ret = 0;
@@ -1261,9 +1249,9 @@ int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, bool enable,
                 goto out;
         }
 
-        wl->last_rssi_event = -1;
+        wlvif->last_rssi_event = -1;
 
-        acx->role_id = wl->role_id;
+        acx->role_id = wlvif->role_id;
         acx->pacing = cpu_to_le16(wl->conf.roam_trigger.trigger_pacing);
         acx->metric = WL1271_ACX_TRIG_METRIC_RSSI_BEACON;
         acx->type = WL1271_ACX_TRIG_TYPE_EDGE;
@@ -1288,7 +1276,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl)
+int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl,
+                                    struct wl12xx_vif *wlvif)
 {
         struct wl1271_acx_rssi_snr_avg_weights *acx = NULL;
         struct conf_roam_trigger_settings *c = &wl->conf.roam_trigger;
@@ -1302,7 +1291,7 @@ int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl)
                 goto out;
         }
 
-        acx->role_id = wl->role_id;
+        acx->role_id = wlvif->role_id;
         acx->rssi_beacon = c->avg_weight_rssi_beacon;
         acx->rssi_data = c->avg_weight_rssi_data;
         acx->snr_beacon = c->avg_weight_snr_beacon;
@@ -1367,6 +1356,7 @@ out:
 }
 
 int wl1271_acx_set_ht_information(struct wl1271 *wl,
+                                   struct wl12xx_vif *wlvif,
                                    u16 ht_operation_mode)
 {
         struct wl1271_acx_ht_information *acx;
@@ -1380,7 +1370,7 @@ int wl1271_acx_set_ht_information(struct wl1271 *wl,
                 goto out;
         }
 
-        acx->role_id = wl->role_id;
+        acx->role_id = wlvif->role_id;
         acx->ht_protection =
                 (u8)(ht_operation_mode & IEEE80211_HT_OP_MODE_PROTECTION);
         acx->rifs_mode = 0;
@@ -1402,7 +1392,8 @@ out:
 }
 
 /* Configure BA session initiator/receiver parameters setting in the FW. */
-int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl)
+int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl,
+                                       struct wl12xx_vif *wlvif)
 {
         struct wl1271_acx_ba_initiator_policy *acx;
         int ret;
@@ -1416,7 +1407,7 @@ int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl)
         }
 
         /* set for the current role */
-        acx->role_id = wl->role_id;
+        acx->role_id = wlvif->role_id;
         acx->tid_bitmap = wl->conf.ht.tx_ba_tid_bitmap;
         acx->win_size = wl->conf.ht.tx_ba_win_size;
         acx->inactivity_timeout = wl->conf.ht.inactivity_timeout;
@@ -1494,7 +1485,8 @@ out:
         return ret;
 }
 
-int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, bool enable)
+int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                               bool enable)
 {
         struct wl1271_acx_ps_rx_streaming *rx_streaming;
         u32 conf_queues, enable_queues;
@@ -1523,7 +1515,7 @@ int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, bool enable)
                 if (!(conf_queues & BIT(i)))
                         continue;
 
-                rx_streaming->role_id = wl->role_id;
+                rx_streaming->role_id = wlvif->role_id;
                 rx_streaming->tid = i;
                 rx_streaming->enable = enable_queues & BIT(i);
                 rx_streaming->period = wl->conf.rx_streaming.interval;
@@ -1542,7 +1534,7 @@ out:
         return ret;
 }
 
-int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl)
+int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         struct wl1271_acx_ap_max_tx_retry *acx = NULL;
         int ret;
@@ -1553,7 +1545,7 @@ int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl)
         if (!acx)
                 return -ENOMEM;
 
-        acx->role_id = wl->role_id;
+        acx->role_id = wlvif->role_id;
         acx->max_tx_retry = cpu_to_le16(wl->conf.tx.max_tx_retries);
 
         ret = wl1271_cmd_configure(wl, ACX_MAX_TX_FAILURE, acx, sizeof(*acx));
@@ -1567,7 +1559,7 @@ out:
         return ret;
 }
 
-int wl1271_acx_config_ps(struct wl1271 *wl)
+int wl12xx_acx_config_ps(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         struct wl1271_acx_config_ps *config_ps;
         int ret;
@@ -1582,7 +1574,7 @@ int wl1271_acx_config_ps(struct wl1271 *wl)
 
         config_ps->exit_retries = wl->conf.conn.psm_exit_retries;
         config_ps->enter_retries = wl->conf.conn.psm_entry_retries;
-        config_ps->null_data_rate = cpu_to_le32(wl->basic_rate);
+        config_ps->null_data_rate = cpu_to_le32(wlvif->basic_rate);
 
         ret = wl1271_cmd_configure(wl, ACX_CONFIG_PS, config_ps,
                                    sizeof(*config_ps));
diff --git a/drivers/net/wireless/wl12xx/acx.h b/drivers/net/wireless/wl12xx/acx.h
index e3f93b4b3429..69892b40c2df 100644
--- a/drivers/net/wireless/wl12xx/acx.h
+++ b/drivers/net/wireless/wl12xx/acx.h
@@ -171,13 +171,6 @@ struct acx_rx_msdu_lifetime {
         __le32 lifetime;
 } __packed;
 
-struct acx_packet_detection {
-        struct acx_header header;
-
-        __le32 threshold;
-} __packed;
-
-
 enum acx_slot_type {
         SLOT_TIME_LONG = 0,
         SLOT_TIME_SHORT = 1,
@@ -654,11 +647,6 @@ struct acx_rate_class {
         u8 reserved;
 };
 
-#define ACX_TX_BASIC_RATE      0
-#define ACX_TX_AP_FULL_RATE    1
-#define ACX_TX_BASIC_RATE_P2P  2
-#define ACX_TX_AP_MODE_MGMT_RATE 4
-#define ACX_TX_AP_MODE_BCST_RATE 5
 struct acx_rate_policy {
         struct acx_header header;
 
@@ -1234,39 +1222,48 @@ enum {
 };
 
 
-int wl1271_acx_wake_up_conditions(struct wl1271 *wl);
+int wl1271_acx_wake_up_conditions(struct wl1271 *wl,
+                                  struct wl12xx_vif *wlvif);
 int wl1271_acx_sleep_auth(struct wl1271 *wl, u8 sleep_auth);
-int wl1271_acx_tx_power(struct wl1271 *wl, int power);
-int wl1271_acx_feature_cfg(struct wl1271 *wl);
+int wl1271_acx_tx_power(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                        int power);
+int wl1271_acx_feature_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 int wl1271_acx_mem_map(struct wl1271 *wl,
                        struct acx_header *mem_map, size_t len);
 int wl1271_acx_rx_msdu_life_time(struct wl1271 *wl);
-int wl1271_acx_pd_threshold(struct wl1271 *wl);
-int wl1271_acx_slot(struct wl1271 *wl, enum acx_slot_type slot_time);
-int wl1271_acx_group_address_tbl(struct wl1271 *wl, bool enable,
-                                 void *mc_list, u32 mc_list_len);
-int wl1271_acx_service_period_timeout(struct wl1271 *wl);
-int wl1271_acx_rts_threshold(struct wl1271 *wl, u32 rts_threshold);
+int wl1271_acx_slot(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                    enum acx_slot_type slot_time);
+int wl1271_acx_group_address_tbl(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                                 bool enable, void *mc_list, u32 mc_list_len);
+int wl1271_acx_service_period_timeout(struct wl1271 *wl,
+                                      struct wl12xx_vif *wlvif);
+int wl1271_acx_rts_threshold(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                             u32 rts_threshold);
 int wl1271_acx_dco_itrim_params(struct wl1271 *wl);
-int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, bool enable_filter);
-int wl1271_acx_beacon_filter_table(struct wl1271 *wl);
-int wl1271_acx_conn_monit_params(struct wl1271 *wl, bool enable);
+int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                                 bool enable_filter);
+int wl1271_acx_beacon_filter_table(struct wl1271 *wl,
+                                   struct wl12xx_vif *wlvif);
+int wl1271_acx_conn_monit_params(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                                 bool enable);
 int wl1271_acx_sg_enable(struct wl1271 *wl, bool enable);
 int wl12xx_acx_sg_cfg(struct wl1271 *wl);
 int wl1271_acx_cca_threshold(struct wl1271 *wl);
-int wl1271_acx_bcn_dtim_options(struct wl1271 *wl);
-int wl1271_acx_aid(struct wl1271 *wl, u16 aid);
+int wl1271_acx_bcn_dtim_options(struct wl1271 *wl, struct wl12xx_vif *wlvif);
+int wl1271_acx_aid(struct wl1271 *wl, struct wl12xx_vif *wlvif, u16 aid);
 int wl1271_acx_event_mbox_mask(struct wl1271 *wl, u32 event_mask);
-int wl1271_acx_set_preamble(struct wl1271 *wl, enum acx_preamble_type preamble);
-int wl1271_acx_cts_protect(struct wl1271 *wl,
+int wl1271_acx_set_preamble(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                            enum acx_preamble_type preamble);
+int wl1271_acx_cts_protect(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                            enum acx_ctsprotect_type ctsprotect);
 int wl1271_acx_statistics(struct wl1271 *wl, struct acx_statistics *stats);
-int wl1271_acx_sta_rate_policies(struct wl1271 *wl);
+int wl1271_acx_sta_rate_policies(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 int wl1271_acx_ap_rate_policy(struct wl1271 *wl, struct conf_tx_rate_class *c,
                       u8 idx);
-int wl1271_acx_ac_cfg(struct wl1271 *wl, u8 ac, u8 cw_min, u16 cw_max,
-                      u8 aifsn, u16 txop);
-int wl1271_acx_tid_cfg(struct wl1271 *wl, u8 queue_id, u8 channel_type,
+int wl1271_acx_ac_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                      u8 ac, u8 cw_min, u16 cw_max, u8 aifsn, u16 txop);
+int wl1271_acx_tid_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                       u8 queue_id, u8 channel_type,
                        u8 tsid, u8 ps_scheme, u8 ack_policy,
                        u32 apsd_conf0, u32 apsd_conf1);
 int wl1271_acx_frag_threshold(struct wl1271 *wl, u32 frag_threshold);
@@ -1276,26 +1273,34 @@ int wl1271_acx_init_mem_config(struct wl1271 *wl);
 int wl1271_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap);
 int wl1271_acx_init_rx_interrupt(struct wl1271 *wl);
 int wl1271_acx_smart_reflex(struct wl1271 *wl);
-int wl1271_acx_bet_enable(struct wl1271 *wl, bool enable);
-int wl1271_acx_arp_ip_filter(struct wl1271 *wl, u8 enable, __be32 address);
+int wl1271_acx_bet_enable(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                          bool enable);
+int wl1271_acx_arp_ip_filter(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                             u8 enable, __be32 address);
 int wl1271_acx_pm_config(struct wl1271 *wl);
-int wl1271_acx_keep_alive_mode(struct wl1271 *wl, bool enable);
-int wl1271_acx_keep_alive_config(struct wl1271 *wl, u8 index, u8 tpl_valid);
-int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, bool enable,
-                                s16 thold, u8 hyst);
-int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl);
+int wl1271_acx_keep_alive_mode(struct wl1271 *wl, struct wl12xx_vif *vif,
+                               bool enable);
+int wl1271_acx_keep_alive_config(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                                 u8 index, u8 tpl_valid);
+int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                                bool enable, s16 thold, u8 hyst);
+int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl,
+                                    struct wl12xx_vif *wlvif);
 int wl1271_acx_set_ht_capabilities(struct wl1271 *wl,
                                     struct ieee80211_sta_ht_cap *ht_cap,
                                     bool allow_ht_operation, u8 hlid);
 int wl1271_acx_set_ht_information(struct wl1271 *wl,
+                                   struct wl12xx_vif *wlvif,
                                    u16 ht_operation_mode);
-int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl);
+int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl,
+                                       struct wl12xx_vif *wlvif);
 int wl12xx_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index,
                                        u16 ssn, bool enable, u8 peer_hlid);
 int wl1271_acx_tsf_info(struct wl1271 *wl, u64 *mactime);
-int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, bool enable);
-int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl);
-int wl1271_acx_config_ps(struct wl1271 *wl);
+int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                               bool enable);
+int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl, struct wl12xx_vif *wlvif);
+int wl12xx_acx_config_ps(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 int wl1271_acx_set_inconnection_sta(struct wl1271 *wl, u8 *addr);
 int wl1271_acx_fm_coex(struct wl1271 *wl);
 int wl12xx_acx_set_rate_mgmt_params(struct wl1271 *wl);
diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c
index d4e628db76b0..8f9cf5a816ea 100644
--- a/drivers/net/wireless/wl12xx/boot.c
+++ b/drivers/net/wireless/wl12xx/boot.c
@@ -23,7 +23,9 @@
 
 #include <linux/slab.h>
 #include <linux/wl12xx.h>
+#include <linux/export.h>
 
+#include "debug.h"
 #include "acx.h"
 #include "reg.h"
 #include "boot.h"
@@ -346,6 +348,9 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl)
                 nvs_ptr += 3;
 
                 for (i = 0; i < burst_len; i++) {
+                        if (nvs_ptr + 3 >= (u8 *) wl->nvs + nvs_len)
+                                goto out_badnvs;
+
                         val = (nvs_ptr[0] | (nvs_ptr[1] << 8)
                                | (nvs_ptr[2] << 16) | (nvs_ptr[3] << 24));
 
@@ -357,6 +362,9 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl)
                         nvs_ptr += 4;
                         dest_addr += 4;
                 }
+
+                if (nvs_ptr >= (u8 *) wl->nvs + nvs_len)
+                        goto out_badnvs;
         }
 
         /*
@@ -368,6 +376,10 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl)
          */
         nvs_ptr = (u8 *)wl->nvs +
                         ALIGN(nvs_ptr - (u8 *)wl->nvs + 7, 4);
+
+        if (nvs_ptr >= (u8 *) wl->nvs + nvs_len)
+                goto out_badnvs;
+
         nvs_len -= nvs_ptr - (u8 *)wl->nvs;
 
         /* Now we must set the partition correctly */
@@ -383,6 +395,10 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl)
 
         kfree(nvs_aligned);
         return 0;
+
+out_badnvs:
+        wl1271_error("nvs data is malformed");
+        return -EILSEQ;
 }
 
 static void wl1271_boot_enable_interrupts(struct wl1271 *wl)
diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c
index a52299e548fa..e0d217979485 100644
--- a/drivers/net/wireless/wl12xx/cmd.c
+++ b/drivers/net/wireless/wl12xx/cmd.c
@@ -29,6 +29,7 @@
 #include <linux/slab.h>
 
 #include "wl12xx.h"
+#include "debug.h"
 #include "reg.h"
 #include "io.h"
 #include "acx.h"
@@ -120,6 +121,11 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
         if (!wl->nvs)
                 return -ENODEV;
 
+        if (gp->tx_bip_fem_manufacturer >= WL1271_INI_FEM_MODULE_COUNT) {
+                wl1271_warning("FEM index from INI out of bounds");
+                return -EINVAL;
+        }
+
         gen_parms = kzalloc(sizeof(*gen_parms), GFP_KERNEL);
         if (!gen_parms)
                 return -ENOMEM;
@@ -143,6 +149,12 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
         gp->tx_bip_fem_manufacturer =
                 gen_parms->general_params.tx_bip_fem_manufacturer;
 
+        if (gp->tx_bip_fem_manufacturer >= WL1271_INI_FEM_MODULE_COUNT) {
+                wl1271_warning("FEM index from FW out of bounds");
+                ret = -EINVAL;
+                goto out;
+        }
+
         wl1271_debug(DEBUG_CMD, "FEM autodetect: %s, manufacturer: %d\n",
                      answer ? "auto" : "manual", gp->tx_bip_fem_manufacturer);
 
@@ -162,6 +174,11 @@ int wl128x_cmd_general_parms(struct wl1271 *wl)
         if (!wl->nvs)
                 return -ENODEV;
 
+        if (gp->tx_bip_fem_manufacturer >= WL1271_INI_FEM_MODULE_COUNT) {
+                wl1271_warning("FEM index from ini out of bounds");
+                return -EINVAL;
+        }
+
         gen_parms = kzalloc(sizeof(*gen_parms), GFP_KERNEL);
         if (!gen_parms)
                 return -ENOMEM;
@@ -186,6 +203,12 @@ int wl128x_cmd_general_parms(struct wl1271 *wl)
         gp->tx_bip_fem_manufacturer =
                 gen_parms->general_params.tx_bip_fem_manufacturer;
 
+        if (gp->tx_bip_fem_manufacturer >= WL1271_INI_FEM_MODULE_COUNT) {
+                wl1271_warning("FEM index from FW out of bounds");
+                ret = -EINVAL;
+                goto out;
+        }
+
         wl1271_debug(DEBUG_CMD, "FEM autodetect: %s, manufacturer: %d\n",
                      answer ? "auto" : "manual", gp->tx_bip_fem_manufacturer);
 
@@ -358,7 +381,8 @@ static int wl1271_cmd_wait_for_event(struct wl1271 *wl, u32 mask)
         return 0;
 }
 
-int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 role_type, u8 *role_id)
+int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 *addr, u8 role_type,
+                           u8 *role_id)
 {
         struct wl12xx_cmd_role_enable *cmd;
         int ret;
@@ -381,7 +405,7 @@ int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 role_type, u8 *role_id)
                 goto out_free;
         }
 
-        memcpy(cmd->mac_address, wl->mac_addr, ETH_ALEN);
+        memcpy(cmd->mac_address, addr, ETH_ALEN);
         cmd->role_type = role_type;
 
         ret = wl1271_cmd_send(wl, CMD_ROLE_ENABLE, cmd, sizeof(*cmd), 0);
@@ -433,37 +457,41 @@ out:
         return ret;
 }
 
-static int wl12xx_allocate_link(struct wl1271 *wl, u8 *hlid)
+int wl12xx_allocate_link(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 *hlid)
 {
         u8 link = find_first_zero_bit(wl->links_map, WL12XX_MAX_LINKS);
         if (link >= WL12XX_MAX_LINKS)
                 return -EBUSY;
 
         __set_bit(link, wl->links_map);
+        __set_bit(link, wlvif->links_map);
         *hlid = link;
         return 0;
 }
 
-static void wl12xx_free_link(struct wl1271 *wl, u8 *hlid)
+void wl12xx_free_link(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 *hlid)
 {
         if (*hlid == WL12XX_INVALID_LINK_ID)
                 return;
 
         __clear_bit(*hlid, wl->links_map);
+        __clear_bit(*hlid, wlvif->links_map);
         *hlid = WL12XX_INVALID_LINK_ID;
 }
 
-static int wl12xx_get_new_session_id(struct wl1271 *wl)
+static int wl12xx_get_new_session_id(struct wl1271 *wl,
+                                     struct wl12xx_vif *wlvif)
 {
-        if (wl->session_counter >= SESSION_COUNTER_MAX)
-                wl->session_counter = 0;
+        if (wlvif->session_counter >= SESSION_COUNTER_MAX)
+                wlvif->session_counter = 0;
 
-        wl->session_counter++;
+        wlvif->session_counter++;
 
-        return wl->session_counter;
+        return wlvif->session_counter;
 }
 
-int wl12xx_cmd_role_start_dev(struct wl1271 *wl)
+static int wl12xx_cmd_role_start_dev(struct wl1271 *wl,
+                                     struct wl12xx_vif *wlvif)
 {
         struct wl12xx_cmd_role_start *cmd;
         int ret;
@@ -474,20 +502,20 @@ int wl12xx_cmd_role_start_dev(struct wl1271 *wl)
                 goto out;
         }
 
-        wl1271_debug(DEBUG_CMD, "cmd role start dev %d", wl->dev_role_id);
+        wl1271_debug(DEBUG_CMD, "cmd role start dev %d", wlvif->dev_role_id);
 
-        cmd->role_id = wl->dev_role_id;
-        if (wl->band == IEEE80211_BAND_5GHZ)
+        cmd->role_id = wlvif->dev_role_id;
+        if (wlvif->band == IEEE80211_BAND_5GHZ)
                 cmd->band = WL12XX_BAND_5GHZ;
-        cmd->channel = wl->channel;
+        cmd->channel = wlvif->channel;
 
-        if (wl->dev_hlid == WL12XX_INVALID_LINK_ID) {
-                ret = wl12xx_allocate_link(wl, &wl->dev_hlid);
+        if (wlvif->dev_hlid == WL12XX_INVALID_LINK_ID) {
+                ret = wl12xx_allocate_link(wl, wlvif, &wlvif->dev_hlid);
                 if (ret)
                         goto out_free;
         }
-        cmd->device.hlid = wl->dev_hlid;
-        cmd->device.session = wl->session_counter;
+        cmd->device.hlid = wlvif->dev_hlid;
+        cmd->device.session = wlvif->session_counter;
 
         wl1271_debug(DEBUG_CMD, "role start: roleid=%d, hlid=%d, session=%d",
                      cmd->role_id, cmd->device.hlid, cmd->device.session);
@@ -502,9 +530,7 @@ int wl12xx_cmd_role_start_dev(struct wl1271 *wl)
 
 err_hlid:
         /* clear links on error */
-        __clear_bit(wl->dev_hlid, wl->links_map);
-        wl->dev_hlid = WL12XX_INVALID_LINK_ID;
-
+        wl12xx_free_link(wl, wlvif, &wlvif->dev_hlid);
 
 out_free:
         kfree(cmd);
@@ -513,12 +539,13 @@ out:
         return ret;
 }
 
-int wl12xx_cmd_role_stop_dev(struct wl1271 *wl)
+static int wl12xx_cmd_role_stop_dev(struct wl1271 *wl,
+                                    struct wl12xx_vif *wlvif)
 {
         struct wl12xx_cmd_role_stop *cmd;
         int ret;
 
-        if (WARN_ON(wl->dev_hlid == WL12XX_INVALID_LINK_ID))
+        if (WARN_ON(wlvif->dev_hlid == WL12XX_INVALID_LINK_ID))
                 return -EINVAL;
 
         cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
@@ -529,7 +556,7 @@ int wl12xx_cmd_role_stop_dev(struct wl1271 *wl)
 
         wl1271_debug(DEBUG_CMD, "cmd role stop dev");
 
-        cmd->role_id = wl->dev_role_id;
+        cmd->role_id = wlvif->dev_role_id;
         cmd->disc_type = DISCONNECT_IMMEDIATE;
         cmd->reason = cpu_to_le16(WLAN_REASON_UNSPECIFIED);
 
@@ -545,7 +572,7 @@ int wl12xx_cmd_role_stop_dev(struct wl1271 *wl)
                 goto out_free;
         }
 
-        wl12xx_free_link(wl, &wl->dev_hlid);
+        wl12xx_free_link(wl, wlvif, &wlvif->dev_hlid);
 
 out_free:
         kfree(cmd);
@@ -554,8 +581,9 @@ out:
         return ret;
 }
 
-int wl12xx_cmd_role_start_sta(struct wl1271 *wl)
+int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
+        struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
         struct wl12xx_cmd_role_start *cmd;
         int ret;
 
@@ -565,33 +593,33 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl)
                 goto out;
         }
 
-        wl1271_debug(DEBUG_CMD, "cmd role start sta %d", wl->role_id);
+        wl1271_debug(DEBUG_CMD, "cmd role start sta %d", wlvif->role_id);
 
-        cmd->role_id = wl->role_id;
-        if (wl->band == IEEE80211_BAND_5GHZ)
+        cmd->role_id = wlvif->role_id;
+        if (wlvif->band == IEEE80211_BAND_5GHZ)
                 cmd->band = WL12XX_BAND_5GHZ;
-        cmd->channel = wl->channel;
-        cmd->sta.basic_rate_set = cpu_to_le32(wl->basic_rate_set);
-        cmd->sta.beacon_interval = cpu_to_le16(wl->beacon_int);
+        cmd->channel = wlvif->channel;
+        cmd->sta.basic_rate_set = cpu_to_le32(wlvif->basic_rate_set);
+        cmd->sta.beacon_interval = cpu_to_le16(wlvif->beacon_int);
         cmd->sta.ssid_type = WL12XX_SSID_TYPE_ANY;
-        cmd->sta.ssid_len = wl->ssid_len;
-        memcpy(cmd->sta.ssid, wl->ssid, wl->ssid_len);
-        memcpy(cmd->sta.bssid, wl->bssid, ETH_ALEN);
-        cmd->sta.local_rates = cpu_to_le32(wl->rate_set);
+        cmd->sta.ssid_len = wlvif->ssid_len;
+        memcpy(cmd->sta.ssid, wlvif->ssid, wlvif->ssid_len);
+        memcpy(cmd->sta.bssid, vif->bss_conf.bssid, ETH_ALEN);
+        cmd->sta.local_rates = cpu_to_le32(wlvif->rate_set);
 
-        if (wl->sta_hlid == WL12XX_INVALID_LINK_ID) {
-                ret = wl12xx_allocate_link(wl, &wl->sta_hlid);
+        if (wlvif->sta.hlid == WL12XX_INVALID_LINK_ID) {
+                ret = wl12xx_allocate_link(wl, wlvif, &wlvif->sta.hlid);
                 if (ret)
                         goto out_free;
         }
-        cmd->sta.hlid = wl->sta_hlid;
-        cmd->sta.session = wl12xx_get_new_session_id(wl);
-        cmd->sta.remote_rates = cpu_to_le32(wl->rate_set);
+        cmd->sta.hlid = wlvif->sta.hlid;
+        cmd->sta.session = wl12xx_get_new_session_id(wl, wlvif);
+        cmd->sta.remote_rates = cpu_to_le32(wlvif->rate_set);
 
         wl1271_debug(DEBUG_CMD, "role start: roleid=%d, hlid=%d, session=%d "
                      "basic_rate_set: 0x%x, remote_rates: 0x%x",
-                     wl->role_id, cmd->sta.hlid, cmd->sta.session,
-                     wl->basic_rate_set, wl->rate_set);
+                     wlvif->role_id, cmd->sta.hlid, cmd->sta.session,
+                     wlvif->basic_rate_set, wlvif->rate_set);
 
         ret = wl1271_cmd_send(wl, CMD_ROLE_START, cmd, sizeof(*cmd), 0);
         if (ret < 0) {
@@ -603,7 +631,7 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl)
 
 err_hlid:
         /* clear links on error. */
-        wl12xx_free_link(wl, &wl->sta_hlid);
+        wl12xx_free_link(wl, wlvif, &wlvif->sta.hlid);
 
 out_free:
         kfree(cmd);
@@ -613,12 +641,12 @@ out:
 }
 
 /* use this function to stop ibss as well */
-int wl12xx_cmd_role_stop_sta(struct wl1271 *wl)
+int wl12xx_cmd_role_stop_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         struct wl12xx_cmd_role_stop *cmd;
         int ret;
 
-        if (WARN_ON(wl->sta_hlid == WL12XX_INVALID_LINK_ID))
+        if (WARN_ON(wlvif->sta.hlid == WL12XX_INVALID_LINK_ID))
                 return -EINVAL;
 
         cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
@@ -627,9 +655,9 @@ int wl12xx_cmd_role_stop_sta(struct wl1271 *wl)
                 goto out;
         }
 
-        wl1271_debug(DEBUG_CMD, "cmd role stop sta %d", wl->role_id);
+        wl1271_debug(DEBUG_CMD, "cmd role stop sta %d", wlvif->role_id);
 
-        cmd->role_id = wl->role_id;
+        cmd->role_id = wlvif->role_id;
         cmd->disc_type = DISCONNECT_IMMEDIATE;
         cmd->reason = cpu_to_le16(WLAN_REASON_UNSPECIFIED);
 
@@ -639,7 +667,7 @@ int wl12xx_cmd_role_stop_sta(struct wl1271 *wl)
                 goto out_free;
         }
 
-        wl12xx_free_link(wl, &wl->sta_hlid);
+        wl12xx_free_link(wl, wlvif, &wlvif->sta.hlid);
 
 out_free:
         kfree(cmd);
@@ -648,16 +676,17 @@ out:
         return ret;
 }
 
-int wl12xx_cmd_role_start_ap(struct wl1271 *wl)
+int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         struct wl12xx_cmd_role_start *cmd;
-        struct ieee80211_bss_conf *bss_conf = &wl->vif->bss_conf;
+        struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
+        struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
         int ret;
 
-        wl1271_debug(DEBUG_CMD, "cmd role start ap %d", wl->role_id);
+        wl1271_debug(DEBUG_CMD, "cmd role start ap %d", wlvif->role_id);
 
         /* trying to use hidden SSID with an old hostapd version */
-        if (wl->ssid_len == 0 && !bss_conf->hidden_ssid) {
+        if (wlvif->ssid_len == 0 && !bss_conf->hidden_ssid) {
                 wl1271_error("got a null SSID from beacon/bss");
                 ret = -EINVAL;
                 goto out;
@@ -669,30 +698,30 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl)
                 goto out;
         }
 
-        ret = wl12xx_allocate_link(wl, &wl->ap_global_hlid);
+        ret = wl12xx_allocate_link(wl, wlvif, &wlvif->ap.global_hlid);
         if (ret < 0)
                 goto out_free;
 
-        ret = wl12xx_allocate_link(wl, &wl->ap_bcast_hlid);
+        ret = wl12xx_allocate_link(wl, wlvif, &wlvif->ap.bcast_hlid);
         if (ret < 0)
                 goto out_free_global;
 
-        cmd->role_id = wl->role_id;
+        cmd->role_id = wlvif->role_id;
         cmd->ap.aging_period = cpu_to_le16(wl->conf.tx.ap_aging_period);
         cmd->ap.bss_index = WL1271_AP_BSS_INDEX;
-        cmd->ap.global_hlid = wl->ap_global_hlid;
-        cmd->ap.broadcast_hlid = wl->ap_bcast_hlid;
-        cmd->ap.basic_rate_set = cpu_to_le32(wl->basic_rate_set);
-        cmd->ap.beacon_interval = cpu_to_le16(wl->beacon_int);
+        cmd->ap.global_hlid = wlvif->ap.global_hlid;
+        cmd->ap.broadcast_hlid = wlvif->ap.bcast_hlid;
+        cmd->ap.basic_rate_set = cpu_to_le32(wlvif->basic_rate_set);
+        cmd->ap.beacon_interval = cpu_to_le16(wlvif->beacon_int);
         cmd->ap.dtim_interval = bss_conf->dtim_period;
         cmd->ap.beacon_expiry = WL1271_AP_DEF_BEACON_EXP;
-        cmd->channel = wl->channel;
+        cmd->channel = wlvif->channel;
 
         if (!bss_conf->hidden_ssid) {
                 /* take the SSID from the beacon for backward compatibility */
                 cmd->ap.ssid_type = WL12XX_SSID_TYPE_PUBLIC;
-                cmd->ap.ssid_len = wl->ssid_len;
-                memcpy(cmd->ap.ssid, wl->ssid, wl->ssid_len);
+                cmd->ap.ssid_len = wlvif->ssid_len;
+                memcpy(cmd->ap.ssid, wlvif->ssid, wlvif->ssid_len);
         } else {
                 cmd->ap.ssid_type = WL12XX_SSID_TYPE_HIDDEN;
                 cmd->ap.ssid_len = bss_conf->ssid_len;
@@ -701,7 +730,7 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl)
 
         cmd->ap.local_rates = cpu_to_le32(0xffffffff);
 
-        switch (wl->band) {
+        switch (wlvif->band) {
         case IEEE80211_BAND_2GHZ:
                 cmd->band = RADIO_BAND_2_4GHZ;
                 break;
@@ -709,7 +738,7 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl)
                 cmd->band = RADIO_BAND_5GHZ;
                 break;
         default:
-                wl1271_warning("ap start - unknown band: %d", (int)wl->band);
+                wl1271_warning("ap start - unknown band: %d", (int)wlvif->band);
                 cmd->band = RADIO_BAND_2_4GHZ;
                 break;
         }
@@ -723,10 +752,10 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl)
         goto out_free;
 
 out_free_bcast:
-        wl12xx_free_link(wl, &wl->ap_bcast_hlid);
+        wl12xx_free_link(wl, wlvif, &wlvif->ap.bcast_hlid);
 
 out_free_global:
-        wl12xx_free_link(wl, &wl->ap_global_hlid);
+        wl12xx_free_link(wl, wlvif, &wlvif->ap.global_hlid);
 
 out_free:
         kfree(cmd);
@@ -735,7 +764,7 @@ out:
         return ret;
 }
 
-int wl12xx_cmd_role_stop_ap(struct wl1271 *wl)
+int wl12xx_cmd_role_stop_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         struct wl12xx_cmd_role_stop *cmd;
         int ret;
@@ -746,9 +775,9 @@ int wl12xx_cmd_role_stop_ap(struct wl1271 *wl)
                 goto out;
         }
 
-        wl1271_debug(DEBUG_CMD, "cmd role stop ap %d", wl->role_id);
+        wl1271_debug(DEBUG_CMD, "cmd role stop ap %d", wlvif->role_id);
 
-        cmd->role_id = wl->role_id;
+        cmd->role_id = wlvif->role_id;
 
         ret = wl1271_cmd_send(wl, CMD_ROLE_STOP, cmd, sizeof(*cmd), 0);
         if (ret < 0) {
@@ -756,8 +785,8 @@ int wl12xx_cmd_role_stop_ap(struct wl1271 *wl)
                 goto out_free;
         }
 
-        wl12xx_free_link(wl, &wl->ap_bcast_hlid);
-        wl12xx_free_link(wl, &wl->ap_global_hlid);
+        wl12xx_free_link(wl, wlvif, &wlvif->ap.bcast_hlid);
+        wl12xx_free_link(wl, wlvif, &wlvif->ap.global_hlid);
 
 out_free:
         kfree(cmd);
@@ -766,10 +795,11 @@ out:
         return ret;
 }
 
-int wl12xx_cmd_role_start_ibss(struct wl1271 *wl)
+int wl12xx_cmd_role_start_ibss(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
+        struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
         struct wl12xx_cmd_role_start *cmd;
-        struct ieee80211_bss_conf *bss_conf = &wl->vif->bss_conf;
+        struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
         int ret;
 
         cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
@@ -778,35 +808,36 @@ int wl12xx_cmd_role_start_ibss(struct wl1271 *wl)
                 goto out;
         }
 
-        wl1271_debug(DEBUG_CMD, "cmd role start ibss %d", wl->role_id);
+        wl1271_debug(DEBUG_CMD, "cmd role start ibss %d", wlvif->role_id);
 
-        cmd->role_id = wl->role_id;
-        if (wl->band == IEEE80211_BAND_5GHZ)
+        cmd->role_id = wlvif->role_id;
+        if (wlvif->band == IEEE80211_BAND_5GHZ)
                 cmd->band = WL12XX_BAND_5GHZ;
-        cmd->channel = wl->channel;
-        cmd->ibss.basic_rate_set = cpu_to_le32(wl->basic_rate_set);
-        cmd->ibss.beacon_interval = cpu_to_le16(wl->beacon_int);
+        cmd->channel = wlvif->channel;
+        cmd->ibss.basic_rate_set = cpu_to_le32(wlvif->basic_rate_set);
+        cmd->ibss.beacon_interval = cpu_to_le16(wlvif->beacon_int);
         cmd->ibss.dtim_interval = bss_conf->dtim_period;
         cmd->ibss.ssid_type = WL12XX_SSID_TYPE_ANY;
-        cmd->ibss.ssid_len = wl->ssid_len;
-        memcpy(cmd->ibss.ssid, wl->ssid, wl->ssid_len);
-        memcpy(cmd->ibss.bssid, wl->bssid, ETH_ALEN);
-        cmd->sta.local_rates = cpu_to_le32(wl->rate_set);
+        cmd->ibss.ssid_len = wlvif->ssid_len;
+        memcpy(cmd->ibss.ssid, wlvif->ssid, wlvif->ssid_len);
+        memcpy(cmd->ibss.bssid, vif->bss_conf.bssid, ETH_ALEN);
+        cmd->sta.local_rates = cpu_to_le32(wlvif->rate_set);
 
-        if (wl->sta_hlid == WL12XX_INVALID_LINK_ID) {
-                ret = wl12xx_allocate_link(wl, &wl->sta_hlid);
+        if (wlvif->sta.hlid == WL12XX_INVALID_LINK_ID) {
+                ret = wl12xx_allocate_link(wl, wlvif, &wlvif->sta.hlid);
                 if (ret)
                         goto out_free;
         }
-        cmd->ibss.hlid = wl->sta_hlid;
-        cmd->ibss.remote_rates = cpu_to_le32(wl->rate_set);
+        cmd->ibss.hlid = wlvif->sta.hlid;
+        cmd->ibss.remote_rates = cpu_to_le32(wlvif->rate_set);
 
         wl1271_debug(DEBUG_CMD, "role start: roleid=%d, hlid=%d, session=%d "
                      "basic_rate_set: 0x%x, remote_rates: 0x%x",
-                     wl->role_id, cmd->sta.hlid, cmd->sta.session,
-                     wl->basic_rate_set, wl->rate_set);
+                     wlvif->role_id, cmd->sta.hlid, cmd->sta.session,
+                     wlvif->basic_rate_set, wlvif->rate_set);
 
-        wl1271_debug(DEBUG_CMD, "wl->bssid = %pM", wl->bssid);
+        wl1271_debug(DEBUG_CMD, "vif->bss_conf.bssid = %pM",
+                     vif->bss_conf.bssid);
 
         ret = wl1271_cmd_send(wl, CMD_ROLE_START, cmd, sizeof(*cmd), 0);
         if (ret < 0) {
@@ -818,7 +849,7 @@ int wl12xx_cmd_role_start_ibss(struct wl1271 *wl)
 
 err_hlid:
         /* clear links on error. */
-        wl12xx_free_link(wl, &wl->sta_hlid);
+        wl12xx_free_link(wl, wlvif, &wlvif->sta.hlid);
 
 out_free:
         kfree(cmd);
@@ -962,7 +993,8 @@ out:
         return ret;
 }
 
-int wl1271_cmd_ps_mode(struct wl1271 *wl, u8 ps_mode)
+int wl1271_cmd_ps_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                       u8 ps_mode)
 {
         struct wl1271_cmd_ps_params *ps_params = NULL;
         int ret = 0;
@@ -975,7 +1007,7 @@ int wl1271_cmd_ps_mode(struct wl1271 *wl, u8 ps_mode)
                 goto out;
         }
 
-        ps_params->role_id = wl->role_id;
+        ps_params->role_id = wlvif->role_id;
         ps_params->ps_mode = ps_mode;
 
         ret = wl1271_cmd_send(wl, CMD_SET_PS_MODE, ps_params,
@@ -1030,7 +1062,7 @@ out:
         return ret;
 }
 
-int wl1271_cmd_build_null_data(struct wl1271 *wl)
+int wl12xx_cmd_build_null_data(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         struct sk_buff *skb = NULL;
         int size;
@@ -1038,11 +1070,12 @@ int wl1271_cmd_build_null_data(struct wl1271 *wl)
         int ret = -ENOMEM;
 
 
-        if (wl->bss_type == BSS_TYPE_IBSS) {
+        if (wlvif->bss_type == BSS_TYPE_IBSS) {
                 size = sizeof(struct wl12xx_null_data_template);
                 ptr = NULL;
         } else {
-                skb = ieee80211_nullfunc_get(wl->hw, wl->vif);
+                skb = ieee80211_nullfunc_get(wl->hw,
+                                             wl12xx_wlvif_to_vif(wlvif));
                 if (!skb)
                         goto out;
                 size = skb->len;
@@ -1050,7 +1083,7 @@ int wl1271_cmd_build_null_data(struct wl1271 *wl)
         }
 
         ret = wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, ptr, size, 0,
-                                      wl->basic_rate);
+                                      wlvif->basic_rate);
 
 out:
         dev_kfree_skb(skb);
@@ -1061,19 +1094,21 @@ out:
 
 }
 
-int wl1271_cmd_build_klv_null_data(struct wl1271 *wl)
+int wl12xx_cmd_build_klv_null_data(struct wl1271 *wl,
+                                   struct wl12xx_vif *wlvif)
 {
+        struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
         struct sk_buff *skb = NULL;
         int ret = -ENOMEM;
 
-        skb = ieee80211_nullfunc_get(wl->hw, wl->vif);
+        skb = ieee80211_nullfunc_get(wl->hw, vif);
         if (!skb)
                 goto out;
 
         ret = wl1271_cmd_template_set(wl, CMD_TEMPL_KLV,
                                       skb->data, skb->len,
                                       CMD_TEMPL_KLV_IDX_NULL_DATA,
-                                      wl->basic_rate);
+                                      wlvif->basic_rate);
 
 out:
         dev_kfree_skb(skb);
@@ -1084,32 +1119,35 @@ out:
 
 }
 
-int wl1271_cmd_build_ps_poll(struct wl1271 *wl, u16 aid)
+int wl1271_cmd_build_ps_poll(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                             u16 aid)
 {
+        struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
         struct sk_buff *skb;
         int ret = 0;
 
-        skb = ieee80211_pspoll_get(wl->hw, wl->vif);
+        skb = ieee80211_pspoll_get(wl->hw, vif);
         if (!skb)
                 goto out;
 
         ret = wl1271_cmd_template_set(wl, CMD_TEMPL_PS_POLL, skb->data,
-                                      skb->len, 0, wl->basic_rate_set);
+                                      skb->len, 0, wlvif->basic_rate_set);
 
 out:
         dev_kfree_skb(skb);
         return ret;
 }
 
-int wl1271_cmd_build_probe_req(struct wl1271 *wl,
+int wl1271_cmd_build_probe_req(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                                const u8 *ssid, size_t ssid_len,
                                const u8 *ie, size_t ie_len, u8 band)
 {
+        struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
         struct sk_buff *skb;
         int ret;
         u32 rate;
 
-        skb = ieee80211_probereq_get(wl->hw, wl->vif, ssid, ssid_len,
+        skb = ieee80211_probereq_get(wl->hw, vif, ssid, ssid_len,
                                      ie, ie_len);
         if (!skb) {
                 ret = -ENOMEM;
@@ -1118,7 +1156,7 @@ int wl1271_cmd_build_probe_req(struct wl1271 *wl,
 
         wl1271_dump(DEBUG_SCAN, "PROBE REQ: ", skb->data, skb->len);
 
-        rate = wl1271_tx_min_rate_get(wl, wl->bitrate_masks[band]);
+        rate = wl1271_tx_min_rate_get(wl, wlvif->bitrate_masks[band]);
         if (band == IEEE80211_BAND_2GHZ)
                 ret = wl1271_cmd_template_set(wl, CMD_TEMPL_CFG_PROBE_REQ_2_4,
                                               skb->data, skb->len, 0, rate);
@@ -1132,20 +1170,22 @@ out:
 }
 
 struct sk_buff *wl1271_cmd_build_ap_probe_req(struct wl1271 *wl,
+                                              struct wl12xx_vif *wlvif,
                                               struct sk_buff *skb)
 {
+        struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
         int ret;
         u32 rate;
 
         if (!skb)
-                skb = ieee80211_ap_probereq_get(wl->hw, wl->vif);
+                skb = ieee80211_ap_probereq_get(wl->hw, vif);
         if (!skb)
                 goto out;
 
         wl1271_dump(DEBUG_SCAN, "AP PROBE REQ: ", skb->data, skb->len);
 
-        rate = wl1271_tx_min_rate_get(wl, wl->bitrate_masks[wl->band]);
-        if (wl->band == IEEE80211_BAND_2GHZ)
+        rate = wl1271_tx_min_rate_get(wl, wlvif->bitrate_masks[wlvif->band]);
+        if (wlvif->band == IEEE80211_BAND_2GHZ)
                 ret = wl1271_cmd_template_set(wl, CMD_TEMPL_CFG_PROBE_REQ_2_4,
                                               skb->data, skb->len, 0, rate);
         else
@@ -1159,9 +1199,11 @@ out:
         return skb;
 }
 
-int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, __be32 ip_addr)
+int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                             __be32 ip_addr)
 {
         int ret;
+        struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
         struct wl12xx_arp_rsp_template tmpl;
         struct ieee80211_hdr_3addr *hdr;
         struct arphdr *arp_hdr;
@@ -1173,8 +1215,8 @@ int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, __be32 ip_addr)
         hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_DATA |
                                          IEEE80211_STYPE_DATA |
                                          IEEE80211_FCTL_TODS);
-        memcpy(hdr->addr1, wl->vif->bss_conf.bssid, ETH_ALEN);
-        memcpy(hdr->addr2, wl->vif->addr, ETH_ALEN);
+        memcpy(hdr->addr1, vif->bss_conf.bssid, ETH_ALEN);
+        memcpy(hdr->addr2, vif->addr, ETH_ALEN);
         memset(hdr->addr3, 0xff, ETH_ALEN);
 
         /* llc layer */
@@ -1190,25 +1232,26 @@ int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, __be32 ip_addr)
         arp_hdr->ar_op = cpu_to_be16(ARPOP_REPLY);
 
         /* arp payload */
-        memcpy(tmpl.sender_hw, wl->vif->addr, ETH_ALEN);
+        memcpy(tmpl.sender_hw, vif->addr, ETH_ALEN);
         tmpl.sender_ip = ip_addr;
 
         ret = wl1271_cmd_template_set(wl, CMD_TEMPL_ARP_RSP,
                                       &tmpl, sizeof(tmpl), 0,
-                                      wl->basic_rate);
+                                      wlvif->basic_rate);
 
         return ret;
 }
 
-int wl1271_build_qos_null_data(struct wl1271 *wl)
+int wl1271_build_qos_null_data(struct wl1271 *wl, struct ieee80211_vif *vif)
 {
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         struct ieee80211_qos_hdr template;
 
         memset(&template, 0, sizeof(template));
 
-        memcpy(template.addr1, wl->bssid, ETH_ALEN);
-        memcpy(template.addr2, wl->mac_addr, ETH_ALEN);
-        memcpy(template.addr3, wl->bssid, ETH_ALEN);
+        memcpy(template.addr1, vif->bss_conf.bssid, ETH_ALEN);
+        memcpy(template.addr2, vif->addr, ETH_ALEN);
+        memcpy(template.addr3, vif->bss_conf.bssid, ETH_ALEN);
 
         template.frame_control = cpu_to_le16(IEEE80211_FTYPE_DATA |
                                              IEEE80211_STYPE_QOS_NULLFUNC |
@@ -1219,7 +1262,7 @@ int wl1271_build_qos_null_data(struct wl1271 *wl)
 
         return wl1271_cmd_template_set(wl, CMD_TEMPL_QOS_NULL_DATA, &template,
                                        sizeof(template), 0,
-                                       wl->basic_rate);
+                                       wlvif->basic_rate);
 }
 
 int wl12xx_cmd_set_default_wep_key(struct wl1271 *wl, u8 id, u8 hlid)
@@ -1253,7 +1296,8 @@ out:
         return ret;
 }
 
-int wl1271_cmd_set_sta_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
+int wl1271_cmd_set_sta_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                       u16 action, u8 id, u8 key_type,
                        u8 key_size, const u8 *key, const u8 *addr,
                        u32 tx_seq_32, u16 tx_seq_16)
 {
@@ -1261,7 +1305,7 @@ int wl1271_cmd_set_sta_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
         int ret = 0;
 
         /* hlid might have already been deleted */
-        if (wl->sta_hlid == WL12XX_INVALID_LINK_ID)
+        if (wlvif->sta.hlid == WL12XX_INVALID_LINK_ID)
                 return 0;
 
         cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
@@ -1270,7 +1314,7 @@ int wl1271_cmd_set_sta_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
                 goto out;
         }
 
-        cmd->hlid = wl->sta_hlid;
+        cmd->hlid = wlvif->sta.hlid;
 
         if (key_type == KEY_WEP)
                 cmd->lid_key_type = WEP_DEFAULT_LID_TYPE;
@@ -1321,9 +1365,10 @@ out:
  * TODO: merge with sta/ibss into 1 set_key function.
  * note there are slight diffs
  */
-int wl1271_cmd_set_ap_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
-                        u8 key_size, const u8 *key, u8 hlid, u32 tx_seq_32,
-                        u16 tx_seq_16)
+int wl1271_cmd_set_ap_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                          u16 action, u8 id, u8 key_type,
+                          u8 key_size, const u8 *key, u8 hlid, u32 tx_seq_32,
+                          u16 tx_seq_16)
 {
         struct wl1271_cmd_set_keys *cmd;
         int ret = 0;
@@ -1333,7 +1378,7 @@ int wl1271_cmd_set_ap_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
         if (!cmd)
                 return -ENOMEM;
 
-        if (hlid == wl->ap_bcast_hlid) {
+        if (hlid == wlvif->ap.bcast_hlid) {
                 if (key_type == KEY_WEP)
                         lid_type = WEP_DEFAULT_LID_TYPE;
                 else
@@ -1411,7 +1456,8 @@ out:
         return ret;
 }
 
-int wl12xx_cmd_add_peer(struct wl1271 *wl, struct ieee80211_sta *sta, u8 hlid)
+int wl12xx_cmd_add_peer(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                        struct ieee80211_sta *sta, u8 hlid)
 {
         struct wl12xx_cmd_add_peer *cmd;
         int i, ret;
@@ -1438,13 +1484,13 @@ int wl12xx_cmd_add_peer(struct wl1271 *wl, struct ieee80211_sta *sta, u8 hlid)
                 else
                         cmd->psd_type[i] = WL1271_PSD_LEGACY;
 
-        sta_rates = sta->supp_rates[wl->band];
+        sta_rates = sta->supp_rates[wlvif->band];
         if (sta->ht_cap.ht_supported)
                 sta_rates |= sta->ht_cap.mcs.rx_mask[0] << HW_HT_RATES_OFFSET;
 
         cmd->supported_rates =
                 cpu_to_le32(wl1271_tx_enabled_rates_get(wl, sta_rates,
-                                                        wl->band));
+                                                        wlvif->band));
 
         wl1271_debug(DEBUG_CMD, "new peer rates=0x%x queues=0x%x",
                      cmd->supported_rates, sta->uapsd_queues);
@@ -1584,12 +1630,13 @@ out:
         return ret;
 }
 
-static int wl12xx_cmd_roc(struct wl1271 *wl, u8 role_id)
+static int wl12xx_cmd_roc(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                          u8 role_id)
 {
         struct wl12xx_cmd_roc *cmd;
         int ret = 0;
 
-        wl1271_debug(DEBUG_CMD, "cmd roc %d (%d)", wl->channel, role_id);
+        wl1271_debug(DEBUG_CMD, "cmd roc %d (%d)", wlvif->channel, role_id);
 
         if (WARN_ON(role_id == WL12XX_INVALID_ROLE_ID))
                 return -EINVAL;
@@ -1601,8 +1648,8 @@ static int wl12xx_cmd_roc(struct wl1271 *wl, u8 role_id)
         }
 
         cmd->role_id = role_id;
-        cmd->channel = wl->channel;
-        switch (wl->band) {
+        cmd->channel = wlvif->channel;
+        switch (wlvif->band) {
         case IEEE80211_BAND_2GHZ:
                 cmd->band = RADIO_BAND_2_4GHZ;
                 break;
@@ -1610,7 +1657,7 @@ static int wl12xx_cmd_roc(struct wl1271 *wl, u8 role_id)
                 cmd->band = RADIO_BAND_5GHZ;
                 break;
         default:
-                wl1271_error("roc - unknown band: %d", (int)wl->band);
+                wl1271_error("roc - unknown band: %d", (int)wlvif->band);
                 ret = -EINVAL;
                 goto out_free;
         }
@@ -1657,14 +1704,14 @@ out:
         return ret;
 }
 
-int wl12xx_roc(struct wl1271 *wl, u8 role_id)
+int wl12xx_roc(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 role_id)
 {
         int ret = 0;
 
         if (WARN_ON(test_bit(role_id, wl->roc_map)))
                 return 0;
 
-        ret = wl12xx_cmd_roc(wl, role_id);
+        ret = wl12xx_cmd_roc(wl, wlvif, role_id);
         if (ret < 0)
                 goto out;
 
@@ -1753,3 +1800,50 @@ out_free:
 out:
         return ret;
 }
+
+/* start dev role and roc on its channel */
+int wl12xx_start_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif)
+{
+        int ret;
+
+        if (WARN_ON(!(wlvif->bss_type == BSS_TYPE_STA_BSS ||
+                      wlvif->bss_type == BSS_TYPE_IBSS)))
+                return -EINVAL;
+
+        ret = wl12xx_cmd_role_start_dev(wl, wlvif);
+        if (ret < 0)
+                goto out;
+
+        ret = wl12xx_roc(wl, wlvif, wlvif->dev_role_id);
+        if (ret < 0)
+                goto out_stop;
+
+        return 0;
+
+out_stop:
+        wl12xx_cmd_role_stop_dev(wl, wlvif);
+out:
+        return ret;
+}
+
+/* croc dev hlid, and stop the role */
+int wl12xx_stop_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif)
+{
+        int ret;
+
+        if (WARN_ON(!(wlvif->bss_type == BSS_TYPE_STA_BSS ||
+                      wlvif->bss_type == BSS_TYPE_IBSS)))
+                return -EINVAL;
+
+        if (test_bit(wlvif->dev_role_id, wl->roc_map)) {
+                ret = wl12xx_croc(wl, wlvif->dev_role_id);
+                if (ret < 0)
+                        goto out;
+        }
+
+        ret = wl12xx_cmd_role_stop_dev(wl, wlvif);
+        if (ret < 0)
+                goto out;
+out:
+        return ret;
+}
diff --git a/drivers/net/wireless/wl12xx/cmd.h b/drivers/net/wireless/wl12xx/cmd.h
index b7bd42769aa7..3f7d0b93c24d 100644
--- a/drivers/net/wireless/wl12xx/cmd.h
+++ b/drivers/net/wireless/wl12xx/cmd.h
@@ -36,45 +36,54 @@ int wl128x_cmd_general_parms(struct wl1271 *wl);
 int wl1271_cmd_radio_parms(struct wl1271 *wl);
 int wl128x_cmd_radio_parms(struct wl1271 *wl);
 int wl1271_cmd_ext_radio_parms(struct wl1271 *wl);
-int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 role_type, u8 *role_id);
+int wl12xx_cmd_role_enable(struct wl1271 *wl, u8 *addr, u8 role_type,
+                           u8 *role_id);
 int wl12xx_cmd_role_disable(struct wl1271 *wl, u8 *role_id);
-int wl12xx_cmd_role_start_dev(struct wl1271 *wl);
-int wl12xx_cmd_role_stop_dev(struct wl1271 *wl);
-int wl12xx_cmd_role_start_sta(struct wl1271 *wl);
-int wl12xx_cmd_role_stop_sta(struct wl1271 *wl);
-int wl12xx_cmd_role_start_ap(struct wl1271 *wl);
-int wl12xx_cmd_role_stop_ap(struct wl1271 *wl);
-int wl12xx_cmd_role_start_ibss(struct wl1271 *wl);
+int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif);
+int wl12xx_cmd_role_stop_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif);
+int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif);
+int wl12xx_cmd_role_stop_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif);
+int wl12xx_cmd_role_start_ibss(struct wl1271 *wl, struct wl12xx_vif *wlvif);
+int wl12xx_start_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif);
+int wl12xx_stop_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 int wl1271_cmd_test(struct wl1271 *wl, void *buf, size_t buf_len, u8 answer);
 int wl1271_cmd_interrogate(struct wl1271 *wl, u16 id, void *buf, size_t len);
 int wl1271_cmd_configure(struct wl1271 *wl, u16 id, void *buf, size_t len);
 int wl1271_cmd_data_path(struct wl1271 *wl, bool enable);
-int wl1271_cmd_ps_mode(struct wl1271 *wl, u8 ps_mode);
+int wl1271_cmd_ps_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                       u8 ps_mode);
 int wl1271_cmd_read_memory(struct wl1271 *wl, u32 addr, void *answer,
                            size_t len);
 int wl1271_cmd_template_set(struct wl1271 *wl, u16 template_id,
                             void *buf, size_t buf_len, int index, u32 rates);
-int wl1271_cmd_build_null_data(struct wl1271 *wl);
-int wl1271_cmd_build_ps_poll(struct wl1271 *wl, u16 aid);
-int wl1271_cmd_build_probe_req(struct wl1271 *wl,
+int wl12xx_cmd_build_null_data(struct wl1271 *wl, struct wl12xx_vif *wlvif);
+int wl1271_cmd_build_ps_poll(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                             u16 aid);
+int wl1271_cmd_build_probe_req(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                                const u8 *ssid, size_t ssid_len,
                                const u8 *ie, size_t ie_len, u8 band);
 struct sk_buff *wl1271_cmd_build_ap_probe_req(struct wl1271 *wl,
+                                              struct wl12xx_vif *wlvif,
                                               struct sk_buff *skb);
-int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, __be32 ip_addr);
-int wl1271_build_qos_null_data(struct wl1271 *wl);
-int wl1271_cmd_build_klv_null_data(struct wl1271 *wl);
+int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                             __be32 ip_addr);
+int wl1271_build_qos_null_data(struct wl1271 *wl, struct ieee80211_vif *vif);
+int wl12xx_cmd_build_klv_null_data(struct wl1271 *wl,
+                                   struct wl12xx_vif *wlvif);
 int wl12xx_cmd_set_default_wep_key(struct wl1271 *wl, u8 id, u8 hlid);
-int wl1271_cmd_set_sta_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
+int wl1271_cmd_set_sta_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                           u16 action, u8 id, u8 key_type,
                            u8 key_size, const u8 *key, const u8 *addr,
                            u32 tx_seq_32, u16 tx_seq_16);
-int wl1271_cmd_set_ap_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
+int wl1271_cmd_set_ap_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                          u16 action, u8 id, u8 key_type,
                           u8 key_size, const u8 *key, u8 hlid, u32 tx_seq_32,
                           u16 tx_seq_16);
 int wl12xx_cmd_set_peer_state(struct wl1271 *wl, u8 hlid);
-int wl12xx_roc(struct wl1271 *wl, u8 role_id);
+int wl12xx_roc(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 role_id);
 int wl12xx_croc(struct wl1271 *wl, u8 role_id);
-int wl12xx_cmd_add_peer(struct wl1271 *wl, struct ieee80211_sta *sta, u8 hlid);
+int wl12xx_cmd_add_peer(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                        struct ieee80211_sta *sta, u8 hlid);
 int wl12xx_cmd_remove_peer(struct wl1271 *wl, u8 hlid);
 int wl12xx_cmd_config_fwlog(struct wl1271 *wl);
 int wl12xx_cmd_start_fwlog(struct wl1271 *wl);
@@ -82,6 +91,9 @@ int wl12xx_cmd_stop_fwlog(struct wl1271 *wl);
 int wl12xx_cmd_channel_switch(struct wl1271 *wl,
                               struct ieee80211_channel_switch *ch_switch);
 int wl12xx_cmd_stop_channel_switch(struct wl1271 *wl);
+int wl12xx_allocate_link(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                         u8 *hlid);
+void wl12xx_free_link(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 *hlid);
 
 enum wl1271_commands {
         CMD_INTERROGATE     = 1,    /*use this to read information elements*/
diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/wl12xx/conf.h
index 04bb8fbf93f9..1bcfb017058d 100644
--- a/drivers/net/wireless/wl12xx/conf.h
+++ b/drivers/net/wireless/wl12xx/conf.h
@@ -440,6 +440,10 @@ struct conf_rx_settings {
         CONF_HW_BIT_RATE_36MBPS | CONF_HW_BIT_RATE_48MBPS |      \
         CONF_HW_BIT_RATE_54MBPS)
 
+#define CONF_TX_CCK_RATES  (CONF_HW_BIT_RATE_1MBPS |            \
+        CONF_HW_BIT_RATE_2MBPS | CONF_HW_BIT_RATE_5_5MBPS |     \
+        CONF_HW_BIT_RATE_11MBPS)
+
 #define CONF_TX_OFDM_RATES (CONF_HW_BIT_RATE_6MBPS |             \
         CONF_HW_BIT_RATE_12MBPS | CONF_HW_BIT_RATE_24MBPS |      \
         CONF_HW_BIT_RATE_36MBPS | CONF_HW_BIT_RATE_48MBPS |      \
diff --git a/drivers/net/wireless/wl12xx/debug.h b/drivers/net/wireless/wl12xx/debug.h
new file mode 100644
index 000000000000..b85fd8c41e8f
--- /dev/null
+++ b/drivers/net/wireless/wl12xx/debug.h
@@ -0,0 +1,101 @@
+/*
+ * This file is part of wl12xx
+ *
+ * Copyright (C) 2011 Texas Instruments. All rights reserved.
+ * Copyright (C) 2008-2009 Nokia Corporation
+ *
+ * Contact: Luciano Coelho <coelho@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 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 St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __DEBUG_H__
+#define __DEBUG_H__
+
+#include <linux/bitops.h>
+#include <linux/printk.h>
+
+#define DRIVER_NAME "wl12xx"
+#define DRIVER_PREFIX DRIVER_NAME ": "
+
+enum {
+        DEBUG_NONE      = 0,
+        DEBUG_IRQ       = BIT(0),
+        DEBUG_SPI       = BIT(1),
+        DEBUG_BOOT      = BIT(2),
+        DEBUG_MAILBOX   = BIT(3),
+        DEBUG_TESTMODE  = BIT(4),
+        DEBUG_EVENT     = BIT(5),
+        DEBUG_TX        = BIT(6),
+        DEBUG_RX        = BIT(7),
+        DEBUG_SCAN      = BIT(8),
+        DEBUG_CRYPT     = BIT(9),
+        DEBUG_PSM       = BIT(10),
+        DEBUG_MAC80211  = BIT(11),
+        DEBUG_CMD       = BIT(12),
+        DEBUG_ACX       = BIT(13),
+        DEBUG_SDIO      = BIT(14),
+        DEBUG_FILTERS   = BIT(15),
+        DEBUG_ADHOC     = BIT(16),
+        DEBUG_AP        = BIT(17),
+        DEBUG_MASTER    = (DEBUG_ADHOC | DEBUG_AP),
+        DEBUG_ALL       = ~0,
+};
+
+extern u32 wl12xx_debug_level;
+
+#define DEBUG_DUMP_LIMIT 1024
+
+#define wl1271_error(fmt, arg...) \
+        pr_err(DRIVER_PREFIX "ERROR " fmt "\n", ##arg)
+
+#define wl1271_warning(fmt, arg...) \
+        pr_warning(DRIVER_PREFIX "WARNING " fmt "\n", ##arg)
+
+#define wl1271_notice(fmt, arg...) \
+        pr_info(DRIVER_PREFIX fmt "\n", ##arg)
+
+#define wl1271_info(fmt, arg...) \
+        pr_info(DRIVER_PREFIX fmt "\n", ##arg)
+
+#define wl1271_debug(level, fmt, arg...) \
+        do { \
+                if (level & wl12xx_debug_level) \
+                        pr_debug(DRIVER_PREFIX fmt "\n", ##arg); \
+        } while (0)
+
+/* TODO: use pr_debug_hex_dump when it becomes available */
+#define wl1271_dump(level, prefix, buf, len)    \
+        do { \
+                if (level & wl12xx_debug_level) \
+                        print_hex_dump(KERN_DEBUG, DRIVER_PREFIX prefix, \
+                                       DUMP_PREFIX_OFFSET, 16, 1,       \
+                                       buf,                             \
+                                       min_t(size_t, len, DEBUG_DUMP_LIMIT), \
+                                       0);                              \
+        } while (0)
+
+#define wl1271_dump_ascii(level, prefix, buf, len)      \
+        do { \
+                if (level & wl12xx_debug_level) \
+                        print_hex_dump(KERN_DEBUG, DRIVER_PREFIX prefix, \
+                                       DUMP_PREFIX_OFFSET, 16, 1,       \
+                                       buf,                             \
+                                       min_t(size_t, len, DEBUG_DUMP_LIMIT), \
+                                       true);                           \
+        } while (0)
+
+#endif /* __DEBUG_H__ */
diff --git a/drivers/net/wireless/wl12xx/debugfs.c b/drivers/net/wireless/wl12xx/debugfs.c
index 3999fd528302..15eb3a9c30ca 100644
--- a/drivers/net/wireless/wl12xx/debugfs.c
+++ b/drivers/net/wireless/wl12xx/debugfs.c
@@ -27,6 +27,7 @@
 #include <linux/slab.h>
 
 #include "wl12xx.h"
+#include "debug.h"
 #include "acx.h"
 #include "ps.h"
 #include "io.h"
@@ -316,12 +317,19 @@ static ssize_t driver_state_read(struct file *file, char __user *user_buf,
 {
         struct wl1271 *wl = file->private_data;
         int res = 0;
-        char buf[1024];
+        ssize_t ret;
+        char *buf;
+
+#define DRIVER_STATE_BUF_LEN 1024
+
+        buf = kmalloc(DRIVER_STATE_BUF_LEN, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
 
         mutex_lock(&wl->mutex);
 
 #define DRIVER_STATE_PRINT(x, fmt)   \
-        (res += scnprintf(buf + res, sizeof(buf) - res,\
+        (res += scnprintf(buf + res, DRIVER_STATE_BUF_LEN - res,\
                           #x " = " fmt "\n", wl->x))
 
 #define DRIVER_STATE_PRINT_LONG(x) DRIVER_STATE_PRINT(x, "%ld")
@@ -346,29 +354,14 @@ static ssize_t driver_state_read(struct file *file, char __user *user_buf,
         DRIVER_STATE_PRINT_INT(tx_results_count);
         DRIVER_STATE_PRINT_LHEX(flags);
         DRIVER_STATE_PRINT_INT(tx_blocks_freed);
-        DRIVER_STATE_PRINT_INT(tx_security_last_seq_lsb);
         DRIVER_STATE_PRINT_INT(rx_counter);
-        DRIVER_STATE_PRINT_INT(session_counter);
         DRIVER_STATE_PRINT_INT(state);
-        DRIVER_STATE_PRINT_INT(bss_type);
         DRIVER_STATE_PRINT_INT(channel);
-        DRIVER_STATE_PRINT_HEX(rate_set);
-        DRIVER_STATE_PRINT_HEX(basic_rate_set);
-        DRIVER_STATE_PRINT_HEX(basic_rate);
         DRIVER_STATE_PRINT_INT(band);
-        DRIVER_STATE_PRINT_INT(beacon_int);
-        DRIVER_STATE_PRINT_INT(psm_entry_retry);
-        DRIVER_STATE_PRINT_INT(ps_poll_failures);
         DRIVER_STATE_PRINT_INT(power_level);
-        DRIVER_STATE_PRINT_INT(rssi_thold);
-        DRIVER_STATE_PRINT_INT(last_rssi_event);
         DRIVER_STATE_PRINT_INT(sg_enabled);
         DRIVER_STATE_PRINT_INT(enable_11a);
         DRIVER_STATE_PRINT_INT(noise);
-        DRIVER_STATE_PRINT_LHEX(ap_hlid_map[0]);
-        DRIVER_STATE_PRINT_INT(last_tx_hlid);
-        DRIVER_STATE_PRINT_INT(ba_support);
-        DRIVER_STATE_PRINT_HEX(ba_rx_bitmap);
         DRIVER_STATE_PRINT_HEX(ap_fw_ps_map);
         DRIVER_STATE_PRINT_LHEX(ap_ps_map);
         DRIVER_STATE_PRINT_HEX(quirks);
@@ -387,10 +380,13 @@ static ssize_t driver_state_read(struct file *file, char __user *user_buf,
 #undef DRIVER_STATE_PRINT_LHEX
 #undef DRIVER_STATE_PRINT_STR
 #undef DRIVER_STATE_PRINT
+#undef DRIVER_STATE_BUF_LEN
 
         mutex_unlock(&wl->mutex);
 
-        return simple_read_from_buffer(user_buf, count, ppos, buf, res);
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, res);
+        kfree(buf);
+        return ret;
 }
 
 static const struct file_operations driver_state_ops = {
@@ -399,6 +395,115 @@ static const struct file_operations driver_state_ops = {
         .llseek = default_llseek,
 };
 
+static ssize_t vifs_state_read(struct file *file, char __user *user_buf,
+                                 size_t count, loff_t *ppos)
+{
+        struct wl1271 *wl = file->private_data;
+        struct wl12xx_vif *wlvif;
+        int ret, res = 0;
+        const int buf_size = 4096;
+        char *buf;
+        char tmp_buf[64];
+
+        buf = kzalloc(buf_size, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        mutex_lock(&wl->mutex);
+
+#define VIF_STATE_PRINT(x, fmt)                         \
+        (res += scnprintf(buf + res, buf_size - res,    \
+                          #x " = " fmt "\n", wlvif->x))
+
+#define VIF_STATE_PRINT_LONG(x)  VIF_STATE_PRINT(x, "%ld")
+#define VIF_STATE_PRINT_INT(x)   VIF_STATE_PRINT(x, "%d")
+#define VIF_STATE_PRINT_STR(x)   VIF_STATE_PRINT(x, "%s")
+#define VIF_STATE_PRINT_LHEX(x)  VIF_STATE_PRINT(x, "0x%lx")
+#define VIF_STATE_PRINT_LLHEX(x) VIF_STATE_PRINT(x, "0x%llx")
+#define VIF_STATE_PRINT_HEX(x)   VIF_STATE_PRINT(x, "0x%x")
+
+#define VIF_STATE_PRINT_NSTR(x, len)                            \
+        do {                                                    \
+                memset(tmp_buf, 0, sizeof(tmp_buf));            \
+                memcpy(tmp_buf, wlvif->x,                       \
+                       min_t(u8, len, sizeof(tmp_buf) - 1));    \
+                res += scnprintf(buf + res, buf_size - res,     \
+                                 #x " = %s\n", tmp_buf);        \
+        } while (0)
+
+        wl12xx_for_each_wlvif(wl, wlvif) {
+                VIF_STATE_PRINT_INT(role_id);
+                VIF_STATE_PRINT_INT(bss_type);
+                VIF_STATE_PRINT_LHEX(flags);
+                VIF_STATE_PRINT_INT(p2p);
+                VIF_STATE_PRINT_INT(dev_role_id);
+                VIF_STATE_PRINT_INT(dev_hlid);
+
+                if (wlvif->bss_type == BSS_TYPE_STA_BSS ||
+                    wlvif->bss_type == BSS_TYPE_IBSS) {
+                        VIF_STATE_PRINT_INT(sta.hlid);
+                        VIF_STATE_PRINT_INT(sta.ba_rx_bitmap);
+                        VIF_STATE_PRINT_INT(sta.basic_rate_idx);
+                        VIF_STATE_PRINT_INT(sta.ap_rate_idx);
+                        VIF_STATE_PRINT_INT(sta.p2p_rate_idx);
+                } else {
+                        VIF_STATE_PRINT_INT(ap.global_hlid);
+                        VIF_STATE_PRINT_INT(ap.bcast_hlid);
+                        VIF_STATE_PRINT_LHEX(ap.sta_hlid_map[0]);
+                        VIF_STATE_PRINT_INT(ap.mgmt_rate_idx);
+                        VIF_STATE_PRINT_INT(ap.bcast_rate_idx);
+                        VIF_STATE_PRINT_INT(ap.ucast_rate_idx[0]);
+                        VIF_STATE_PRINT_INT(ap.ucast_rate_idx[1]);
+                        VIF_STATE_PRINT_INT(ap.ucast_rate_idx[2]);
+                        VIF_STATE_PRINT_INT(ap.ucast_rate_idx[3]);
+                }
+                VIF_STATE_PRINT_INT(last_tx_hlid);
+                VIF_STATE_PRINT_LHEX(links_map[0]);
+                VIF_STATE_PRINT_NSTR(ssid, wlvif->ssid_len);
+                VIF_STATE_PRINT_INT(band);
+                VIF_STATE_PRINT_INT(channel);
+                VIF_STATE_PRINT_HEX(bitrate_masks[0]);
+                VIF_STATE_PRINT_HEX(bitrate_masks[1]);
+                VIF_STATE_PRINT_HEX(basic_rate_set);
+                VIF_STATE_PRINT_HEX(basic_rate);
+                VIF_STATE_PRINT_HEX(rate_set);
+                VIF_STATE_PRINT_INT(beacon_int);
+                VIF_STATE_PRINT_INT(default_key);
+                VIF_STATE_PRINT_INT(aid);
+                VIF_STATE_PRINT_INT(session_counter);
+                VIF_STATE_PRINT_INT(ps_poll_failures);
+                VIF_STATE_PRINT_INT(psm_entry_retry);
+                VIF_STATE_PRINT_INT(power_level);
+                VIF_STATE_PRINT_INT(rssi_thold);
+                VIF_STATE_PRINT_INT(last_rssi_event);
+                VIF_STATE_PRINT_INT(ba_support);
+                VIF_STATE_PRINT_INT(ba_allowed);
+                VIF_STATE_PRINT_LLHEX(tx_security_seq);
+                VIF_STATE_PRINT_INT(tx_security_last_seq_lsb);
+        }
+
+#undef VIF_STATE_PRINT_INT
+#undef VIF_STATE_PRINT_LONG
+#undef VIF_STATE_PRINT_HEX
+#undef VIF_STATE_PRINT_LHEX
+#undef VIF_STATE_PRINT_LLHEX
+#undef VIF_STATE_PRINT_STR
+#undef VIF_STATE_PRINT_NSTR
+#undef VIF_STATE_PRINT
+
+        mutex_unlock(&wl->mutex);
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, res);
+        kfree(buf);
+        return ret;
+}
+
+static const struct file_operations vifs_state_ops = {
+        .read = vifs_state_read,
+        .open = wl1271_open_file_generic,
+        .llseek = default_llseek,
+};
+
 static ssize_t dtim_interval_read(struct file *file, char __user *user_buf,
                                   size_t count, loff_t *ppos)
 {
@@ -520,6 +625,7 @@ static ssize_t rx_streaming_interval_write(struct file *file,
                            size_t count, loff_t *ppos)
 {
         struct wl1271 *wl = file->private_data;
+        struct wl12xx_vif *wlvif;
         unsigned long value;
         int ret;
 
@@ -543,7 +649,9 @@ static ssize_t rx_streaming_interval_write(struct file *file,
         if (ret < 0)
                 goto out;
 
-        wl1271_recalc_rx_streaming(wl);
+        wl12xx_for_each_wlvif_sta(wl, wlvif) {
+                wl1271_recalc_rx_streaming(wl, wlvif);
+        }
 
         wl1271_ps_elp_sleep(wl);
 out:
@@ -572,6 +680,7 @@ static ssize_t rx_streaming_always_write(struct file *file,
                            size_t count, loff_t *ppos)
 {
         struct wl1271 *wl = file->private_data;
+        struct wl12xx_vif *wlvif;
         unsigned long value;
         int ret;
 
@@ -595,7 +704,9 @@ static ssize_t rx_streaming_always_write(struct file *file,
         if (ret < 0)
                 goto out;
 
-        wl1271_recalc_rx_streaming(wl);
+        wl12xx_for_each_wlvif_sta(wl, wlvif) {
+                wl1271_recalc_rx_streaming(wl, wlvif);
+        }
 
         wl1271_ps_elp_sleep(wl);
 out:
@@ -624,6 +735,7 @@ static ssize_t beacon_filtering_write(struct file *file,
                                       size_t count, loff_t *ppos)
 {
         struct wl1271 *wl = file->private_data;
+        struct wl12xx_vif *wlvif;
         char buf[10];
         size_t len;
         unsigned long value;
@@ -646,7 +758,9 @@ static ssize_t beacon_filtering_write(struct file *file,
         if (ret < 0)
                 goto out;
 
-        ret = wl1271_acx_beacon_filter_opt(wl, !!value);
+        wl12xx_for_each_wlvif(wl, wlvif) {
+                ret = wl1271_acx_beacon_filter_opt(wl, wlvif, !!value);
+        }
 
         wl1271_ps_elp_sleep(wl);
 out:
@@ -770,6 +884,7 @@ static int wl1271_debugfs_add_files(struct wl1271 *wl,
         DEBUGFS_ADD(gpio_power, rootdir);
         DEBUGFS_ADD(start_recovery, rootdir);
         DEBUGFS_ADD(driver_state, rootdir);
+        DEBUGFS_ADD(vifs_state, rootdir);
         DEBUGFS_ADD(dtim_interval, rootdir);
         DEBUGFS_ADD(beacon_interval, rootdir);
         DEBUGFS_ADD(beacon_filtering, rootdir);
diff --git a/drivers/net/wireless/wl12xx/event.c b/drivers/net/wireless/wl12xx/event.c
index 674ad2a9e409..00ce794eebae 100644
--- a/drivers/net/wireless/wl12xx/event.c
+++ b/drivers/net/wireless/wl12xx/event.c
@@ -22,6 +22,7 @@
  */
 
 #include "wl12xx.h"
+#include "debug.h"
 #include "reg.h"
 #include "io.h"
 #include "event.h"
@@ -31,12 +32,16 @@
 
 void wl1271_pspoll_work(struct work_struct *work)
 {
+        struct ieee80211_vif *vif;
+        struct wl12xx_vif *wlvif;
         struct delayed_work *dwork;
         struct wl1271 *wl;
         int ret;
 
         dwork = container_of(work, struct delayed_work, work);
-        wl = container_of(dwork, struct wl1271, pspoll_work);
+        wlvif = container_of(dwork, struct wl12xx_vif, pspoll_work);
+        vif = container_of((void *)wlvif, struct ieee80211_vif, drv_priv);
+        wl = wlvif->wl;
 
         wl1271_debug(DEBUG_EVENT, "pspoll work");
 
@@ -45,10 +50,10 @@ void wl1271_pspoll_work(struct work_struct *work)
         if (unlikely(wl->state == WL1271_STATE_OFF))
                 goto out;
 
-        if (!test_and_clear_bit(WL1271_FLAG_PSPOLL_FAILURE, &wl->flags))
+        if (!test_and_clear_bit(WLVIF_FLAG_PSPOLL_FAILURE, &wlvif->flags))
                 goto out;
 
-        if (!test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags))
+        if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
                 goto out;
 
         /*
@@ -60,31 +65,33 @@ void wl1271_pspoll_work(struct work_struct *work)
         if (ret < 0)
                 goto out;
 
-        wl1271_ps_set_mode(wl, STATION_POWER_SAVE_MODE, wl->basic_rate, true);
+        wl1271_ps_set_mode(wl, wlvif, STATION_POWER_SAVE_MODE,
+                           wlvif->basic_rate, true);
 
         wl1271_ps_elp_sleep(wl);
 out:
         mutex_unlock(&wl->mutex);
 };
 
-static void wl1271_event_pspoll_delivery_fail(struct wl1271 *wl)
+static void wl1271_event_pspoll_delivery_fail(struct wl1271 *wl,
+                                              struct wl12xx_vif *wlvif)
 {
         int delay = wl->conf.conn.ps_poll_recovery_period;
         int ret;
 
-        wl->ps_poll_failures++;
-        if (wl->ps_poll_failures == 1)
+        wlvif->ps_poll_failures++;
+        if (wlvif->ps_poll_failures == 1)
                 wl1271_info("AP with dysfunctional ps-poll, "
                             "trying to work around it.");
 
         /* force active mode receive data from the AP */
-        if (test_bit(WL1271_FLAG_PSM, &wl->flags)) {
-                ret = wl1271_ps_set_mode(wl, STATION_ACTIVE_MODE,
-                                         wl->basic_rate, true);
+        if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) {
+                ret = wl1271_ps_set_mode(wl, wlvif, STATION_ACTIVE_MODE,
+                                         wlvif->basic_rate, true);
                 if (ret < 0)
                         return;
-                set_bit(WL1271_FLAG_PSPOLL_FAILURE, &wl->flags);
-                ieee80211_queue_delayed_work(wl->hw, &wl->pspoll_work,
+                set_bit(WLVIF_FLAG_PSPOLL_FAILURE, &wlvif->flags);
+                ieee80211_queue_delayed_work(wl->hw, &wlvif->pspoll_work,
                                              msecs_to_jiffies(delay));
         }
 
@@ -97,6 +104,7 @@ static void wl1271_event_pspoll_delivery_fail(struct wl1271 *wl)
 }
 
 static int wl1271_event_ps_report(struct wl1271 *wl,
+                                  struct wl12xx_vif *wlvif,
                                   struct event_mailbox *mbox,
                                   bool *beacon_loss)
 {
@@ -109,41 +117,37 @@ static int wl1271_event_ps_report(struct wl1271 *wl,
         case EVENT_ENTER_POWER_SAVE_FAIL:
                 wl1271_debug(DEBUG_PSM, "PSM entry failed");
 
-                if (!test_bit(WL1271_FLAG_PSM, &wl->flags)) {
+                if (!test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) {
                         /* remain in active mode */
-                        wl->psm_entry_retry = 0;
+                        wlvif->psm_entry_retry = 0;
                         break;
                 }
 
-                if (wl->psm_entry_retry < total_retries) {
-                        wl->psm_entry_retry++;
-                        ret = wl1271_ps_set_mode(wl, STATION_POWER_SAVE_MODE,
-                                                 wl->basic_rate, true);
+                if (wlvif->psm_entry_retry < total_retries) {
+                        wlvif->psm_entry_retry++;
+                        ret = wl1271_ps_set_mode(wl, wlvif,
+                                                 STATION_POWER_SAVE_MODE,
+                                                 wlvif->basic_rate, true);
                 } else {
                         wl1271_info("No ack to nullfunc from AP.");
-                        wl->psm_entry_retry = 0;
+                        wlvif->psm_entry_retry = 0;
                         *beacon_loss = true;
                 }
                 break;
         case EVENT_ENTER_POWER_SAVE_SUCCESS:
-                wl->psm_entry_retry = 0;
-
-                /* enable beacon filtering */
-                ret = wl1271_acx_beacon_filter_opt(wl, true);
-                if (ret < 0)
-                        break;
+                wlvif->psm_entry_retry = 0;
 
                 /*
                  * BET has only a minor effect in 5GHz and masks
                  * channel switch IEs, so we only enable BET on 2.4GHz
                 */
-                if (wl->band == IEEE80211_BAND_2GHZ)
+                if (wlvif->band == IEEE80211_BAND_2GHZ)
                         /* enable beacon early termination */
-                        ret = wl1271_acx_bet_enable(wl, true);
+                        ret = wl1271_acx_bet_enable(wl, wlvif, true);
 
-                if (wl->ps_compl) {
-                        complete(wl->ps_compl);
-                        wl->ps_compl = NULL;
+                if (wlvif->ps_compl) {
+                        complete(wlvif->ps_compl);
+                        wlvif->ps_compl = NULL;
                 }
                 break;
         default:
@@ -154,39 +158,44 @@ static int wl1271_event_ps_report(struct wl1271 *wl,
 }
 
 static void wl1271_event_rssi_trigger(struct wl1271 *wl,
+                                      struct wl12xx_vif *wlvif,
                                       struct event_mailbox *mbox)
 {
+        struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
         enum nl80211_cqm_rssi_threshold_event event;
         s8 metric = mbox->rssi_snr_trigger_metric[0];
 
         wl1271_debug(DEBUG_EVENT, "RSSI trigger metric: %d", metric);
 
-        if (metric <= wl->rssi_thold)
+        if (metric <= wlvif->rssi_thold)
                 event = NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW;
         else
                 event = NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH;
 
-        if (event != wl->last_rssi_event)
-                ieee80211_cqm_rssi_notify(wl->vif, event, GFP_KERNEL);
-        wl->last_rssi_event = event;
+        if (event != wlvif->last_rssi_event)
+                ieee80211_cqm_rssi_notify(vif, event, GFP_KERNEL);
+        wlvif->last_rssi_event = event;
 }
 
-static void wl1271_stop_ba_event(struct wl1271 *wl)
+static void wl1271_stop_ba_event(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
-        if (wl->bss_type != BSS_TYPE_AP_BSS) {
-                if (!wl->ba_rx_bitmap)
+        struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
+
+        if (wlvif->bss_type != BSS_TYPE_AP_BSS) {
+                if (!wlvif->sta.ba_rx_bitmap)
                         return;
-                ieee80211_stop_rx_ba_session(wl->vif, wl->ba_rx_bitmap,
-                                             wl->bssid);
+                ieee80211_stop_rx_ba_session(vif, wlvif->sta.ba_rx_bitmap,
+                                             vif->bss_conf.bssid);
         } else {
-                int i;
+                u8 hlid;
                 struct wl1271_link *lnk;
-                for (i = WL1271_AP_STA_HLID_START; i < AP_MAX_LINKS; i++) {
-                        lnk = &wl->links[i];
-                        if (!wl1271_is_active_sta(wl, i) || !lnk->ba_bitmap)
+                for_each_set_bit(hlid, wlvif->ap.sta_hlid_map,
+                                 WL12XX_MAX_LINKS) {
+                        lnk = &wl->links[hlid];
+                        if (!lnk->ba_bitmap)
                                 continue;
 
-                        ieee80211_stop_rx_ba_session(wl->vif,
+                        ieee80211_stop_rx_ba_session(vif,
                                                      lnk->ba_bitmap,
                                                      lnk->addr);
                 }
@@ -196,14 +205,23 @@ static void wl1271_stop_ba_event(struct wl1271 *wl)
 static void wl12xx_event_soft_gemini_sense(struct wl1271 *wl,
                                                u8 enable)
 {
+        struct ieee80211_vif *vif;
+        struct wl12xx_vif *wlvif;
+
         if (enable) {
                 /* disable dynamic PS when requested by the firmware */
-                ieee80211_disable_dyn_ps(wl->vif);
+                wl12xx_for_each_wlvif_sta(wl, wlvif) {
+                        vif = wl12xx_wlvif_to_vif(wlvif);
+                        ieee80211_disable_dyn_ps(vif);
+                }
                 set_bit(WL1271_FLAG_SOFT_GEMINI, &wl->flags);
         } else {
-                ieee80211_enable_dyn_ps(wl->vif);
                 clear_bit(WL1271_FLAG_SOFT_GEMINI, &wl->flags);
-                wl1271_recalc_rx_streaming(wl);
+                wl12xx_for_each_wlvif_sta(wl, wlvif) {
+                        vif = wl12xx_wlvif_to_vif(wlvif);
+                        ieee80211_enable_dyn_ps(vif);
+                        wl1271_recalc_rx_streaming(wl, wlvif);
+                }
         }
 
 }
@@ -217,10 +235,11 @@ static void wl1271_event_mbox_dump(struct event_mailbox *mbox)
 
 static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)
 {
+        struct ieee80211_vif *vif;
+        struct wl12xx_vif *wlvif;
         int ret;
         u32 vector;
         bool beacon_loss = false;
-        bool is_ap = (wl->bss_type == BSS_TYPE_AP_BSS);
         bool disconnect_sta = false;
         unsigned long sta_bitmap = 0;
 
@@ -234,7 +253,7 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)
                 wl1271_debug(DEBUG_EVENT, "status: 0x%x",
                              mbox->scheduled_scan_status);
 
-                wl1271_scan_stm(wl);
+                wl1271_scan_stm(wl, wl->scan_vif);
         }
 
         if (vector & PERIODIC_SCAN_REPORT_EVENT_ID) {
@@ -253,8 +272,7 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)
                 }
         }
 
-        if (vector & SOFT_GEMINI_SENSE_EVENT_ID &&
-            wl->bss_type == BSS_TYPE_STA_BSS)
+        if (vector & SOFT_GEMINI_SENSE_EVENT_ID)
                 wl12xx_event_soft_gemini_sense(wl,
                                                mbox->soft_gemini_sense_info);
 
@@ -267,40 +285,54 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)
          * BSS_LOSE_EVENT, beacon loss has to be reported to the stack.
          *
          */
-        if ((vector & BSS_LOSE_EVENT_ID) && !is_ap) {
+        if (vector & BSS_LOSE_EVENT_ID) {
+                /* TODO: check for multi-role */
                 wl1271_info("Beacon loss detected.");
 
                 /* indicate to the stack, that beacons have been lost */
                 beacon_loss = true;
         }
 
-        if ((vector & PS_REPORT_EVENT_ID) && !is_ap) {
+        if (vector & PS_REPORT_EVENT_ID) {
                 wl1271_debug(DEBUG_EVENT, "PS_REPORT_EVENT");
-                ret = wl1271_event_ps_report(wl, mbox, &beacon_loss);
-                if (ret < 0)
-                        return ret;
+                wl12xx_for_each_wlvif_sta(wl, wlvif) {
+                        ret = wl1271_event_ps_report(wl, wlvif,
+                                                     mbox, &beacon_loss);
+                        if (ret < 0)
+                                return ret;
+                }
         }
 
-        if ((vector & PSPOLL_DELIVERY_FAILURE_EVENT_ID) && !is_ap)
-                wl1271_event_pspoll_delivery_fail(wl);
+        if (vector & PSPOLL_DELIVERY_FAILURE_EVENT_ID)
+                wl12xx_for_each_wlvif_sta(wl, wlvif) {
+                        wl1271_event_pspoll_delivery_fail(wl, wlvif);
+                }
 
         if (vector & RSSI_SNR_TRIGGER_0_EVENT_ID) {
+                /* TODO: check actual multi-role support */
                 wl1271_debug(DEBUG_EVENT, "RSSI_SNR_TRIGGER_0_EVENT");
-                if (wl->vif)
-                        wl1271_event_rssi_trigger(wl, mbox);
+                wl12xx_for_each_wlvif_sta(wl, wlvif) {
+                        wl1271_event_rssi_trigger(wl, wlvif, mbox);
+                }
         }
 
-        if ((vector & BA_SESSION_RX_CONSTRAINT_EVENT_ID)) {
+        if (vector & BA_SESSION_RX_CONSTRAINT_EVENT_ID) {
+                u8 role_id = mbox->role_id;
                 wl1271_debug(DEBUG_EVENT, "BA_SESSION_RX_CONSTRAINT_EVENT_ID. "
-                             "ba_allowed = 0x%x", mbox->rx_ba_allowed);
+                             "ba_allowed = 0x%x, role_id=%d",
+                             mbox->rx_ba_allowed, role_id);
 
-                wl->ba_allowed = !!mbox->rx_ba_allowed;
+                wl12xx_for_each_wlvif(wl, wlvif) {
+                        if (role_id != 0xff && role_id != wlvif->role_id)
+                                continue;
 
-                if (wl->vif && !wl->ba_allowed)
-                        wl1271_stop_ba_event(wl);
+                        wlvif->ba_allowed = !!mbox->rx_ba_allowed;
+                        if (!wlvif->ba_allowed)
+                                wl1271_stop_ba_event(wl, wlvif);
+                }
         }
 
-        if ((vector & CHANNEL_SWITCH_COMPLETE_EVENT_ID) && !is_ap) {
+        if (vector & CHANNEL_SWITCH_COMPLETE_EVENT_ID) {
                 wl1271_debug(DEBUG_EVENT, "CHANNEL_SWITCH_COMPLETE_EVENT_ID. "
                                           "status = 0x%x",
                                           mbox->channel_switch_status);
@@ -309,50 +341,65 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)
                  * 1) channel switch complete with status=0
                  * 2) channel switch failed status=1
                  */
-                if (test_and_clear_bit(WL1271_FLAG_CS_PROGRESS, &wl->flags) &&
-                    (wl->vif))
-                        ieee80211_chswitch_done(wl->vif,
-                                mbox->channel_switch_status ? false : true);
+
+                /* TODO: configure only the relevant vif */
+                wl12xx_for_each_wlvif_sta(wl, wlvif) {
+                        struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
+                        bool success;
+
+                        if (!test_and_clear_bit(WLVIF_FLAG_CS_PROGRESS,
+                                                &wl->flags))
+                                continue;
+
+                        success = mbox->channel_switch_status ? false : true;
+                        ieee80211_chswitch_done(vif, success);
+                }
         }
 
         if ((vector & DUMMY_PACKET_EVENT_ID)) {
                 wl1271_debug(DEBUG_EVENT, "DUMMY_PACKET_ID_EVENT_ID");
-                if (wl->vif)
-                        wl1271_tx_dummy_packet(wl);
+                wl1271_tx_dummy_packet(wl);
         }
 
         /*
          * "TX retries exceeded" has a different meaning according to mode.
          * In AP mode the offending station is disconnected.
          */
-        if ((vector & MAX_TX_RETRY_EVENT_ID) && is_ap) {
+        if (vector & MAX_TX_RETRY_EVENT_ID) {
                 wl1271_debug(DEBUG_EVENT, "MAX_TX_RETRY_EVENT_ID");
                 sta_bitmap |= le16_to_cpu(mbox->sta_tx_retry_exceeded);
                 disconnect_sta = true;
         }
 
-        if ((vector & INACTIVE_STA_EVENT_ID) && is_ap) {
+        if (vector & INACTIVE_STA_EVENT_ID) {
                 wl1271_debug(DEBUG_EVENT, "INACTIVE_STA_EVENT_ID");
                 sta_bitmap |= le16_to_cpu(mbox->sta_aging_status);
                 disconnect_sta = true;
         }
 
-        if (is_ap && disconnect_sta) {
+        if (disconnect_sta) {
                 u32 num_packets = wl->conf.tx.max_tx_retries;
                 struct ieee80211_sta *sta;
                 const u8 *addr;
                 int h;
 
-                for (h = find_first_bit(&sta_bitmap, AP_MAX_LINKS);
-                     h < AP_MAX_LINKS;
-                     h = find_next_bit(&sta_bitmap, AP_MAX_LINKS, h+1)) {
-                        if (!wl1271_is_active_sta(wl, h))
+                for_each_set_bit(h, &sta_bitmap, WL12XX_MAX_LINKS) {
+                        bool found = false;
+                        /* find the ap vif connected to this sta */
+                        wl12xx_for_each_wlvif_ap(wl, wlvif) {
+                                if (!test_bit(h, wlvif->ap.sta_hlid_map))
+                                        continue;
+                                found = true;
+                                break;
+                        }
+                        if (!found)
                                 continue;
 
+                        vif = wl12xx_wlvif_to_vif(wlvif);
                         addr = wl->links[h].addr;
 
                         rcu_read_lock();
-                        sta = ieee80211_find_sta(wl->vif, addr);
+                        sta = ieee80211_find_sta(vif, addr);
                         if (sta) {
                                 wl1271_debug(DEBUG_EVENT, "remove sta %d", h);
                                 ieee80211_report_low_ack(sta, num_packets);
@@ -361,8 +408,11 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)
                 }
         }
 
-        if (wl->vif && beacon_loss)
-                ieee80211_connection_loss(wl->vif);
+        if (beacon_loss)
+                wl12xx_for_each_wlvif_sta(wl, wlvif) {
+                        vif = wl12xx_wlvif_to_vif(wlvif);
+                        ieee80211_connection_loss(vif);
+                }
 
         return 0;
 }
diff --git a/drivers/net/wireless/wl12xx/event.h b/drivers/net/wireless/wl12xx/event.h
index 49c1a0ede5b1..1d878ba47bf4 100644
--- a/drivers/net/wireless/wl12xx/event.h
+++ b/drivers/net/wireless/wl12xx/event.h
@@ -132,7 +132,4 @@ void wl1271_event_mbox_config(struct wl1271 *wl);
 int wl1271_event_handle(struct wl1271 *wl, u8 mbox);
 void wl1271_pspoll_work(struct work_struct *work);
 
-/* Functions from main.c */
-bool wl1271_is_active_sta(struct wl1271 *wl, u8 hlid);
-
 #endif
diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/wl12xx/init.c
index 04db64c94e9a..ca7ee59e4505 100644
--- a/drivers/net/wireless/wl12xx/init.c
+++ b/drivers/net/wireless/wl12xx/init.c
@@ -25,6 +25,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 
+#include "debug.h"
 #include "init.h"
 #include "wl12xx_80211.h"
 #include "acx.h"
@@ -33,7 +34,7 @@
 #include "tx.h"
 #include "io.h"
 
-int wl1271_sta_init_templates_config(struct wl1271 *wl)
+int wl1271_init_templates_config(struct wl1271 *wl)
 {
         int ret, i;
 
@@ -64,7 +65,7 @@ int wl1271_sta_init_templates_config(struct wl1271 *wl)
 
         ret = wl1271_cmd_template_set(wl, CMD_TEMPL_QOS_NULL_DATA, NULL,
                                       sizeof
-                                      (struct wl12xx_qos_null_data_template),
+                                      (struct ieee80211_qos_hdr),
                                       0, WL1271_RATE_AUTOMATIC);
         if (ret < 0)
                 return ret;
@@ -88,10 +89,33 @@ int wl1271_sta_init_templates_config(struct wl1271 *wl)
         if (ret < 0)
                 return ret;
 
+        /*
+         * Put very large empty placeholders for all templates. These
+         * reserve memory for later.
+         */
+        ret = wl1271_cmd_template_set(wl, CMD_TEMPL_AP_PROBE_RESPONSE, NULL,
+                                      WL1271_CMD_TEMPL_MAX_SIZE,
+                                      0, WL1271_RATE_AUTOMATIC);
+        if (ret < 0)
+                return ret;
+
+        ret = wl1271_cmd_template_set(wl, CMD_TEMPL_AP_BEACON, NULL,
+                                      WL1271_CMD_TEMPL_MAX_SIZE,
+                                      0, WL1271_RATE_AUTOMATIC);
+        if (ret < 0)
+                return ret;
+
+        ret = wl1271_cmd_template_set(wl, CMD_TEMPL_DEAUTH_AP, NULL,
+                                      sizeof
+                                      (struct wl12xx_disconn_template),
+                                      0, WL1271_RATE_AUTOMATIC);
+        if (ret < 0)
+                return ret;
+
         for (i = 0; i < CMD_TEMPL_KLV_IDX_MAX; i++) {
                 ret = wl1271_cmd_template_set(wl, CMD_TEMPL_KLV, NULL,
-                                              WL1271_CMD_TEMPL_DFLT_SIZE, i,
-                                              WL1271_RATE_AUTOMATIC);
+                                              sizeof(struct ieee80211_qos_hdr),
+                                              i, WL1271_RATE_AUTOMATIC);
                 if (ret < 0)
                         return ret;
         }
@@ -99,7 +123,8 @@ int wl1271_sta_init_templates_config(struct wl1271 *wl)
         return 0;
 }
 
-static int wl1271_ap_init_deauth_template(struct wl1271 *wl)
+static int wl1271_ap_init_deauth_template(struct wl1271 *wl,
+                                          struct wl12xx_vif *wlvif)
 {
         struct wl12xx_disconn_template *tmpl;
         int ret;
@@ -114,7 +139,7 @@ static int wl1271_ap_init_deauth_template(struct wl1271 *wl)
         tmpl->header.frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT |
                                              IEEE80211_STYPE_DEAUTH);
 
-        rate = wl1271_tx_min_rate_get(wl, wl->basic_rate_set);
+        rate = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
         ret = wl1271_cmd_template_set(wl, CMD_TEMPL_DEAUTH_AP,
                                       tmpl, sizeof(*tmpl), 0, rate);
 
@@ -123,8 +148,10 @@ out:
         return ret;
 }
 
-static int wl1271_ap_init_null_template(struct wl1271 *wl)
+static int wl1271_ap_init_null_template(struct wl1271 *wl,
+                                        struct ieee80211_vif *vif)
 {
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         struct ieee80211_hdr_3addr *nullfunc;
         int ret;
         u32 rate;
@@ -141,10 +168,10 @@ static int wl1271_ap_init_null_template(struct wl1271 *wl)
 
         /* nullfunc->addr1 is filled by FW */
 
-        memcpy(nullfunc->addr2, wl->mac_addr, ETH_ALEN);
-        memcpy(nullfunc->addr3, wl->mac_addr, ETH_ALEN);
+        memcpy(nullfunc->addr2, vif->addr, ETH_ALEN);
+        memcpy(nullfunc->addr3, vif->addr, ETH_ALEN);
 
-        rate = wl1271_tx_min_rate_get(wl, wl->basic_rate_set);
+        rate = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
         ret = wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, nullfunc,
                                       sizeof(*nullfunc), 0, rate);
 
@@ -153,8 +180,10 @@ out:
         return ret;
 }
 
-static int wl1271_ap_init_qos_null_template(struct wl1271 *wl)
+static int wl1271_ap_init_qos_null_template(struct wl1271 *wl,
+                                            struct ieee80211_vif *vif)
 {
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         struct ieee80211_qos_hdr *qosnull;
         int ret;
         u32 rate;
@@ -171,10 +200,10 @@ static int wl1271_ap_init_qos_null_template(struct wl1271 *wl)
 
         /* qosnull->addr1 is filled by FW */
 
-        memcpy(qosnull->addr2, wl->mac_addr, ETH_ALEN);
-        memcpy(qosnull->addr3, wl->mac_addr, ETH_ALEN);
+        memcpy(qosnull->addr2, vif->addr, ETH_ALEN);
+        memcpy(qosnull->addr3, vif->addr, ETH_ALEN);
 
-        rate = wl1271_tx_min_rate_get(wl, wl->basic_rate_set);
+        rate = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
         ret = wl1271_cmd_template_set(wl, CMD_TEMPL_QOS_NULL_DATA, qosnull,
                                       sizeof(*qosnull), 0, rate);
 
@@ -183,49 +212,6 @@ out:
         return ret;
 }
 
-static int wl1271_ap_init_templates_config(struct wl1271 *wl)
-{
-        int ret;
-
-        /*
-         * Put very large empty placeholders for all templates. These
-         * reserve memory for later.
-         */
-        ret = wl1271_cmd_template_set(wl, CMD_TEMPL_AP_PROBE_RESPONSE, NULL,
-                                      WL1271_CMD_TEMPL_MAX_SIZE,
-                                      0, WL1271_RATE_AUTOMATIC);
-        if (ret < 0)
-                return ret;
-
-        ret = wl1271_cmd_template_set(wl, CMD_TEMPL_AP_BEACON, NULL,
-                                      WL1271_CMD_TEMPL_MAX_SIZE,
-                                      0, WL1271_RATE_AUTOMATIC);
-        if (ret < 0)
-                return ret;
-
-        ret = wl1271_cmd_template_set(wl, CMD_TEMPL_DEAUTH_AP, NULL,
-                                      sizeof
-                                      (struct wl12xx_disconn_template),
-                                      0, WL1271_RATE_AUTOMATIC);
-        if (ret < 0)
-                return ret;
-
-        ret = wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, NULL,
-                                      sizeof(struct wl12xx_null_data_template),
-                                      0, WL1271_RATE_AUTOMATIC);
-        if (ret < 0)
-                return ret;
-
-        ret = wl1271_cmd_template_set(wl, CMD_TEMPL_QOS_NULL_DATA, NULL,
-                                      sizeof
-                                      (struct wl12xx_qos_null_data_template),
-                                      0, WL1271_RATE_AUTOMATIC);
-        if (ret < 0)
-                return ret;
-
-        return 0;
-}
-
 static int wl12xx_init_rx_config(struct wl1271 *wl)
 {
         int ret;
@@ -237,39 +223,37 @@ static int wl12xx_init_rx_config(struct wl1271 *wl)
         return 0;
 }
 
-int wl1271_init_phy_config(struct wl1271 *wl)
+static int wl12xx_init_phy_vif_config(struct wl1271 *wl,
+                                            struct wl12xx_vif *wlvif)
 {
         int ret;
 
-        ret = wl1271_acx_pd_threshold(wl);
-        if (ret < 0)
-                return ret;
-
-        ret = wl1271_acx_slot(wl, DEFAULT_SLOT_TIME);
+        ret = wl1271_acx_slot(wl, wlvif, DEFAULT_SLOT_TIME);
         if (ret < 0)
                 return ret;
 
-        ret = wl1271_acx_service_period_timeout(wl);
+        ret = wl1271_acx_service_period_timeout(wl, wlvif);
         if (ret < 0)
                 return ret;
 
-        ret = wl1271_acx_rts_threshold(wl, wl->hw->wiphy->rts_threshold);
+        ret = wl1271_acx_rts_threshold(wl, wlvif, wl->hw->wiphy->rts_threshold);
         if (ret < 0)
                 return ret;
 
         return 0;
 }
 
-static int wl1271_init_beacon_filter(struct wl1271 *wl)
+static int wl1271_init_sta_beacon_filter(struct wl1271 *wl,
+                                         struct wl12xx_vif *wlvif)
 {
         int ret;
 
-        /* disable beacon filtering at this stage */
-        ret = wl1271_acx_beacon_filter_opt(wl, false);
+        ret = wl1271_acx_beacon_filter_table(wl, wlvif);
         if (ret < 0)
                 return ret;
 
-        ret = wl1271_acx_beacon_filter_table(wl);
+        /* enable beacon filtering */
+        ret = wl1271_acx_beacon_filter_opt(wl, wlvif, true);
         if (ret < 0)
                 return ret;
 
@@ -302,11 +286,12 @@ int wl1271_init_energy_detection(struct wl1271 *wl)
         return 0;
 }
 
-static int wl1271_init_beacon_broadcast(struct wl1271 *wl)
+static int wl1271_init_beacon_broadcast(struct wl1271 *wl,
+                                        struct wl12xx_vif *wlvif)
 {
         int ret;
 
-        ret = wl1271_acx_bcn_dtim_options(wl);
+        ret = wl1271_acx_bcn_dtim_options(wl, wlvif);
         if (ret < 0)
                 return ret;
 
@@ -327,36 +312,13 @@ static int wl12xx_init_fwlog(struct wl1271 *wl)
         return 0;
 }
 
-static int wl1271_sta_hw_init(struct wl1271 *wl)
+/* generic sta initialization (non vif-specific) */
+static int wl1271_sta_hw_init(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         int ret;
 
-        if (wl->chip.id != CHIP_ID_1283_PG20) {
-                ret = wl1271_cmd_ext_radio_parms(wl);
-                if (ret < 0)
-                        return ret;
-        }
-
         /* PS config */
-        ret = wl1271_acx_config_ps(wl);
-        if (ret < 0)
-                return ret;
-
-        ret = wl1271_sta_init_templates_config(wl);
-        if (ret < 0)
-                return ret;
-
-        ret = wl1271_acx_group_address_tbl(wl, true, NULL, 0);
-        if (ret < 0)
-                return ret;
-
-        /* Initialize connection monitoring thresholds */
-        ret = wl1271_acx_conn_monit_params(wl, false);
-        if (ret < 0)
-                return ret;
-
-        /* Beacon filtering */
-        ret = wl1271_init_beacon_filter(wl);
+        ret = wl12xx_acx_config_ps(wl, wlvif);
         if (ret < 0)
                 return ret;
 
@@ -365,103 +327,61 @@ static int wl1271_sta_hw_init(struct wl1271 *wl)
         if (ret < 0)
                 return ret;
 
-        /* Beacons and broadcast settings */
-        ret = wl1271_init_beacon_broadcast(wl);
-        if (ret < 0)
-                return ret;
-
-        /* Configure for ELP power saving */
-        ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_ELP);
-        if (ret < 0)
-                return ret;
-
-        /* Configure rssi/snr averaging weights */
-        ret = wl1271_acx_rssi_snr_avg_weights(wl);
-        if (ret < 0)
-                return ret;
-
-        ret = wl1271_acx_sta_rate_policies(wl);
-        if (ret < 0)
-                return ret;
-
-        ret = wl12xx_acx_mem_cfg(wl);
-        if (ret < 0)
-                return ret;
-
-        /* Configure the FW logger */
-        ret = wl12xx_init_fwlog(wl);
+        ret = wl1271_acx_sta_rate_policies(wl, wlvif);
         if (ret < 0)
                 return ret;
 
         return 0;
 }
 
-static int wl1271_sta_hw_init_post_mem(struct wl1271 *wl)
+static int wl1271_sta_hw_init_post_mem(struct wl1271 *wl,
+                                       struct ieee80211_vif *vif)
 {
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         int ret, i;
 
         /* disable all keep-alive templates */
         for (i = 0; i < CMD_TEMPL_KLV_IDX_MAX; i++) {
-                ret = wl1271_acx_keep_alive_config(wl, i,
+                ret = wl1271_acx_keep_alive_config(wl, wlvif, i,
                                                    ACX_KEEP_ALIVE_TPL_INVALID);
                 if (ret < 0)
                         return ret;
         }
 
         /* disable the keep-alive feature */
-        ret = wl1271_acx_keep_alive_mode(wl, false);
+        ret = wl1271_acx_keep_alive_mode(wl, wlvif, false);
         if (ret < 0)
                 return ret;
 
         return 0;
 }
 
-static int wl1271_ap_hw_init(struct wl1271 *wl)
+/* generic ap initialization (non vif-specific) */
+static int wl1271_ap_hw_init(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         int ret;
 
-        ret = wl1271_ap_init_templates_config(wl);
-        if (ret < 0)
-                return ret;
-
-        /* Configure for power always on */
-        ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
-        if (ret < 0)
-                return ret;
-
-        ret = wl1271_init_ap_rates(wl);
-        if (ret < 0)
-                return ret;
-
-        ret = wl1271_acx_ap_max_tx_retry(wl);
-        if (ret < 0)
-                return ret;
-
-        ret = wl12xx_acx_mem_cfg(wl);
-        if (ret < 0)
-                return ret;
-
-        /* initialize Tx power */
-        ret = wl1271_acx_tx_power(wl, wl->power_level);
+        ret = wl1271_init_ap_rates(wl, wlvif);
         if (ret < 0)
                 return ret;
 
         return 0;
 }
 
-int wl1271_ap_init_templates(struct wl1271 *wl)
+int wl1271_ap_init_templates(struct wl1271 *wl, struct ieee80211_vif *vif)
 {
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         int ret;
 
-        ret = wl1271_ap_init_deauth_template(wl);
+        ret = wl1271_ap_init_deauth_template(wl, wlvif);
         if (ret < 0)
                 return ret;
 
-        ret = wl1271_ap_init_null_template(wl);
+        ret = wl1271_ap_init_null_template(wl, vif);
         if (ret < 0)
                 return ret;
 
-        ret = wl1271_ap_init_qos_null_template(wl);
+        ret = wl1271_ap_init_qos_null_template(wl, vif);
         if (ret < 0)
                 return ret;
 
@@ -469,43 +389,45 @@ int wl1271_ap_init_templates(struct wl1271 *wl)
          * when operating as AP we want to receive external beacons for
          * configuring ERP protection.
          */
-        ret = wl1271_acx_beacon_filter_opt(wl, false);
+        ret = wl1271_acx_beacon_filter_opt(wl, wlvif, false);
         if (ret < 0)
                 return ret;
 
         return 0;
 }
 
-static int wl1271_ap_hw_init_post_mem(struct wl1271 *wl)
+static int wl1271_ap_hw_init_post_mem(struct wl1271 *wl,
+                                      struct ieee80211_vif *vif)
 {
-        return wl1271_ap_init_templates(wl);
+        return wl1271_ap_init_templates(wl, vif);
 }
 
-int wl1271_init_ap_rates(struct wl1271 *wl)
+int wl1271_init_ap_rates(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         int i, ret;
         struct conf_tx_rate_class rc;
         u32 supported_rates;
 
-        wl1271_debug(DEBUG_AP, "AP basic rate set: 0x%x", wl->basic_rate_set);
+        wl1271_debug(DEBUG_AP, "AP basic rate set: 0x%x",
+                     wlvif->basic_rate_set);
 
-        if (wl->basic_rate_set == 0)
+        if (wlvif->basic_rate_set == 0)
                 return -EINVAL;
 
-        rc.enabled_rates = wl->basic_rate_set;
+        rc.enabled_rates = wlvif->basic_rate_set;
         rc.long_retry_limit = 10;
         rc.short_retry_limit = 10;
         rc.aflags = 0;
-        ret = wl1271_acx_ap_rate_policy(wl, &rc, ACX_TX_AP_MODE_MGMT_RATE);
+        ret = wl1271_acx_ap_rate_policy(wl, &rc, wlvif->ap.mgmt_rate_idx);
         if (ret < 0)
                 return ret;
 
         /* use the min basic rate for AP broadcast/multicast */
-        rc.enabled_rates = wl1271_tx_min_rate_get(wl, wl->basic_rate_set);
+        rc.enabled_rates = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
         rc.short_retry_limit = 10;
         rc.long_retry_limit = 10;
         rc.aflags = 0;
-        ret = wl1271_acx_ap_rate_policy(wl, &rc, ACX_TX_AP_MODE_BCST_RATE);
+        ret = wl1271_acx_ap_rate_policy(wl, &rc, wlvif->ap.bcast_rate_idx);
         if (ret < 0)
                 return ret;
 
@@ -513,7 +435,7 @@ int wl1271_init_ap_rates(struct wl1271 *wl)
          * If the basic rates contain OFDM rates, use OFDM only
          * rates for unicast TX as well. Else use all supported rates.
          */
-        if ((wl->basic_rate_set & CONF_TX_OFDM_RATES))
+        if ((wlvif->basic_rate_set & CONF_TX_OFDM_RATES))
                 supported_rates = CONF_TX_OFDM_RATES;
         else
                 supported_rates = CONF_TX_AP_ENABLED_RATES;
@@ -527,7 +449,8 @@ int wl1271_init_ap_rates(struct wl1271 *wl)
                 rc.short_retry_limit = 10;
                 rc.long_retry_limit = 10;
                 rc.aflags = 0;
-                ret = wl1271_acx_ap_rate_policy(wl, &rc, i);
+                ret = wl1271_acx_ap_rate_policy(wl, &rc,
+                                                wlvif->ap.ucast_rate_idx[i]);
                 if (ret < 0)
                         return ret;
         }
@@ -535,24 +458,23 @@ int wl1271_init_ap_rates(struct wl1271 *wl)
         return 0;
 }
 
-static int wl1271_set_ba_policies(struct wl1271 *wl)
+static int wl1271_set_ba_policies(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         /* Reset the BA RX indicators */
-        wl->ba_rx_bitmap = 0;
-        wl->ba_allowed = true;
+        wlvif->ba_allowed = true;
         wl->ba_rx_session_count = 0;
 
         /* BA is supported in STA/AP modes */
-        if (wl->bss_type != BSS_TYPE_AP_BSS &&
-            wl->bss_type != BSS_TYPE_STA_BSS) {
-                wl->ba_support = false;
+        if (wlvif->bss_type != BSS_TYPE_AP_BSS &&
+            wlvif->bss_type != BSS_TYPE_STA_BSS) {
+                wlvif->ba_support = false;
                 return 0;
         }
 
-        wl->ba_support = true;
+        wlvif->ba_support = true;
 
         /* 802.11n initiator BA session setting */
-        return wl12xx_acx_set_ba_initiator_policy(wl);
+        return wl12xx_acx_set_ba_initiator_policy(wl, wlvif);
 }
 
 int wl1271_chip_specific_init(struct wl1271 *wl)
@@ -562,7 +484,7 @@ int wl1271_chip_specific_init(struct wl1271 *wl)
         if (wl->chip.id == CHIP_ID_1283_PG20) {
                 u32 host_cfg_bitmap = HOST_IF_CFG_RX_FIFO_ENABLE;
 
-                if (wl->quirks & WL12XX_QUIRK_BLOCKSIZE_ALIGNMENT)
+                if (!(wl->quirks & WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT))
                         /* Enable SDIO padding */
                         host_cfg_bitmap |= HOST_IF_CFG_TX_PAD_TO_SDIO_BLK;
 
@@ -575,39 +497,186 @@ out:
         return ret;
 }
 
+/* vif-specifc initialization */
+static int wl12xx_init_sta_role(struct wl1271 *wl, struct wl12xx_vif *wlvif)
+{
+        int ret;
 
-int wl1271_hw_init(struct wl1271 *wl)
+        ret = wl1271_acx_group_address_tbl(wl, wlvif, true, NULL, 0);
+        if (ret < 0)
+                return ret;
+
+        /* Initialize connection monitoring thresholds */
+        ret = wl1271_acx_conn_monit_params(wl, wlvif, false);
+        if (ret < 0)
+                return ret;
+
+        /* Beacon filtering */
+        ret = wl1271_init_sta_beacon_filter(wl, wlvif);
+        if (ret < 0)
+                return ret;
+
+        /* Beacons and broadcast settings */
+        ret = wl1271_init_beacon_broadcast(wl, wlvif);
+        if (ret < 0)
+                return ret;
+
+        /* Configure rssi/snr averaging weights */
+        ret = wl1271_acx_rssi_snr_avg_weights(wl, wlvif);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+/* vif-specific intialization */
+static int wl12xx_init_ap_role(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
+        int ret;
+
+        ret = wl1271_acx_ap_max_tx_retry(wl, wlvif);
+        if (ret < 0)
+                return ret;
+
+        /* initialize Tx power */
+        ret = wl1271_acx_tx_power(wl, wlvif, wlvif->power_level);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+int wl1271_init_vif_specific(struct wl1271 *wl, struct ieee80211_vif *vif)
+{
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         struct conf_tx_ac_category *conf_ac;
         struct conf_tx_tid *conf_tid;
+        bool is_ap = (wlvif->bss_type == BSS_TYPE_AP_BSS);
         int ret, i;
-        bool is_ap = (wl->bss_type == BSS_TYPE_AP_BSS);
 
-        if (wl->chip.id == CHIP_ID_1283_PG20)
-                ret = wl128x_cmd_general_parms(wl);
-        else
-                ret = wl1271_cmd_general_parms(wl);
+        /*
+         * consider all existing roles before configuring psm.
+         * TODO: reconfigure on interface removal.
+         */
+        if (!wl->ap_count) {
+                if (is_ap) {
+                        /* Configure for power always on */
+                        ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
+                        if (ret < 0)
+                                return ret;
+                } else if (!wl->sta_count) {
+                        /* Configure for ELP power saving */
+                        ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_ELP);
+                        if (ret < 0)
+                                return ret;
+                }
+        }
+
+        /* Mode specific init */
+        if (is_ap) {
+                ret = wl1271_ap_hw_init(wl, wlvif);
+                if (ret < 0)
+                        return ret;
+
+                ret = wl12xx_init_ap_role(wl, wlvif);
+                if (ret < 0)
+                        return ret;
+        } else {
+                ret = wl1271_sta_hw_init(wl, wlvif);
+                if (ret < 0)
+                        return ret;
+
+                ret = wl12xx_init_sta_role(wl, wlvif);
+                if (ret < 0)
+                        return ret;
+        }
+
+        wl12xx_init_phy_vif_config(wl, wlvif);
+
+        /* Default TID/AC configuration */
+        BUG_ON(wl->conf.tx.tid_conf_count != wl->conf.tx.ac_conf_count);
+        for (i = 0; i < wl->conf.tx.tid_conf_count; i++) {
+                conf_ac = &wl->conf.tx.ac_conf[i];
+                ret = wl1271_acx_ac_cfg(wl, wlvif, conf_ac->ac,
+                                        conf_ac->cw_min, conf_ac->cw_max,
+                                        conf_ac->aifsn, conf_ac->tx_op_limit);
+                if (ret < 0)
+                        return ret;
+
+                conf_tid = &wl->conf.tx.tid_conf[i];
+                ret = wl1271_acx_tid_cfg(wl, wlvif,
+                                         conf_tid->queue_id,
+                                         conf_tid->channel_type,
+                                         conf_tid->tsid,
+                                         conf_tid->ps_scheme,
+                                         conf_tid->ack_policy,
+                                         conf_tid->apsd_conf[0],
+                                         conf_tid->apsd_conf[1]);
+                if (ret < 0)
+                        return ret;
+        }
+
+        /* Configure HW encryption */
+        ret = wl1271_acx_feature_cfg(wl, wlvif);
         if (ret < 0)
                 return ret;
 
-        if (wl->chip.id == CHIP_ID_1283_PG20)
-                ret = wl128x_cmd_radio_parms(wl);
+        /* Mode specific init - post mem init */
+        if (is_ap)
+                ret = wl1271_ap_hw_init_post_mem(wl, vif);
         else
-                ret = wl1271_cmd_radio_parms(wl);
+                ret = wl1271_sta_hw_init_post_mem(wl, vif);
+
+        if (ret < 0)
+                return ret;
+
+        /* Configure initiator BA sessions policies */
+        ret = wl1271_set_ba_policies(wl, wlvif);
         if (ret < 0)
                 return ret;
 
+        return 0;
+}
+
+int wl1271_hw_init(struct wl1271 *wl)
+{
+        int ret;
+
+        if (wl->chip.id == CHIP_ID_1283_PG20) {
+                ret = wl128x_cmd_general_parms(wl);
+                if (ret < 0)
+                        return ret;
+                ret = wl128x_cmd_radio_parms(wl);
+                if (ret < 0)
+                        return ret;
+        } else {
+                ret = wl1271_cmd_general_parms(wl);
+                if (ret < 0)
+                        return ret;
+                ret = wl1271_cmd_radio_parms(wl);
+                if (ret < 0)
+                        return ret;
+                ret = wl1271_cmd_ext_radio_parms(wl);
+                if (ret < 0)
+                        return ret;
+        }
+
         /* Chip-specific init */
         ret = wl1271_chip_specific_init(wl);
         if (ret < 0)
                 return ret;
 
-        /* Mode specific init */
-        if (is_ap)
-                ret = wl1271_ap_hw_init(wl);
-        else
-                ret = wl1271_sta_hw_init(wl);
+        /* Init templates */
+        ret = wl1271_init_templates_config(wl);
+        if (ret < 0)
+                return ret;
+
+        ret = wl12xx_acx_mem_cfg(wl);
+        if (ret < 0)
+                return ret;
 
+        /* Configure the FW logger */
+        ret = wl12xx_init_fwlog(wl);
         if (ret < 0)
                 return ret;
 
@@ -626,11 +695,6 @@ int wl1271_hw_init(struct wl1271 *wl)
         if (ret < 0)
                 goto out_free_memmap;
 
-        /* PHY layer config */
-        ret = wl1271_init_phy_config(wl);
-        if (ret < 0)
-                goto out_free_memmap;
-
         ret = wl1271_acx_dco_itrim_params(wl);
         if (ret < 0)
                 goto out_free_memmap;
@@ -655,61 +719,20 @@ int wl1271_hw_init(struct wl1271 *wl)
         if (ret < 0)
                 goto out_free_memmap;
 
-        /* Default TID/AC configuration */
-        BUG_ON(wl->conf.tx.tid_conf_count != wl->conf.tx.ac_conf_count);
-        for (i = 0; i < wl->conf.tx.tid_conf_count; i++) {
-                conf_ac = &wl->conf.tx.ac_conf[i];
-                ret = wl1271_acx_ac_cfg(wl, conf_ac->ac, conf_ac->cw_min,
-                                        conf_ac->cw_max, conf_ac->aifsn,
-                                        conf_ac->tx_op_limit);
-                if (ret < 0)
-                        goto out_free_memmap;
-
-                conf_tid = &wl->conf.tx.tid_conf[i];
-                ret = wl1271_acx_tid_cfg(wl, conf_tid->queue_id,
-                                         conf_tid->channel_type,
-                                         conf_tid->tsid,
-                                         conf_tid->ps_scheme,
-                                         conf_tid->ack_policy,
-                                         conf_tid->apsd_conf[0],
-                                         conf_tid->apsd_conf[1]);
-                if (ret < 0)
-                        goto out_free_memmap;
-        }
-
         /* Enable data path */
         ret = wl1271_cmd_data_path(wl, 1);
         if (ret < 0)
                 goto out_free_memmap;
 
-        /* Configure HW encryption */
-        ret = wl1271_acx_feature_cfg(wl);
-        if (ret < 0)
-                goto out_free_memmap;
-
         /* configure PM */
         ret = wl1271_acx_pm_config(wl);
         if (ret < 0)
                 goto out_free_memmap;
 
-        /* Mode specific init - post mem init */
-        if (is_ap)
-                ret = wl1271_ap_hw_init_post_mem(wl);
-        else
-                ret = wl1271_sta_hw_init_post_mem(wl);
-
-        if (ret < 0)
-                goto out_free_memmap;
-
         ret = wl12xx_acx_set_rate_mgmt_params(wl);
         if (ret < 0)
                 goto out_free_memmap;
 
-        /* Configure initiator BA sessions policies */
-        ret = wl1271_set_ba_policies(wl);
-        if (ret < 0)
-                goto out_free_memmap;
-
         /* configure hangover */
         ret = wl12xx_acx_config_hangover(wl);
         if (ret < 0)
diff --git a/drivers/net/wireless/wl12xx/init.h b/drivers/net/wireless/wl12xx/init.h
index 3a3c230fd292..2da0f404ef6e 100644
--- a/drivers/net/wireless/wl12xx/init.h
+++ b/drivers/net/wireless/wl12xx/init.h
@@ -27,13 +27,13 @@
 #include "wl12xx.h"
 
 int wl1271_hw_init_power_auth(struct wl1271 *wl);
-int wl1271_sta_init_templates_config(struct wl1271 *wl);
-int wl1271_init_phy_config(struct wl1271 *wl);
+int wl1271_init_templates_config(struct wl1271 *wl);
 int wl1271_init_pta(struct wl1271 *wl);
 int wl1271_init_energy_detection(struct wl1271 *wl);
 int wl1271_chip_specific_init(struct wl1271 *wl);
 int wl1271_hw_init(struct wl1271 *wl);
-int wl1271_init_ap_rates(struct wl1271 *wl);
-int wl1271_ap_init_templates(struct wl1271 *wl);
+int wl1271_init_vif_specific(struct wl1271 *wl, struct ieee80211_vif *vif);
+int wl1271_init_ap_rates(struct wl1271 *wl, struct wl12xx_vif *wlvif);
+int wl1271_ap_init_templates(struct wl1271 *wl, struct ieee80211_vif *vif);
 
 #endif
diff --git a/drivers/net/wireless/wl12xx/io.c b/drivers/net/wireless/wl12xx/io.c
index c2da66f45046..079ad380e8ff 100644
--- a/drivers/net/wireless/wl12xx/io.c
+++ b/drivers/net/wireless/wl12xx/io.c
@@ -24,8 +24,10 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
+#include <linux/interrupt.h>
 
 #include "wl12xx.h"
+#include "debug.h"
 #include "wl12xx_80211.h"
 #include "io.h"
 #include "tx.h"
@@ -46,7 +48,7 @@
 bool wl1271_set_block_size(struct wl1271 *wl)
 {
         if (wl->if_ops->set_block_size) {
-                wl->if_ops->set_block_size(wl, WL12XX_BUS_BLOCK_SIZE);
+                wl->if_ops->set_block_size(wl->dev, WL12XX_BUS_BLOCK_SIZE);
                 return true;
         }
 
@@ -55,12 +57,12 @@ bool wl1271_set_block_size(struct wl1271 *wl)
 
 void wl1271_disable_interrupts(struct wl1271 *wl)
 {
-        wl->if_ops->disable_irq(wl);
+        disable_irq(wl->irq);
 }
 
 void wl1271_enable_interrupts(struct wl1271 *wl)
 {
-        wl->if_ops->enable_irq(wl);
+        enable_irq(wl->irq);
 }
 
 /* Set the SPI partitions to access the chip addresses
@@ -128,13 +130,13 @@ EXPORT_SYMBOL_GPL(wl1271_set_partition);
 void wl1271_io_reset(struct wl1271 *wl)
 {
         if (wl->if_ops->reset)
-                wl->if_ops->reset(wl);
+                wl->if_ops->reset(wl->dev);
 }
 
 void wl1271_io_init(struct wl1271 *wl)
 {
         if (wl->if_ops->init)
-                wl->if_ops->init(wl);
+                wl->if_ops->init(wl->dev);
 }
 
 void wl1271_top_reg_write(struct wl1271 *wl, int addr, u16 val)
diff --git a/drivers/net/wireless/wl12xx/io.h b/drivers/net/wireless/wl12xx/io.h
index e839341dfafe..d398cbcea986 100644
--- a/drivers/net/wireless/wl12xx/io.h
+++ b/drivers/net/wireless/wl12xx/io.h
@@ -51,23 +51,17 @@ void wl1271_enable_interrupts(struct wl1271 *wl);
 void wl1271_io_reset(struct wl1271 *wl);
 void wl1271_io_init(struct wl1271 *wl);
 
-static inline struct device *wl1271_wl_to_dev(struct wl1271 *wl)
-{
-        return wl->if_ops->dev(wl);
-}
-
-
 /* Raw target IO, address is not translated */
 static inline void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf,
                                     size_t len, bool fixed)
 {
-        wl->if_ops->write(wl, addr, buf, len, fixed);
+        wl->if_ops->write(wl->dev, addr, buf, len, fixed);
 }
 
 static inline void wl1271_raw_read(struct wl1271 *wl, int addr, void *buf,
                                    size_t len, bool fixed)
 {
-        wl->if_ops->read(wl, addr, buf, len, fixed);
+        wl->if_ops->read(wl->dev, addr, buf, len, fixed);
 }
 
 static inline u32 wl1271_raw_read32(struct wl1271 *wl, int addr)
@@ -155,13 +149,13 @@ static inline void wl1271_write32(struct wl1271 *wl, int addr, u32 val)
 
 static inline void wl1271_power_off(struct wl1271 *wl)
 {
-        wl->if_ops->power(wl, false);
+        wl->if_ops->power(wl->dev, false);
         clear_bit(WL1271_FLAG_GPIO_POWER, &wl->flags);
 }
 
 static inline int wl1271_power_on(struct wl1271 *wl)
 {
-        int ret = wl->if_ops->power(wl, true);
+        int ret = wl->if_ops->power(wl->dev, true);
         if (ret == 0)
                 set_bit(WL1271_FLAG_GPIO_POWER, &wl->flags);
 
@@ -176,15 +170,10 @@ u16 wl1271_top_reg_read(struct wl1271 *wl, int addr);
 int wl1271_set_partition(struct wl1271 *wl,
                          struct wl1271_partition_set *p);
 
+bool wl1271_set_block_size(struct wl1271 *wl);
+
 /* Functions from wl1271_main.c */
 
-int wl1271_register_hw(struct wl1271 *wl);
-void wl1271_unregister_hw(struct wl1271 *wl);
-int wl1271_init_ieee80211(struct wl1271 *wl);
-struct ieee80211_hw *wl1271_alloc_hw(void);
-int wl1271_free_hw(struct wl1271 *wl);
-irqreturn_t wl1271_irq(int irq, void *data);
-bool wl1271_set_block_size(struct wl1271 *wl);
 int wl1271_tx_dummy_packet(struct wl1271 *wl);
 
 #endif
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 884f82b63219..c3058419e227 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -32,8 +32,10 @@
 #include <linux/slab.h>
 #include <linux/wl12xx.h>
 #include <linux/sched.h>
+#include <linux/interrupt.h>
 
 #include "wl12xx.h"
+#include "debug.h"
 #include "wl12xx_80211.h"
 #include "reg.h"
 #include "io.h"
@@ -377,42 +379,30 @@ static char *fwlog_param;
 static bool bug_on_recovery;
 
 static void __wl1271_op_remove_interface(struct wl1271 *wl,
+                                         struct ieee80211_vif *vif,
                                          bool reset_tx_queues);
-static void wl1271_free_ap_keys(struct wl1271 *wl);
-
-
-static void wl1271_device_release(struct device *dev)
-{
-
-}
-
-static struct platform_device wl1271_device = {
-        .name           = "wl1271",
-        .id             = -1,
-
-        /* device model insists to have a release function */
-        .dev            = {
-                .release = wl1271_device_release,
-        },
-};
+static void wl1271_op_stop(struct ieee80211_hw *hw);
+static void wl1271_free_ap_keys(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 
 static DEFINE_MUTEX(wl_list_mutex);
 static LIST_HEAD(wl_list);
 
-static int wl1271_check_operstate(struct wl1271 *wl, unsigned char operstate)
+static int wl1271_check_operstate(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                                  unsigned char operstate)
 {
         int ret;
+
         if (operstate != IF_OPER_UP)
                 return 0;
 
-        if (test_and_set_bit(WL1271_FLAG_STA_STATE_SENT, &wl->flags))
+        if (test_and_set_bit(WLVIF_FLAG_STA_STATE_SENT, &wlvif->flags))
                 return 0;
 
-        ret = wl12xx_cmd_set_peer_state(wl, wl->sta_hlid);
+        ret = wl12xx_cmd_set_peer_state(wl, wlvif->sta.hlid);
         if (ret < 0)
                 return ret;
 
-        wl12xx_croc(wl, wl->role_id);
+        wl12xx_croc(wl, wlvif->role_id);
 
         wl1271_info("Association completed.");
         return 0;
@@ -426,6 +416,7 @@ static int wl1271_dev_notify(struct notifier_block *me, unsigned long what,
         struct ieee80211_hw *hw;
         struct wl1271 *wl;
         struct wl1271 *wl_temp;
+        struct wl12xx_vif *wlvif;
         int ret = 0;
 
         /* Check that this notification is for us. */
@@ -459,17 +450,18 @@ static int wl1271_dev_notify(struct notifier_block *me, unsigned long what,
         if (wl->state == WL1271_STATE_OFF)
                 goto out;
 
-        if (!test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags))
-                goto out;
-
-        ret = wl1271_ps_elp_wakeup(wl);
-        if (ret < 0)
-                goto out;
+        wl12xx_for_each_wlvif_sta(wl, wlvif) {
+                if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
+                        continue;
 
-        wl1271_check_operstate(wl, dev->operstate);
+                ret = wl1271_ps_elp_wakeup(wl);
+                if (ret < 0)
+                        goto out;
 
-        wl1271_ps_elp_sleep(wl);
+                wl1271_check_operstate(wl, wlvif, dev->operstate);
 
+                wl1271_ps_elp_sleep(wl);
+        }
 out:
         mutex_unlock(&wl->mutex);
 
@@ -498,19 +490,20 @@ static int wl1271_reg_notify(struct wiphy *wiphy,
         return 0;
 }
 
-static int wl1271_set_rx_streaming(struct wl1271 *wl, bool enable)
+static int wl1271_set_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                                   bool enable)
 {
         int ret = 0;
 
         /* we should hold wl->mutex */
-        ret = wl1271_acx_ps_rx_streaming(wl, enable);
+        ret = wl1271_acx_ps_rx_streaming(wl, wlvif, enable);
         if (ret < 0)
                 goto out;
 
         if (enable)
-                set_bit(WL1271_FLAG_RX_STREAMING_STARTED, &wl->flags);
+                set_bit(WLVIF_FLAG_RX_STREAMING_STARTED, &wlvif->flags);
         else
-                clear_bit(WL1271_FLAG_RX_STREAMING_STARTED, &wl->flags);
+                clear_bit(WLVIF_FLAG_RX_STREAMING_STARTED, &wlvif->flags);
 out:
         return ret;
 }
@@ -519,25 +512,25 @@ out:
  * this function is being called when the rx_streaming interval
  * has beed changed or rx_streaming should be disabled
  */
-int wl1271_recalc_rx_streaming(struct wl1271 *wl)
+int wl1271_recalc_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         int ret = 0;
         int period = wl->conf.rx_streaming.interval;
 
         /* don't reconfigure if rx_streaming is disabled */
-        if (!test_bit(WL1271_FLAG_RX_STREAMING_STARTED, &wl->flags))
+        if (!test_bit(WLVIF_FLAG_RX_STREAMING_STARTED, &wlvif->flags))
                 goto out;
 
         /* reconfigure/disable according to new streaming_period */
         if (period &&
-            test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags) &&
+            test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags) &&
             (wl->conf.rx_streaming.always ||
              test_bit(WL1271_FLAG_SOFT_GEMINI, &wl->flags)))
-                ret = wl1271_set_rx_streaming(wl, true);
+                ret = wl1271_set_rx_streaming(wl, wlvif, true);
         else {
-                ret = wl1271_set_rx_streaming(wl, false);
+                ret = wl1271_set_rx_streaming(wl, wlvif, false);
                 /* don't cancel_work_sync since we might deadlock */
-                del_timer_sync(&wl->rx_streaming_timer);
+                del_timer_sync(&wlvif->rx_streaming_timer);
         }
 out:
         return ret;
@@ -546,13 +539,14 @@ out:
 static void wl1271_rx_streaming_enable_work(struct work_struct *work)
 {
         int ret;
-        struct wl1271 *wl =
-                container_of(work, struct wl1271, rx_streaming_enable_work);
+        struct wl12xx_vif *wlvif = container_of(work, struct wl12xx_vif,
+                                                rx_streaming_enable_work);
+        struct wl1271 *wl = wlvif->wl;
 
         mutex_lock(&wl->mutex);
 
-        if (test_bit(WL1271_FLAG_RX_STREAMING_STARTED, &wl->flags) ||
-            !test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags) ||
+        if (test_bit(WLVIF_FLAG_RX_STREAMING_STARTED, &wlvif->flags) ||
+            !test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags) ||
             (!wl->conf.rx_streaming.always &&
              !test_bit(WL1271_FLAG_SOFT_GEMINI, &wl->flags)))
                 goto out;
@@ -564,12 +558,12 @@ static void wl1271_rx_streaming_enable_work(struct work_struct *work)
         if (ret < 0)
                 goto out;
 
-        ret = wl1271_set_rx_streaming(wl, true);
+        ret = wl1271_set_rx_streaming(wl, wlvif, true);
         if (ret < 0)
                 goto out_sleep;
 
         /* stop it after some time of inactivity */
-        mod_timer(&wl->rx_streaming_timer,
+        mod_timer(&wlvif->rx_streaming_timer,
                   jiffies + msecs_to_jiffies(wl->conf.rx_streaming.duration));
 
 out_sleep:
@@ -581,19 +575,20 @@ out:
 static void wl1271_rx_streaming_disable_work(struct work_struct *work)
 {
         int ret;
-        struct wl1271 *wl =
-                container_of(work, struct wl1271, rx_streaming_disable_work);
+        struct wl12xx_vif *wlvif = container_of(work, struct wl12xx_vif,
+                                                rx_streaming_disable_work);
+        struct wl1271 *wl = wlvif->wl;
 
         mutex_lock(&wl->mutex);
 
-        if (!test_bit(WL1271_FLAG_RX_STREAMING_STARTED, &wl->flags))
+        if (!test_bit(WLVIF_FLAG_RX_STREAMING_STARTED, &wlvif->flags))
                 goto out;
 
         ret = wl1271_ps_elp_wakeup(wl);
         if (ret < 0)
                 goto out;
 
-        ret = wl1271_set_rx_streaming(wl, false);
+        ret = wl1271_set_rx_streaming(wl, wlvif, false);
         if (ret)
                 goto out_sleep;
 
@@ -605,8 +600,9 @@ out:
 
 static void wl1271_rx_streaming_timer(unsigned long data)
 {
-        struct wl1271 *wl = (struct wl1271 *)data;
-        ieee80211_queue_work(wl->hw, &wl->rx_streaming_disable_work);
+        struct wl12xx_vif *wlvif = (struct wl12xx_vif *)data;
+        struct wl1271 *wl = wlvif->wl;
+        ieee80211_queue_work(wl->hw, &wlvif->rx_streaming_disable_work);
 }
 
 static void wl1271_conf_init(struct wl1271 *wl)
@@ -645,9 +641,7 @@ static void wl1271_conf_init(struct wl1271 *wl)
 
 static int wl1271_plt_init(struct wl1271 *wl)
 {
-        struct conf_tx_ac_category *conf_ac;
-        struct conf_tx_tid *conf_tid;
-        int ret, i;
+        int ret;
 
         if (wl->chip.id == CHIP_ID_1283_PG20)
                 ret = wl128x_cmd_general_parms(wl);
@@ -676,74 +670,14 @@ static int wl1271_plt_init(struct wl1271 *wl)
         if (ret < 0)
                 return ret;
 
-        ret = wl1271_sta_init_templates_config(wl);
-        if (ret < 0)
-                return ret;
-
         ret = wl1271_acx_init_mem_config(wl);
         if (ret < 0)
                 return ret;
 
-        /* PHY layer config */
-        ret = wl1271_init_phy_config(wl);
-        if (ret < 0)
-                goto out_free_memmap;
-
-        ret = wl1271_acx_dco_itrim_params(wl);
-        if (ret < 0)
-                goto out_free_memmap;
-
-        /* Initialize connection monitoring thresholds */
-        ret = wl1271_acx_conn_monit_params(wl, false);
-        if (ret < 0)
-                goto out_free_memmap;
-
-        /* Bluetooth WLAN coexistence */
-        ret = wl1271_init_pta(wl);
-        if (ret < 0)
-                goto out_free_memmap;
-
-        /* FM WLAN coexistence */
-        ret = wl1271_acx_fm_coex(wl);
-        if (ret < 0)
-                goto out_free_memmap;
-
-        /* Energy detection */
-        ret = wl1271_init_energy_detection(wl);
-        if (ret < 0)
-                goto out_free_memmap;
-
         ret = wl12xx_acx_mem_cfg(wl);
         if (ret < 0)
                 goto out_free_memmap;
 
-        /* Default fragmentation threshold */
-        ret = wl1271_acx_frag_threshold(wl, wl->conf.tx.frag_threshold);
-        if (ret < 0)
-                goto out_free_memmap;
-
-        /* Default TID/AC configuration */
-        BUG_ON(wl->conf.tx.tid_conf_count != wl->conf.tx.ac_conf_count);
-        for (i = 0; i < wl->conf.tx.tid_conf_count; i++) {
-                conf_ac = &wl->conf.tx.ac_conf[i];
-                ret = wl1271_acx_ac_cfg(wl, conf_ac->ac, conf_ac->cw_min,
-                                        conf_ac->cw_max, conf_ac->aifsn,
-                                        conf_ac->tx_op_limit);
-                if (ret < 0)
-                        goto out_free_memmap;
-
-                conf_tid = &wl->conf.tx.tid_conf[i];
-                ret = wl1271_acx_tid_cfg(wl, conf_tid->queue_id,
-                                         conf_tid->channel_type,
-                                         conf_tid->tsid,
-                                         conf_tid->ps_scheme,
-                                         conf_tid->ack_policy,
-                                         conf_tid->apsd_conf[0],
-                                         conf_tid->apsd_conf[1]);
-                if (ret < 0)
-                        goto out_free_memmap;
-        }
-
         /* Enable data path */
         ret = wl1271_cmd_data_path(wl, 1);
         if (ret < 0)
@@ -768,14 +702,12 @@ static int wl1271_plt_init(struct wl1271 *wl)
         return ret;
 }
 
-static void wl12xx_irq_ps_regulate_link(struct wl1271 *wl, u8 hlid, u8 tx_pkts)
+static void wl12xx_irq_ps_regulate_link(struct wl1271 *wl,
+                                        struct wl12xx_vif *wlvif,
+                                        u8 hlid, u8 tx_pkts)
 {
         bool fw_ps, single_sta;
 
-        /* only regulate station links */
-        if (hlid < WL1271_AP_STA_HLID_START)
-                return;
-
         fw_ps = test_bit(hlid, (unsigned long *)&wl->ap_fw_ps_map);
         single_sta = (wl->active_sta_count == 1);
 
@@ -784,7 +716,7 @@ static void wl12xx_irq_ps_regulate_link(struct wl1271 *wl, u8 hlid, u8 tx_pkts)
          * packets in FW or if the STA is awake.
          */
         if (!fw_ps || tx_pkts < WL1271_PS_STA_MAX_PACKETS)
-                wl1271_ps_link_end(wl, hlid);
+                wl12xx_ps_link_end(wl, wlvif, hlid);
 
         /*
          * Start high-level PS if the STA is asleep with enough blocks in FW.
@@ -792,24 +724,14 @@ static void wl12xx_irq_ps_regulate_link(struct wl1271 *wl, u8 hlid, u8 tx_pkts)
          * case FW-memory congestion is not a problem.
          */
         else if (!single_sta && fw_ps && tx_pkts >= WL1271_PS_STA_MAX_PACKETS)
-                wl1271_ps_link_start(wl, hlid, true);
-}
-
-bool wl1271_is_active_sta(struct wl1271 *wl, u8 hlid)
-{
-        int id;
-
-        /* global/broadcast "stations" are always active */
-        if (hlid < WL1271_AP_STA_HLID_START)
-                return true;
-
-        id = hlid - WL1271_AP_STA_HLID_START;
-        return test_bit(id, wl->ap_hlid_map);
+                wl12xx_ps_link_start(wl, wlvif, hlid, true);
 }
 
 static void wl12xx_irq_update_links_status(struct wl1271 *wl,
+                                           struct wl12xx_vif *wlvif,
                                            struct wl12xx_fw_status *status)
 {
+        struct wl1271_link *lnk;
         u32 cur_fw_ps_map;
         u8 hlid, cnt;
 
@@ -825,25 +747,22 @@ static void wl12xx_irq_update_links_status(struct wl1271 *wl,
                 wl->ap_fw_ps_map = cur_fw_ps_map;
         }
 
-        for (hlid = WL1271_AP_STA_HLID_START; hlid < AP_MAX_LINKS; hlid++) {
-                if (!wl1271_is_active_sta(wl, hlid))
-                        continue;
-
-                cnt = status->tx_lnk_free_pkts[hlid] -
-                      wl->links[hlid].prev_freed_pkts;
+        for_each_set_bit(hlid, wlvif->ap.sta_hlid_map, WL12XX_MAX_LINKS) {
+                lnk = &wl->links[hlid];
+                cnt = status->tx_lnk_free_pkts[hlid] - lnk->prev_freed_pkts;
 
-                wl->links[hlid].prev_freed_pkts =
-                        status->tx_lnk_free_pkts[hlid];
-                wl->links[hlid].allocated_pkts -= cnt;
+                lnk->prev_freed_pkts = status->tx_lnk_free_pkts[hlid];
+                lnk->allocated_pkts -= cnt;
 
-                wl12xx_irq_ps_regulate_link(wl, hlid,
-                                            wl->links[hlid].allocated_pkts);
+                wl12xx_irq_ps_regulate_link(wl, wlvif, hlid,
+                                            lnk->allocated_pkts);
         }
 }
 
 static void wl12xx_fw_status(struct wl1271 *wl,
                              struct wl12xx_fw_status *status)
 {
+        struct wl12xx_vif *wlvif;
         struct timespec ts;
         u32 old_tx_blk_count = wl->tx_blocks_available;
         int avail, freed_blocks;
@@ -898,8 +817,9 @@ static void wl12xx_fw_status(struct wl1271 *wl,
                 clear_bit(WL1271_FLAG_FW_TX_BUSY, &wl->flags);
 
         /* for AP update num of allocated TX blocks per link and ps status */
-        if (wl->bss_type == BSS_TYPE_AP_BSS)
-                wl12xx_irq_update_links_status(wl, status);
+        wl12xx_for_each_wlvif_ap(wl, wlvif) {
+                wl12xx_irq_update_links_status(wl, wlvif, status);
+        }
 
         /* update the host-chipset time offset */
         getnstimeofday(&ts);
@@ -932,7 +852,7 @@ static void wl1271_netstack_work(struct work_struct *work)
 
 #define WL1271_IRQ_MAX_LOOPS 256
 
-irqreturn_t wl1271_irq(int irq, void *cookie)
+static irqreturn_t wl1271_irq(int irq, void *cookie)
 {
         int ret;
         u32 intr;
@@ -1054,7 +974,6 @@ out:
 
         return IRQ_HANDLED;
 }
-EXPORT_SYMBOL_GPL(wl1271_irq);
 
 static int wl1271_fetch_firmware(struct wl1271 *wl)
 {
@@ -1069,10 +988,10 @@ static int wl1271_fetch_firmware(struct wl1271 *wl)
 
         wl1271_debug(DEBUG_BOOT, "booting firmware %s", fw_name);
 
-        ret = request_firmware(&fw, fw_name, wl1271_wl_to_dev(wl));
+        ret = request_firmware(&fw, fw_name, wl->dev);
 
         if (ret < 0) {
-                wl1271_error("could not get firmware: %d", ret);
+                wl1271_error("could not get firmware %s: %d", fw_name, ret);
                 return ret;
         }
 
@@ -1107,10 +1026,11 @@ static int wl1271_fetch_nvs(struct wl1271 *wl)
         const struct firmware *fw;
         int ret;
 
-        ret = request_firmware(&fw, WL12XX_NVS_NAME, wl1271_wl_to_dev(wl));
+        ret = request_firmware(&fw, WL12XX_NVS_NAME, wl->dev);
 
         if (ret < 0) {
-                wl1271_error("could not get nvs file: %d", ret);
+                wl1271_error("could not get nvs file %s: %d", WL12XX_NVS_NAME,
+                             ret);
                 return ret;
         }
 
@@ -1217,11 +1137,13 @@ static void wl1271_recovery_work(struct work_struct *work)
 {
         struct wl1271 *wl =
                 container_of(work, struct wl1271, recovery_work);
+        struct wl12xx_vif *wlvif;
+        struct ieee80211_vif *vif;
 
         mutex_lock(&wl->mutex);
 
         if (wl->state != WL1271_STATE_ON)
-                goto out;
+                goto out_unlock;
 
         /* Avoid a recursive recovery */
         set_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags);
@@ -1238,9 +1160,12 @@ static void wl1271_recovery_work(struct work_struct *work)
          * in the firmware during recovery. This doens't hurt if the network is
          * not encrypted.
          */
-        if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags) ||
-            test_bit(WL1271_FLAG_AP_STARTED, &wl->flags))
-                wl->tx_security_seq += WL1271_TX_SQN_POST_RECOVERY_PADDING;
+        wl12xx_for_each_wlvif(wl, wlvif) {
+                if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags) ||
+                    test_bit(WLVIF_FLAG_AP_STARTED, &wlvif->flags))
+                        wlvif->tx_security_seq +=
+                                WL1271_TX_SQN_POST_RECOVERY_PADDING;
+        }
 
         /* Prevent spurious TX during FW restart */
         ieee80211_stop_queues(wl->hw);
@@ -1251,7 +1176,14 @@ static void wl1271_recovery_work(struct work_struct *work)
         }
 
         /* reboot the chipset */
-        __wl1271_op_remove_interface(wl, false);
+        while (!list_empty(&wl->wlvif_list)) {
+                wlvif = list_first_entry(&wl->wlvif_list,
+                                       struct wl12xx_vif, list);
+                vif = wl12xx_wlvif_to_vif(wlvif);
+                __wl1271_op_remove_interface(wl, vif, false);
+        }
+        mutex_unlock(&wl->mutex);
+        wl1271_op_stop(wl->hw);
 
         clear_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags);
 
@@ -1262,8 +1194,8 @@ static void wl1271_recovery_work(struct work_struct *work)
          * to restart the HW.
          */
         ieee80211_wake_queues(wl->hw);
-
-out:
+        return;
+out_unlock:
         mutex_unlock(&wl->mutex);
 }
 
@@ -1318,7 +1250,16 @@ static int wl1271_chip_wakeup(struct wl1271 *wl)
         /* 0. read chip id from CHIP_ID */
         wl->chip.id = wl1271_read32(wl, CHIP_ID_B);
 
-        /* 1. check if chip id is valid */
+        /*
+         * For wl127x based devices we could use the default block
+         * size (512 bytes), but due to a bug in the sdio driver, we
+         * need to set it explicitly after the chip is powered on.  To
+         * simplify the code and since the performance impact is
+         * negligible, we use the same block size for all different
+         * chip types.
+         */
+        if (!wl1271_set_block_size(wl))
+                wl->quirks |= WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT;
 
         switch (wl->chip.id) {
         case CHIP_ID_1271_PG10:
@@ -1328,7 +1269,9 @@ static int wl1271_chip_wakeup(struct wl1271 *wl)
                 ret = wl1271_setup(wl);
                 if (ret < 0)
                         goto out;
+                wl->quirks |= WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT;
                 break;
+
         case CHIP_ID_1271_PG20:
                 wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1271 PG20)",
                              wl->chip.id);
@@ -1336,7 +1279,9 @@ static int wl1271_chip_wakeup(struct wl1271 *wl)
                 ret = wl1271_setup(wl);
                 if (ret < 0)
                         goto out;
+                wl->quirks |= WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT;
                 break;
+
         case CHIP_ID_1283_PG20:
                 wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1283 PG20)",
                              wl->chip.id);
@@ -1344,9 +1289,6 @@ static int wl1271_chip_wakeup(struct wl1271 *wl)
                 ret = wl1271_setup(wl);
                 if (ret < 0)
                         goto out;
-
-                if (wl1271_set_block_size(wl))
-                        wl->quirks |= WL12XX_QUIRK_BLOCKSIZE_ALIGNMENT;
                 break;
         case CHIP_ID_1283_PG10:
         default:
@@ -1389,8 +1331,6 @@ int wl1271_plt_start(struct wl1271 *wl)
                 goto out;
         }
 
-        wl->bss_type = BSS_TYPE_STA_BSS;
-
         while (retries) {
                 retries--;
                 ret = wl1271_chip_wakeup(wl);
@@ -1482,33 +1422,34 @@ int wl1271_plt_stop(struct wl1271 *wl)
 static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
         struct wl1271 *wl = hw->priv;
+        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+        struct ieee80211_vif *vif = info->control.vif;
+        struct wl12xx_vif *wlvif = NULL;
         unsigned long flags;
         int q, mapping;
-        u8 hlid = 0;
+        u8 hlid;
+
+        if (vif)
+                wlvif = wl12xx_vif_to_data(vif);
 
         mapping = skb_get_queue_mapping(skb);
         q = wl1271_tx_get_queue(mapping);
 
-        if (wl->bss_type == BSS_TYPE_AP_BSS)
-                hlid = wl12xx_tx_get_hlid_ap(wl, skb);
+        hlid = wl12xx_tx_get_hlid(wl, wlvif, skb);
 
         spin_lock_irqsave(&wl->wl_lock, flags);
 
         /* queue the packet */
-        if (wl->bss_type == BSS_TYPE_AP_BSS) {
-                if (!wl1271_is_active_sta(wl, hlid)) {
-                        wl1271_debug(DEBUG_TX, "DROP skb hlid %d q %d",
-                                     hlid, q);
-                        dev_kfree_skb(skb);
-                        goto out;
-                }
-
-                wl1271_debug(DEBUG_TX, "queue skb hlid %d q %d", hlid, q);
-                skb_queue_tail(&wl->links[hlid].tx_queue[q], skb);
-        } else {
-                skb_queue_tail(&wl->tx_queue[q], skb);
+        if (hlid == WL12XX_INVALID_LINK_ID ||
+            (wlvif && !test_bit(hlid, wlvif->links_map))) {
+                wl1271_debug(DEBUG_TX, "DROP skb hlid %d q %d", hlid, q);
+                ieee80211_free_txskb(hw, skb);
+                goto out;
         }
 
+        wl1271_debug(DEBUG_TX, "queue skb hlid %d q %d", hlid, q);
+        skb_queue_tail(&wl->links[hlid].tx_queue[q], skb);
+
         wl->tx_queue_count[q]++;
 
         /*
@@ -1609,13 +1550,14 @@ static struct notifier_block wl1271_dev_notifier = {
 };
 
 #ifdef CONFIG_PM
-static int wl1271_configure_suspend_sta(struct wl1271 *wl)
+static int wl1271_configure_suspend_sta(struct wl1271 *wl,
+                                        struct wl12xx_vif *wlvif)
 {
         int ret = 0;
 
         mutex_lock(&wl->mutex);
 
-        if (!test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags))
+        if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
                 goto out_unlock;
 
         ret = wl1271_ps_elp_wakeup(wl);
@@ -1623,12 +1565,12 @@ static int wl1271_configure_suspend_sta(struct wl1271 *wl)
                 goto out_unlock;
 
         /* enter psm if needed*/
-        if (!test_bit(WL1271_FLAG_PSM, &wl->flags)) {
+        if (!test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) {
                 DECLARE_COMPLETION_ONSTACK(compl);
 
-                wl->ps_compl = &compl;
-                ret = wl1271_ps_set_mode(wl, STATION_POWER_SAVE_MODE,
-                                   wl->basic_rate, true);
+                wlvif->ps_compl = &compl;
+                ret = wl1271_ps_set_mode(wl, wlvif, STATION_POWER_SAVE_MODE,
+                                   wlvif->basic_rate, true);
                 if (ret < 0)
                         goto out_sleep;
 
@@ -1638,42 +1580,43 @@ static int wl1271_configure_suspend_sta(struct wl1271 *wl)
 
                 ret = wait_for_completion_timeout(
                         &compl, msecs_to_jiffies(WL1271_PS_COMPLETE_TIMEOUT));
+
+                mutex_lock(&wl->mutex);
                 if (ret <= 0) {
                         wl1271_warning("couldn't enter ps mode!");
                         ret = -EBUSY;
-                        goto out;
+                        goto out_cleanup;
                 }
 
-                /* take mutex again, and wakeup */
-                mutex_lock(&wl->mutex);
-
                 ret = wl1271_ps_elp_wakeup(wl);
                 if (ret < 0)
-                        goto out_unlock;
+                        goto out_cleanup;
         }
 out_sleep:
         wl1271_ps_elp_sleep(wl);
+out_cleanup:
+        wlvif->ps_compl = NULL;
 out_unlock:
         mutex_unlock(&wl->mutex);
-out:
         return ret;
 
 }
 
-static int wl1271_configure_suspend_ap(struct wl1271 *wl)
+static int wl1271_configure_suspend_ap(struct wl1271 *wl,
+                                       struct wl12xx_vif *wlvif)
 {
         int ret = 0;
 
         mutex_lock(&wl->mutex);
 
-        if (!test_bit(WL1271_FLAG_AP_STARTED, &wl->flags))
+        if (!test_bit(WLVIF_FLAG_AP_STARTED, &wlvif->flags))
                 goto out_unlock;
 
         ret = wl1271_ps_elp_wakeup(wl);
         if (ret < 0)
                 goto out_unlock;
 
-        ret = wl1271_acx_beacon_filter_opt(wl, true);
+        ret = wl1271_acx_beacon_filter_opt(wl, wlvif, true);
 
         wl1271_ps_elp_sleep(wl);
 out_unlock:
@@ -1682,20 +1625,22 @@ out_unlock:
 
 }
 
-static int wl1271_configure_suspend(struct wl1271 *wl)
+static int wl1271_configure_suspend(struct wl1271 *wl,
+                                    struct wl12xx_vif *wlvif)
 {
-        if (wl->bss_type == BSS_TYPE_STA_BSS)
-                return wl1271_configure_suspend_sta(wl);
-        if (wl->bss_type == BSS_TYPE_AP_BSS)
-                return wl1271_configure_suspend_ap(wl);
+        if (wlvif->bss_type == BSS_TYPE_STA_BSS)
+                return wl1271_configure_suspend_sta(wl, wlvif);
+        if (wlvif->bss_type == BSS_TYPE_AP_BSS)
+                return wl1271_configure_suspend_ap(wl, wlvif);
         return 0;
 }
 
-static void wl1271_configure_resume(struct wl1271 *wl)
+static void wl1271_configure_resume(struct wl1271 *wl,
+                                    struct wl12xx_vif *wlvif)
 {
         int ret;
-        bool is_sta = wl->bss_type == BSS_TYPE_STA_BSS;
-        bool is_ap = wl->bss_type == BSS_TYPE_AP_BSS;
+        bool is_sta = wlvif->bss_type == BSS_TYPE_STA_BSS;
+        bool is_ap = wlvif->bss_type == BSS_TYPE_AP_BSS;
 
         if (!is_sta && !is_ap)
                 return;
@@ -1707,11 +1652,11 @@ static void wl1271_configure_resume(struct wl1271 *wl)
 
         if (is_sta) {
                 /* exit psm if it wasn't configured */
-                if (!test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags))
-                        wl1271_ps_set_mode(wl, STATION_ACTIVE_MODE,
-                                           wl->basic_rate, true);
+                if (!test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags))
+                        wl1271_ps_set_mode(wl, wlvif, STATION_ACTIVE_MODE,
+                                           wlvif->basic_rate, true);
         } else if (is_ap) {
-                wl1271_acx_beacon_filter_opt(wl, false);
+                wl1271_acx_beacon_filter_opt(wl, wlvif, false);
         }
 
         wl1271_ps_elp_sleep(wl);
@@ -1723,16 +1668,19 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,
                             struct cfg80211_wowlan *wow)
 {
         struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif;
         int ret;
 
         wl1271_debug(DEBUG_MAC80211, "mac80211 suspend wow=%d", !!wow);
         WARN_ON(!wow || !wow->any);
 
         wl->wow_enabled = true;
-        ret = wl1271_configure_suspend(wl);
-        if (ret < 0) {
-                wl1271_warning("couldn't prepare device to suspend");
-                return ret;
+        wl12xx_for_each_wlvif(wl, wlvif) {
+                ret = wl1271_configure_suspend(wl, wlvif);
+                if (ret < 0) {
+                        wl1271_warning("couldn't prepare device to suspend");
+                        return ret;
+                }
         }
         /* flush any remaining work */
         wl1271_debug(DEBUG_MAC80211, "flushing remaining works");
@@ -1751,7 +1699,9 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,
 
         wl1271_enable_interrupts(wl);
         flush_work(&wl->tx_work);
-        flush_delayed_work(&wl->pspoll_work);
+        wl12xx_for_each_wlvif(wl, wlvif) {
+                flush_delayed_work(&wlvif->pspoll_work);
+        }
         flush_delayed_work(&wl->elp_work);
 
         return 0;
@@ -1760,6 +1710,7 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,
 static int wl1271_op_resume(struct ieee80211_hw *hw)
 {
         struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif;
         unsigned long flags;
         bool run_irq_work = false;
 
@@ -1783,7 +1734,9 @@ static int wl1271_op_resume(struct ieee80211_hw *hw)
                 wl1271_irq(0, wl);
                 wl1271_enable_interrupts(wl);
         }
-        wl1271_configure_resume(wl);
+        wl12xx_for_each_wlvif(wl, wlvif) {
+                wl1271_configure_resume(wl, wlvif);
+        }
         wl->wow_enabled = false;
 
         return 0;
@@ -1810,20 +1763,119 @@ static int wl1271_op_start(struct ieee80211_hw *hw)
 
 static void wl1271_op_stop(struct ieee80211_hw *hw)
 {
+        struct wl1271 *wl = hw->priv;
+        int i;
+
         wl1271_debug(DEBUG_MAC80211, "mac80211 stop");
+
+        mutex_lock(&wl->mutex);
+        if (wl->state == WL1271_STATE_OFF) {
+                mutex_unlock(&wl->mutex);
+                return;
+        }
+        /*
+         * this must be before the cancel_work calls below, so that the work
+         * functions don't perform further work.
+         */
+        wl->state = WL1271_STATE_OFF;
+        mutex_unlock(&wl->mutex);
+
+        mutex_lock(&wl_list_mutex);
+        list_del(&wl->list);
+        mutex_unlock(&wl_list_mutex);
+
+        wl1271_disable_interrupts(wl);
+        wl1271_flush_deferred_work(wl);
+        cancel_delayed_work_sync(&wl->scan_complete_work);
+        cancel_work_sync(&wl->netstack_work);
+        cancel_work_sync(&wl->tx_work);
+        cancel_delayed_work_sync(&wl->elp_work);
+
+        /* let's notify MAC80211 about the remaining pending TX frames */
+        wl12xx_tx_reset(wl, true);
+        mutex_lock(&wl->mutex);
+
+        wl1271_power_off(wl);
+
+        wl->band = IEEE80211_BAND_2GHZ;
+
+        wl->rx_counter = 0;
+        wl->power_level = WL1271_DEFAULT_POWER_LEVEL;
+        wl->tx_blocks_available = 0;
+        wl->tx_allocated_blocks = 0;
+        wl->tx_results_count = 0;
+        wl->tx_packets_count = 0;
+        wl->time_offset = 0;
+        wl->tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;
+        wl->ap_fw_ps_map = 0;
+        wl->ap_ps_map = 0;
+        wl->sched_scanning = false;
+        memset(wl->roles_map, 0, sizeof(wl->roles_map));
+        memset(wl->links_map, 0, sizeof(wl->links_map));
+        memset(wl->roc_map, 0, sizeof(wl->roc_map));
+        wl->active_sta_count = 0;
+
+        /* The system link is always allocated */
+        __set_bit(WL12XX_SYSTEM_HLID, wl->links_map);
+
+        /*
+         * this is performed after the cancel_work calls and the associated
+         * mutex_lock, so that wl1271_op_add_interface does not accidentally
+         * get executed before all these vars have been reset.
+         */
+        wl->flags = 0;
+
+        wl->tx_blocks_freed = 0;
+
+        for (i = 0; i < NUM_TX_QUEUES; i++) {
+                wl->tx_pkts_freed[i] = 0;
+                wl->tx_allocated_pkts[i] = 0;
+        }
+
+        wl1271_debugfs_reset(wl);
+
+        kfree(wl->fw_status);
+        wl->fw_status = NULL;
+        kfree(wl->tx_res_if);
+        wl->tx_res_if = NULL;
+        kfree(wl->target_mem_map);
+        wl->target_mem_map = NULL;
+
+        mutex_unlock(&wl->mutex);
+}
+
+static int wl12xx_allocate_rate_policy(struct wl1271 *wl, u8 *idx)
+{
+        u8 policy = find_first_zero_bit(wl->rate_policies_map,
+                                        WL12XX_MAX_RATE_POLICIES);
+        if (policy >= WL12XX_MAX_RATE_POLICIES)
+                return -EBUSY;
+
+        __set_bit(policy, wl->rate_policies_map);
+        *idx = policy;
+        return 0;
+}
+
+static void wl12xx_free_rate_policy(struct wl1271 *wl, u8 *idx)
+{
+        if (WARN_ON(*idx >= WL12XX_MAX_RATE_POLICIES))
+                return;
+
+        __clear_bit(*idx, wl->rate_policies_map);
+        *idx = WL12XX_MAX_RATE_POLICIES;
 }
 
-static u8 wl12xx_get_role_type(struct wl1271 *wl)
+static u8 wl12xx_get_role_type(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
-        switch (wl->bss_type) {
+        switch (wlvif->bss_type) {
         case BSS_TYPE_AP_BSS:
-                if (wl->p2p)
+                if (wlvif->p2p)
                         return WL1271_ROLE_P2P_GO;
                 else
                         return WL1271_ROLE_AP;
 
         case BSS_TYPE_STA_BSS:
-                if (wl->p2p)
+                if (wlvif->p2p)
                         return WL1271_ROLE_P2P_CL;
                 else
                         return WL1271_ROLE_STA;
@@ -1832,78 +1884,95 @@ static u8 wl12xx_get_role_type(struct wl1271 *wl)
                 return WL1271_ROLE_IBSS;
 
         default:
-                wl1271_error("invalid bss_type: %d", wl->bss_type);
+                wl1271_error("invalid bss_type: %d", wlvif->bss_type);
         }
         return WL12XX_INVALID_ROLE_TYPE;
 }
 
-static int wl1271_op_add_interface(struct ieee80211_hw *hw,
-                                   struct ieee80211_vif *vif)
+static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif)
 {
-        struct wl1271 *wl = hw->priv;
-        struct wiphy *wiphy = hw->wiphy;
-        int retries = WL1271_BOOT_RETRIES;
-        int ret = 0;
-        u8 role_type;
-        bool booted = false;
-
-        wl1271_debug(DEBUG_MAC80211, "mac80211 add interface type %d mac %pM",
-                     ieee80211_vif_type_p2p(vif), vif->addr);
-
-        mutex_lock(&wl->mutex);
-        if (wl->vif) {
-                wl1271_debug(DEBUG_MAC80211,
-                             "multiple vifs are not supported yet");
-                ret = -EBUSY;
-                goto out;
-        }
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
+        int i;
 
-        /*
-         * in some very corner case HW recovery scenarios its possible to
-         * get here before __wl1271_op_remove_interface is complete, so
-         * opt out if that is the case.
-         */
-        if (test_bit(WL1271_FLAG_IF_INITIALIZED, &wl->flags)) {
-                ret = -EBUSY;
-                goto out;
-        }
+        /* clear everything but the persistent data */
+        memset(wlvif, 0, offsetof(struct wl12xx_vif, persistent));
 
         switch (ieee80211_vif_type_p2p(vif)) {
         case NL80211_IFTYPE_P2P_CLIENT:
-                wl->p2p = 1;
+                wlvif->p2p = 1;
                 /* fall-through */
         case NL80211_IFTYPE_STATION:
-                wl->bss_type = BSS_TYPE_STA_BSS;
-                wl->set_bss_type = BSS_TYPE_STA_BSS;
+                wlvif->bss_type = BSS_TYPE_STA_BSS;
                 break;
         case NL80211_IFTYPE_ADHOC:
-                wl->bss_type = BSS_TYPE_IBSS;
-                wl->set_bss_type = BSS_TYPE_STA_BSS;
+                wlvif->bss_type = BSS_TYPE_IBSS;
                 break;
         case NL80211_IFTYPE_P2P_GO:
-                wl->p2p = 1;
+                wlvif->p2p = 1;
                 /* fall-through */
         case NL80211_IFTYPE_AP:
-                wl->bss_type = BSS_TYPE_AP_BSS;
+                wlvif->bss_type = BSS_TYPE_AP_BSS;
                 break;
         default:
-                ret = -EOPNOTSUPP;
-                goto out;
+                wlvif->bss_type = MAX_BSS_TYPE;
+                return -EOPNOTSUPP;
         }
 
-        role_type = wl12xx_get_role_type(wl);
-        if (role_type == WL12XX_INVALID_ROLE_TYPE) {
-                ret = -EINVAL;
-                goto out;
+        wlvif->role_id = WL12XX_INVALID_ROLE_ID;
+        wlvif->dev_role_id = WL12XX_INVALID_ROLE_ID;
+        wlvif->dev_hlid = WL12XX_INVALID_LINK_ID;
+
+        if (wlvif->bss_type == BSS_TYPE_STA_BSS ||
+            wlvif->bss_type == BSS_TYPE_IBSS) {
+                /* init sta/ibss data */
+                wlvif->sta.hlid = WL12XX_INVALID_LINK_ID;
+                wl12xx_allocate_rate_policy(wl, &wlvif->sta.basic_rate_idx);
+                wl12xx_allocate_rate_policy(wl, &wlvif->sta.ap_rate_idx);
+                wl12xx_allocate_rate_policy(wl, &wlvif->sta.p2p_rate_idx);
+        } else {
+                /* init ap data */
+                wlvif->ap.bcast_hlid = WL12XX_INVALID_LINK_ID;
+                wlvif->ap.global_hlid = WL12XX_INVALID_LINK_ID;
+                wl12xx_allocate_rate_policy(wl, &wlvif->ap.mgmt_rate_idx);
+                wl12xx_allocate_rate_policy(wl, &wlvif->ap.bcast_rate_idx);
+                for (i = 0; i < CONF_TX_MAX_AC_COUNT; i++)
+                        wl12xx_allocate_rate_policy(wl,
+                                                &wlvif->ap.ucast_rate_idx[i]);
         }
-        memcpy(wl->mac_addr, vif->addr, ETH_ALEN);
 
-        if (wl->state != WL1271_STATE_OFF) {
-                wl1271_error("cannot start because not in off state: %d",
-                             wl->state);
-                ret = -EBUSY;
-                goto out;
-        }
+        wlvif->bitrate_masks[IEEE80211_BAND_2GHZ] = wl->conf.tx.basic_rate;
+        wlvif->bitrate_masks[IEEE80211_BAND_5GHZ] = wl->conf.tx.basic_rate_5;
+        wlvif->basic_rate_set = CONF_TX_RATE_MASK_BASIC;
+        wlvif->basic_rate = CONF_TX_RATE_MASK_BASIC;
+        wlvif->rate_set = CONF_TX_RATE_MASK_BASIC;
+        wlvif->beacon_int = WL1271_DEFAULT_BEACON_INT;
+
+        /*
+         * mac80211 configures some values globally, while we treat them
+         * per-interface. thus, on init, we have to copy them from wl
+         */
+        wlvif->band = wl->band;
+        wlvif->channel = wl->channel;
+        wlvif->power_level = wl->power_level;
+
+        INIT_WORK(&wlvif->rx_streaming_enable_work,
+                  wl1271_rx_streaming_enable_work);
+        INIT_WORK(&wlvif->rx_streaming_disable_work,
+                  wl1271_rx_streaming_disable_work);
+        INIT_DELAYED_WORK(&wlvif->pspoll_work, wl1271_pspoll_work);
+        INIT_LIST_HEAD(&wlvif->list);
+
+        setup_timer(&wlvif->rx_streaming_timer, wl1271_rx_streaming_timer,
+                    (unsigned long) wlvif);
+        return 0;
+}
+
+static bool wl12xx_init_fw(struct wl1271 *wl)
+{
+        int retries = WL1271_BOOT_RETRIES;
+        bool booted = false;
+        struct wiphy *wiphy = wl->hw->wiphy;
+        int ret;
 
         while (retries) {
                 retries--;
@@ -1915,25 +1984,6 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
                 if (ret < 0)
                         goto power_off;
 
-                if (wl->bss_type == BSS_TYPE_STA_BSS ||
-                    wl->bss_type == BSS_TYPE_IBSS) {
-                        /*
-                         * The device role is a special role used for
-                         * rx and tx frames prior to association (as
-                         * the STA role can get packets only from
-                         * its associated bssid)
-                         */
-                        ret = wl12xx_cmd_role_enable(wl,
-                                                         WL1271_ROLE_DEVICE,
-                                                         &wl->dev_role_id);
-                        if (ret < 0)
-                                goto irq_disable;
-                }
-
-                ret = wl12xx_cmd_role_enable(wl, role_type, &wl->role_id);
-                if (ret < 0)
-                        goto irq_disable;
-
                 ret = wl1271_hw_init(wl);
                 if (ret < 0)
                         goto irq_disable;
@@ -1964,9 +2014,6 @@ power_off:
                 goto out;
         }
 
-        wl->vif = vif;
-        wl->state = WL1271_STATE_ON;
-        set_bit(WL1271_FLAG_IF_INITIALIZED, &wl->flags);
         wl1271_info("firmware booted (%s)", wl->chip.fw_ver_str);
 
         /* update hw/fw version info in wiphy struct */
@@ -1984,7 +2031,110 @@ power_off:
         wl1271_debug(DEBUG_MAC80211, "11a is %ssupported",
                      wl->enable_11a ? "" : "not ");
 
+        wl->state = WL1271_STATE_ON;
 out:
+        return booted;
+}
+
+static int wl1271_op_add_interface(struct ieee80211_hw *hw,
+                                   struct ieee80211_vif *vif)
+{
+        struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
+        int ret = 0;
+        u8 role_type;
+        bool booted = false;
+
+        wl1271_debug(DEBUG_MAC80211, "mac80211 add interface type %d mac %pM",
+                     ieee80211_vif_type_p2p(vif), vif->addr);
+
+        mutex_lock(&wl->mutex);
+        ret = wl1271_ps_elp_wakeup(wl);
+        if (ret < 0)
+                goto out_unlock;
+
+        if (wl->vif) {
+                wl1271_debug(DEBUG_MAC80211,
+                             "multiple vifs are not supported yet");
+                ret = -EBUSY;
+                goto out;
+        }
+
+        /*
+         * in some very corner case HW recovery scenarios its possible to
+         * get here before __wl1271_op_remove_interface is complete, so
+         * opt out if that is the case.
+         */
+        if (test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags) ||
+            test_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags)) {
+                ret = -EBUSY;
+                goto out;
+        }
+
+        ret = wl12xx_init_vif_data(wl, vif);
+        if (ret < 0)
+                goto out;
+
+        wlvif->wl = wl;
+        role_type = wl12xx_get_role_type(wl, wlvif);
+        if (role_type == WL12XX_INVALID_ROLE_TYPE) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        /*
+         * TODO: after the nvs issue will be solved, move this block
+         * to start(), and make sure here the driver is ON.
+         */
+        if (wl->state == WL1271_STATE_OFF) {
+                /*
+                 * we still need this in order to configure the fw
+                 * while uploading the nvs
+                 */
+                memcpy(wl->mac_addr, vif->addr, ETH_ALEN);
+
+                booted = wl12xx_init_fw(wl);
+                if (!booted) {
+                        ret = -EINVAL;
+                        goto out;
+                }
+        }
+
+        if (wlvif->bss_type == BSS_TYPE_STA_BSS ||
+            wlvif->bss_type == BSS_TYPE_IBSS) {
+                /*
+                 * The device role is a special role used for
+                 * rx and tx frames prior to association (as
+                 * the STA role can get packets only from
+                 * its associated bssid)
+                 */
+                ret = wl12xx_cmd_role_enable(wl, vif->addr,
+                                                 WL1271_ROLE_DEVICE,
+                                                 &wlvif->dev_role_id);
+                if (ret < 0)
+                        goto out;
+        }
+
+        ret = wl12xx_cmd_role_enable(wl, vif->addr,
+                                     role_type, &wlvif->role_id);
+        if (ret < 0)
+                goto out;
+
+        ret = wl1271_init_vif_specific(wl, vif);
+        if (ret < 0)
+                goto out;
+
+        wl->vif = vif;
+        list_add(&wlvif->list, &wl->wlvif_list);
+        set_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags);
+
+        if (wlvif->bss_type == BSS_TYPE_AP_BSS)
+                wl->ap_count++;
+        else
+                wl->sta_count++;
+out:
+        wl1271_ps_elp_sleep(wl);
+out_unlock:
         mutex_unlock(&wl->mutex);
 
         mutex_lock(&wl_list_mutex);
@@ -1996,29 +2146,34 @@ out:
 }
 
 static void __wl1271_op_remove_interface(struct wl1271 *wl,
+                                         struct ieee80211_vif *vif,
                                          bool reset_tx_queues)
 {
-        int ret, i;
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
+        int i, ret;
 
         wl1271_debug(DEBUG_MAC80211, "mac80211 remove interface");
 
+        if (!test_and_clear_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags))
+                return;
+
+        wl->vif = NULL;
+
         /* because of hardware recovery, we may get here twice */
         if (wl->state != WL1271_STATE_ON)
                 return;
 
         wl1271_info("down");
 
-        mutex_lock(&wl_list_mutex);
-        list_del(&wl->list);
-        mutex_unlock(&wl_list_mutex);
-
         /* enable dyn ps just in case (if left on due to fw crash etc) */
-        if (wl->bss_type == BSS_TYPE_STA_BSS)
-                ieee80211_enable_dyn_ps(wl->vif);
+        if (wlvif->bss_type == BSS_TYPE_STA_BSS)
+                ieee80211_enable_dyn_ps(vif);
 
-        if (wl->scan.state != WL1271_SCAN_STATE_IDLE) {
+        if (wl->scan.state != WL1271_SCAN_STATE_IDLE &&
+            wl->scan_vif == vif) {
                 wl->scan.state = WL1271_SCAN_STATE_IDLE;
                 memset(wl->scan.scanned_ch, 0, sizeof(wl->scan.scanned_ch));
+                wl->scan_vif = NULL;
                 wl->scan.req = NULL;
                 ieee80211_scan_completed(wl->hw, true);
         }
@@ -2029,13 +2184,13 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
                 if (ret < 0)
                         goto deinit;
 
-                if (wl->bss_type == BSS_TYPE_STA_BSS) {
-                        ret = wl12xx_cmd_role_disable(wl, &wl->dev_role_id);
+                if (wlvif->bss_type == BSS_TYPE_STA_BSS) {
+                        ret = wl12xx_cmd_role_disable(wl, &wlvif->dev_role_id);
                         if (ret < 0)
                                 goto deinit;
                 }
 
-                ret = wl12xx_cmd_role_disable(wl, &wl->role_id);
+                ret = wl12xx_cmd_role_disable(wl, &wlvif->role_id);
                 if (ret < 0)
                         goto deinit;
 
@@ -2043,120 +2198,82 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
         }
 deinit:
         /* clear all hlids (except system_hlid) */
-        wl->sta_hlid = WL12XX_INVALID_LINK_ID;
-        wl->dev_hlid = WL12XX_INVALID_LINK_ID;
-        wl->ap_bcast_hlid = WL12XX_INVALID_LINK_ID;
-        wl->ap_global_hlid = WL12XX_INVALID_LINK_ID;
+        wlvif->dev_hlid = WL12XX_INVALID_LINK_ID;
+
+        if (wlvif->bss_type == BSS_TYPE_STA_BSS ||
+            wlvif->bss_type == BSS_TYPE_IBSS) {
+                wlvif->sta.hlid = WL12XX_INVALID_LINK_ID;
+                wl12xx_free_rate_policy(wl, &wlvif->sta.basic_rate_idx);
+                wl12xx_free_rate_policy(wl, &wlvif->sta.ap_rate_idx);
+                wl12xx_free_rate_policy(wl, &wlvif->sta.p2p_rate_idx);
+        } else {
+                wlvif->ap.bcast_hlid = WL12XX_INVALID_LINK_ID;
+                wlvif->ap.global_hlid = WL12XX_INVALID_LINK_ID;
+                wl12xx_free_rate_policy(wl, &wlvif->ap.mgmt_rate_idx);
+                wl12xx_free_rate_policy(wl, &wlvif->ap.bcast_rate_idx);
+                for (i = 0; i < CONF_TX_MAX_AC_COUNT; i++)
+                        wl12xx_free_rate_policy(wl,
+                                                &wlvif->ap.ucast_rate_idx[i]);
+        }
 
-        /*
-         * this must be before the cancel_work calls below, so that the work
-         * functions don't perform further work.
-         */
-        wl->state = WL1271_STATE_OFF;
+        wl12xx_tx_reset_wlvif(wl, wlvif);
+        wl1271_free_ap_keys(wl, wlvif);
+        if (wl->last_wlvif == wlvif)
+                wl->last_wlvif = NULL;
+        list_del(&wlvif->list);
+        memset(wlvif->ap.sta_hlid_map, 0, sizeof(wlvif->ap.sta_hlid_map));
+        wlvif->role_id = WL12XX_INVALID_ROLE_ID;
+        wlvif->dev_role_id = WL12XX_INVALID_ROLE_ID;
+
+        if (wlvif->bss_type == BSS_TYPE_AP_BSS)
+                wl->ap_count--;
+        else
+                wl->sta_count--;
 
         mutex_unlock(&wl->mutex);
-
-        wl1271_disable_interrupts(wl);
-        wl1271_flush_deferred_work(wl);
-        cancel_delayed_work_sync(&wl->scan_complete_work);
-        cancel_work_sync(&wl->netstack_work);
-        cancel_work_sync(&wl->tx_work);
-        del_timer_sync(&wl->rx_streaming_timer);
-        cancel_work_sync(&wl->rx_streaming_enable_work);
-        cancel_work_sync(&wl->rx_streaming_disable_work);
-        cancel_delayed_work_sync(&wl->pspoll_work);
-        cancel_delayed_work_sync(&wl->elp_work);
+        del_timer_sync(&wlvif->rx_streaming_timer);
+        cancel_work_sync(&wlvif->rx_streaming_enable_work);
+        cancel_work_sync(&wlvif->rx_streaming_disable_work);
+        cancel_delayed_work_sync(&wlvif->pspoll_work);
 
         mutex_lock(&wl->mutex);
-
-        /* let's notify MAC80211 about the remaining pending TX frames */
-        wl1271_tx_reset(wl, reset_tx_queues);
-        wl1271_power_off(wl);
-
-        memset(wl->bssid, 0, ETH_ALEN);
-        memset(wl->ssid, 0, IEEE80211_MAX_SSID_LEN + 1);
-        wl->ssid_len = 0;
-        wl->bss_type = MAX_BSS_TYPE;
-        wl->set_bss_type = MAX_BSS_TYPE;
-        wl->p2p = 0;
-        wl->band = IEEE80211_BAND_2GHZ;
-
-        wl->rx_counter = 0;
-        wl->psm_entry_retry = 0;
-        wl->power_level = WL1271_DEFAULT_POWER_LEVEL;
-        wl->tx_blocks_available = 0;
-        wl->tx_allocated_blocks = 0;
-        wl->tx_results_count = 0;
-        wl->tx_packets_count = 0;
-        wl->time_offset = 0;
-        wl->session_counter = 0;
-        wl->rate_set = CONF_TX_RATE_MASK_BASIC;
-        wl->bitrate_masks[IEEE80211_BAND_2GHZ] = wl->conf.tx.basic_rate;
-        wl->bitrate_masks[IEEE80211_BAND_5GHZ] = wl->conf.tx.basic_rate_5;
-        wl->vif = NULL;
-        wl->tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;
-        wl1271_free_ap_keys(wl);
-        memset(wl->ap_hlid_map, 0, sizeof(wl->ap_hlid_map));
-        wl->ap_fw_ps_map = 0;
-        wl->ap_ps_map = 0;
-        wl->sched_scanning = false;
-        wl->role_id = WL12XX_INVALID_ROLE_ID;
-        wl->dev_role_id = WL12XX_INVALID_ROLE_ID;
-        memset(wl->roles_map, 0, sizeof(wl->roles_map));
-        memset(wl->links_map, 0, sizeof(wl->links_map));
-        memset(wl->roc_map, 0, sizeof(wl->roc_map));
-        wl->active_sta_count = 0;
-
-        /* The system link is always allocated */
-        __set_bit(WL12XX_SYSTEM_HLID, wl->links_map);
-
-        /*
-         * this is performed after the cancel_work calls and the associated
-         * mutex_lock, so that wl1271_op_add_interface does not accidentally
-         * get executed before all these vars have been reset.
-         */
-        wl->flags = 0;
-
-        wl->tx_blocks_freed = 0;
-
-        for (i = 0; i < NUM_TX_QUEUES; i++) {
-                wl->tx_pkts_freed[i] = 0;
-                wl->tx_allocated_pkts[i] = 0;
-        }
-
-        wl1271_debugfs_reset(wl);
-
-        kfree(wl->fw_status);
-        wl->fw_status = NULL;
-        kfree(wl->tx_res_if);
-        wl->tx_res_if = NULL;
-        kfree(wl->target_mem_map);
-        wl->target_mem_map = NULL;
 }
 
 static void wl1271_op_remove_interface(struct ieee80211_hw *hw,
                                        struct ieee80211_vif *vif)
 {
         struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
+        struct wl12xx_vif *iter;
 
         mutex_lock(&wl->mutex);
+
+        if (wl->state == WL1271_STATE_OFF ||
+            !test_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags))
+                goto out;
+
         /*
          * wl->vif can be null here if someone shuts down the interface
          * just when hardware recovery has been started.
          */
-        if (wl->vif) {
-                WARN_ON(wl->vif != vif);
-                __wl1271_op_remove_interface(wl, true);
-        }
+        wl12xx_for_each_wlvif(wl, iter) {
+                if (iter != wlvif)
+                        continue;
 
+                __wl1271_op_remove_interface(wl, vif, true);
+                break;
+        }
+        WARN_ON(iter != wlvif);
+out:
         mutex_unlock(&wl->mutex);
         cancel_work_sync(&wl->recovery_work);
 }
 
-static int wl1271_join(struct wl1271 *wl, bool set_assoc)
+static int wl1271_join(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                          bool set_assoc)
 {
         int ret;
-        bool is_ibss = (wl->bss_type == BSS_TYPE_IBSS);
+        bool is_ibss = (wlvif->bss_type == BSS_TYPE_IBSS);
 
         /*
          * One of the side effects of the JOIN command is that is clears
@@ -2167,20 +2284,20 @@ static int wl1271_join(struct wl1271 *wl, bool set_assoc)
          * Keep the below message for now, unless it starts bothering
          * users who really like to roam a lot :)
          */
-        if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags))
+        if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
                 wl1271_info("JOIN while associated.");
 
         if (set_assoc)
-                set_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags);
+                set_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags);
 
         if (is_ibss)
-                ret = wl12xx_cmd_role_start_ibss(wl);
+                ret = wl12xx_cmd_role_start_ibss(wl, wlvif);
         else
-                ret = wl12xx_cmd_role_start_sta(wl);
+                ret = wl12xx_cmd_role_start_sta(wl, wlvif);
         if (ret < 0)
                 goto out;
 
-        if (!test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags))
+        if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
                 goto out;
 
         /*
@@ -2189,19 +2306,20 @@ static int wl1271_join(struct wl1271 *wl, bool set_assoc)
          * the join. The acx_aid starts the keep-alive process, and the order
          * of the commands below is relevant.
          */
-        ret = wl1271_acx_keep_alive_mode(wl, true);
+        ret = wl1271_acx_keep_alive_mode(wl, wlvif, true);
         if (ret < 0)
                 goto out;
 
-        ret = wl1271_acx_aid(wl, wl->aid);
+        ret = wl1271_acx_aid(wl, wlvif, wlvif->aid);
         if (ret < 0)
                 goto out;
 
-        ret = wl1271_cmd_build_klv_null_data(wl);
+        ret = wl12xx_cmd_build_klv_null_data(wl, wlvif);
         if (ret < 0)
                 goto out;
 
-        ret = wl1271_acx_keep_alive_config(wl, CMD_TEMPL_KLV_IDX_NULL_DATA,
+        ret = wl1271_acx_keep_alive_config(wl, wlvif,
+                                           CMD_TEMPL_KLV_IDX_NULL_DATA,
                                            ACX_KEEP_ALIVE_TPL_VALID);
         if (ret < 0)
                 goto out;
@@ -2210,34 +2328,34 @@ out:
         return ret;
 }
 
-static int wl1271_unjoin(struct wl1271 *wl)
+static int wl1271_unjoin(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         int ret;
 
-        if (test_and_clear_bit(WL1271_FLAG_CS_PROGRESS, &wl->flags)) {
+        if (test_and_clear_bit(WLVIF_FLAG_CS_PROGRESS, &wlvif->flags)) {
+                struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
+
                 wl12xx_cmd_stop_channel_switch(wl);
-                ieee80211_chswitch_done(wl->vif, false);
+                ieee80211_chswitch_done(vif, false);
         }
 
         /* to stop listening to a channel, we disconnect */
-        ret = wl12xx_cmd_role_stop_sta(wl);
+        ret = wl12xx_cmd_role_stop_sta(wl, wlvif);
         if (ret < 0)
                 goto out;
 
-        memset(wl->bssid, 0, ETH_ALEN);
-
         /* reset TX security counters on a clean disconnect */
-        wl->tx_security_last_seq_lsb = 0;
-        wl->tx_security_seq = 0;
+        wlvif->tx_security_last_seq_lsb = 0;
+        wlvif->tx_security_seq = 0;
 
 out:
         return ret;
 }
 
-static void wl1271_set_band_rate(struct wl1271 *wl)
+static void wl1271_set_band_rate(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
-        wl->basic_rate_set = wl->bitrate_masks[wl->band];
-        wl->rate_set = wl->basic_rate_set;
+        wlvif->basic_rate_set = wlvif->bitrate_masks[wlvif->band];
+        wlvif->rate_set = wlvif->basic_rate_set;
 }
 
 static bool wl12xx_is_roc(struct wl1271 *wl)
@@ -2251,27 +2369,25 @@ static bool wl12xx_is_roc(struct wl1271 *wl)
         return true;
 }
 
-static int wl1271_sta_handle_idle(struct wl1271 *wl, bool idle)
+static int wl1271_sta_handle_idle(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                                  bool idle)
 {
         int ret;
 
         if (idle) {
                 /* no need to croc if we weren't busy (e.g. during boot) */
                 if (wl12xx_is_roc(wl)) {
-                        ret = wl12xx_croc(wl, wl->dev_role_id);
-                        if (ret < 0)
-                                goto out;
-
-                        ret = wl12xx_cmd_role_stop_dev(wl);
+                        ret = wl12xx_stop_dev(wl, wlvif);
                         if (ret < 0)
                                 goto out;
                 }
-                wl->rate_set = wl1271_tx_min_rate_get(wl, wl->basic_rate_set);
-                ret = wl1271_acx_sta_rate_policies(wl);
+                wlvif->rate_set =
+                        wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
+                ret = wl1271_acx_sta_rate_policies(wl, wlvif);
                 if (ret < 0)
                         goto out;
                 ret = wl1271_acx_keep_alive_config(
-                        wl, CMD_TEMPL_KLV_IDX_NULL_DATA,
+                        wl, wlvif, CMD_TEMPL_KLV_IDX_NULL_DATA,
                         ACX_KEEP_ALIVE_TPL_INVALID);
                 if (ret < 0)
                         goto out;
@@ -2283,11 +2399,7 @@ static int wl1271_sta_handle_idle(struct wl1271 *wl, bool idle)
                         ieee80211_sched_scan_stopped(wl->hw);
                 }
 
-                ret = wl12xx_cmd_role_start_dev(wl);
-                if (ret < 0)
-                        goto out;
-
-                ret = wl12xx_roc(wl, wl->dev_role_id);
+                ret = wl12xx_start_dev(wl, wlvif);
                 if (ret < 0)
                         goto out;
                 clear_bit(WL1271_FLAG_IDLE, &wl->flags);
@@ -2297,61 +2409,22 @@ out:
         return ret;
 }
 
-static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
+static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                             struct ieee80211_conf *conf, u32 changed)
 {
-        struct wl1271 *wl = hw->priv;
-        struct ieee80211_conf *conf = &hw->conf;
-        int channel, ret = 0;
-        bool is_ap;
+        bool is_ap = (wlvif->bss_type == BSS_TYPE_AP_BSS);
+        int channel, ret;
 
         channel = ieee80211_frequency_to_channel(conf->channel->center_freq);
 
-        wl1271_debug(DEBUG_MAC80211, "mac80211 config ch %d psm %s power %d %s"
-                     " changed 0x%x",
-                     channel,
-                     conf->flags & IEEE80211_CONF_PS ? "on" : "off",
-                     conf->power_level,
-                     conf->flags & IEEE80211_CONF_IDLE ? "idle" : "in use",
-                         changed);
-
-        /*
-         * mac80211 will go to idle nearly immediately after transmitting some
-         * frames, such as the deauth. To make sure those frames reach the air,
-         * wait here until the TX queue is fully flushed.
-         */
-        if ((changed & IEEE80211_CONF_CHANGE_IDLE) &&
-            (conf->flags & IEEE80211_CONF_IDLE))
-                wl1271_tx_flush(wl);
-
-        mutex_lock(&wl->mutex);
-
-        if (unlikely(wl->state == WL1271_STATE_OFF)) {
-                /* we support configuring the channel and band while off */
-                if ((changed & IEEE80211_CONF_CHANGE_CHANNEL)) {
-                        wl->band = conf->channel->band;
-                        wl->channel = channel;
-                }
-
-                if ((changed & IEEE80211_CONF_CHANGE_POWER))
-                        wl->power_level = conf->power_level;
-
-                goto out;
-        }
-
-        is_ap = (wl->bss_type == BSS_TYPE_AP_BSS);
-
-        ret = wl1271_ps_elp_wakeup(wl);
-        if (ret < 0)
-                goto out;
-
         /* if the channel changes while joined, join again */
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL &&
-            ((wl->band != conf->channel->band) ||
-             (wl->channel != channel))) {
+            ((wlvif->band != conf->channel->band) ||
+             (wlvif->channel != channel))) {
                 /* send all pending packets */
                 wl1271_tx_work_locked(wl);
-                wl->band = conf->channel->band;
-                wl->channel = channel;
+                wlvif->band = conf->channel->band;
+                wlvif->channel = channel;
 
                 if (!is_ap) {
                         /*
@@ -2360,24 +2433,27 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
                          * possible rate for the band as a fixed rate for
                          * association frames and other control messages.
                          */
-                        if (!test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags))
-                                wl1271_set_band_rate(wl);
+                        if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
+                                wl1271_set_band_rate(wl, wlvif);
 
-                        wl->basic_rate =
-                                wl1271_tx_min_rate_get(wl, wl->basic_rate_set);
-                        ret = wl1271_acx_sta_rate_policies(wl);
+                        wlvif->basic_rate =
+                                wl1271_tx_min_rate_get(wl,
+                                                       wlvif->basic_rate_set);
+                        ret = wl1271_acx_sta_rate_policies(wl, wlvif);
                         if (ret < 0)
                                 wl1271_warning("rate policy for channel "
                                                "failed %d", ret);
 
-                        if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags)) {
+                        if (test_bit(WLVIF_FLAG_STA_ASSOCIATED,
+                                     &wlvif->flags)) {
                                 if (wl12xx_is_roc(wl)) {
                                         /* roaming */
-                                        ret = wl12xx_croc(wl, wl->dev_role_id);
+                                        ret = wl12xx_croc(wl,
+                                                          wlvif->dev_role_id);
                                         if (ret < 0)
-                                                goto out_sleep;
+                                                return ret;
                                 }
-                                ret = wl1271_join(wl, false);
+                                ret = wl1271_join(wl, wlvif, false);
                                 if (ret < 0)
                                         wl1271_warning("cmd join on channel "
                                                        "failed %d", ret);
@@ -2389,64 +2465,112 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
                                  */
                                 if (wl12xx_is_roc(wl) &&
                                     !(conf->flags & IEEE80211_CONF_IDLE)) {
-                                        ret = wl12xx_croc(wl, wl->dev_role_id);
+                                        ret = wl12xx_stop_dev(wl, wlvif);
                                         if (ret < 0)
-                                                goto out_sleep;
+                                                return ret;
 
-                                        ret = wl12xx_roc(wl, wl->dev_role_id);
+                                        ret = wl12xx_start_dev(wl, wlvif);
                                         if (ret < 0)
-                                                wl1271_warning("roc failed %d",
-                                                               ret);
+                                                return ret;
                                 }
                         }
                 }
         }
 
-        if (changed & IEEE80211_CONF_CHANGE_IDLE && !is_ap) {
-                ret = wl1271_sta_handle_idle(wl,
-                                        conf->flags & IEEE80211_CONF_IDLE);
-                if (ret < 0)
-                        wl1271_warning("idle mode change failed %d", ret);
-        }
-
         /*
          * if mac80211 changes the PSM mode, make sure the mode is not
          * incorrectly changed after the pspoll failure active window.
          */
         if (changed & IEEE80211_CONF_CHANGE_PS)
-                clear_bit(WL1271_FLAG_PSPOLL_FAILURE, &wl->flags);
+                clear_bit(WLVIF_FLAG_PSPOLL_FAILURE, &wlvif->flags);
 
         if (conf->flags & IEEE80211_CONF_PS &&
-            !test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags)) {
-                set_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags);
+            !test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags)) {
+                set_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags);
 
                 /*
                  * We enter PSM only if we're already associated.
                  * If we're not, we'll enter it when joining an SSID,
                  * through the bss_info_changed() hook.
                  */
-                if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags)) {
+                if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) {
                         wl1271_debug(DEBUG_PSM, "psm enabled");
-                        ret = wl1271_ps_set_mode(wl, STATION_POWER_SAVE_MODE,
-                                                 wl->basic_rate, true);
+                        ret = wl1271_ps_set_mode(wl, wlvif,
+                                                 STATION_POWER_SAVE_MODE,
+                                                 wlvif->basic_rate, true);
                 }
         } else if (!(conf->flags & IEEE80211_CONF_PS) &&
-                   test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags)) {
+                   test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags)) {
                 wl1271_debug(DEBUG_PSM, "psm disabled");
 
-                clear_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags);
+                clear_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags);
 
-                if (test_bit(WL1271_FLAG_PSM, &wl->flags))
-                        ret = wl1271_ps_set_mode(wl, STATION_ACTIVE_MODE,
-                                                 wl->basic_rate, true);
+                if (test_bit(WLVIF_FLAG_PSM, &wlvif->flags))
+                        ret = wl1271_ps_set_mode(wl, wlvif,
+                                                 STATION_ACTIVE_MODE,
+                                                 wlvif->basic_rate, true);
         }
 
-        if (conf->power_level != wl->power_level) {
-                ret = wl1271_acx_tx_power(wl, conf->power_level);
+        if (conf->power_level != wlvif->power_level) {
+                ret = wl1271_acx_tx_power(wl, wlvif, conf->power_level);
                 if (ret < 0)
-                        goto out_sleep;
+                        return ret;
+
+                wlvif->power_level = conf->power_level;
+        }
+
+        return 0;
+}
+
+static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
+{
+        struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif;
+        struct ieee80211_conf *conf = &hw->conf;
+        int channel, ret = 0;
+
+        channel = ieee80211_frequency_to_channel(conf->channel->center_freq);
+
+        wl1271_debug(DEBUG_MAC80211, "mac80211 config ch %d psm %s power %d %s"
+                     " changed 0x%x",
+                     channel,
+                     conf->flags & IEEE80211_CONF_PS ? "on" : "off",
+                     conf->power_level,
+                     conf->flags & IEEE80211_CONF_IDLE ? "idle" : "in use",
+                         changed);
+
+        /*
+         * mac80211 will go to idle nearly immediately after transmitting some
+         * frames, such as the deauth. To make sure those frames reach the air,
+         * wait here until the TX queue is fully flushed.
+         */
+        if ((changed & IEEE80211_CONF_CHANGE_IDLE) &&
+            (conf->flags & IEEE80211_CONF_IDLE))
+                wl1271_tx_flush(wl);
+
+        mutex_lock(&wl->mutex);
+
+        /* we support configuring the channel and band even while off */
+        if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
+                wl->band = conf->channel->band;
+                wl->channel = channel;
+        }
 
+        if (changed & IEEE80211_CONF_CHANGE_POWER)
                 wl->power_level = conf->power_level;
+
+        if (unlikely(wl->state == WL1271_STATE_OFF))
+                goto out;
+
+        ret = wl1271_ps_elp_wakeup(wl);
+        if (ret < 0)
+                goto out;
+
+        /* configure each interface */
+        wl12xx_for_each_wlvif(wl, wlvif) {
+                ret = wl12xx_config_vif(wl, wlvif, conf, changed);
+                if (ret < 0)
+                        goto out_sleep;
         }
 
 out_sleep:
@@ -2509,6 +2633,8 @@ static void wl1271_op_configure_filter(struct ieee80211_hw *hw,
 {
         struct wl1271_filter_params *fp = (void *)(unsigned long)multicast;
         struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif;
+
         int ret;
 
         wl1271_debug(DEBUG_MAC80211, "mac80211 configure filter changed %x"
@@ -2526,15 +2652,20 @@ static void wl1271_op_configure_filter(struct ieee80211_hw *hw,
         if (ret < 0)
                 goto out;
 
-        if (wl->bss_type != BSS_TYPE_AP_BSS) {
-                if (*total & FIF_ALLMULTI)
-                        ret = wl1271_acx_group_address_tbl(wl, false, NULL, 0);
-                else if (fp)
-                        ret = wl1271_acx_group_address_tbl(wl, fp->enabled,
-                                                           fp->mc_list,
-                                                           fp->mc_list_length);
-                if (ret < 0)
-                        goto out_sleep;
+        wl12xx_for_each_wlvif(wl, wlvif) {
+                if (wlvif->bss_type != BSS_TYPE_AP_BSS) {
+                        if (*total & FIF_ALLMULTI)
+                                ret = wl1271_acx_group_address_tbl(wl, wlvif,
+                                                                   false,
+                                                                   NULL, 0);
+                        else if (fp)
+                                ret = wl1271_acx_group_address_tbl(wl, wlvif,
+                                                        fp->enabled,
+                                                        fp->mc_list,
+                                                        fp->mc_list_length);
+                        if (ret < 0)
+                                goto out_sleep;
+                }
         }
 
         /*
@@ -2551,9 +2682,10 @@ out:
         kfree(fp);
 }
 
-static int wl1271_record_ap_key(struct wl1271 *wl, u8 id, u8 key_type,
-                        u8 key_size, const u8 *key, u8 hlid, u32 tx_seq_32,
-                        u16 tx_seq_16)
+static int wl1271_record_ap_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                                u8 id, u8 key_type, u8 key_size,
+                                const u8 *key, u8 hlid, u32 tx_seq_32,
+                                u16 tx_seq_16)
 {
         struct wl1271_ap_key *ap_key;
         int i;
@@ -2568,10 +2700,10 @@ static int wl1271_record_ap_key(struct wl1271 *wl, u8 id, u8 key_type,
          * an existing key.
          */
         for (i = 0; i < MAX_NUM_KEYS; i++) {
-                if (wl->recorded_ap_keys[i] == NULL)
+                if (wlvif->ap.recorded_keys[i] == NULL)
                         break;
 
-                if (wl->recorded_ap_keys[i]->id == id) {
+                if (wlvif->ap.recorded_keys[i]->id == id) {
                         wl1271_warning("trying to record key replacement");
                         return -EINVAL;
                 }
@@ -2592,21 +2724,21 @@ static int wl1271_record_ap_key(struct wl1271 *wl, u8 id, u8 key_type,
         ap_key->tx_seq_32 = tx_seq_32;
         ap_key->tx_seq_16 = tx_seq_16;
 
-        wl->recorded_ap_keys[i] = ap_key;
+        wlvif->ap.recorded_keys[i] = ap_key;
         return 0;
 }
 
-static void wl1271_free_ap_keys(struct wl1271 *wl)
+static void wl1271_free_ap_keys(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         int i;
 
         for (i = 0; i < MAX_NUM_KEYS; i++) {
-                kfree(wl->recorded_ap_keys[i]);
-                wl->recorded_ap_keys[i] = NULL;
+                kfree(wlvif->ap.recorded_keys[i]);
+                wlvif->ap.recorded_keys[i] = NULL;
         }
 }
 
-static int wl1271_ap_init_hwenc(struct wl1271 *wl)
+static int wl1271_ap_init_hwenc(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         int i, ret = 0;
         struct wl1271_ap_key *key;
@@ -2614,15 +2746,15 @@ static int wl1271_ap_init_hwenc(struct wl1271 *wl)
 
         for (i = 0; i < MAX_NUM_KEYS; i++) {
                 u8 hlid;
-                if (wl->recorded_ap_keys[i] == NULL)
+                if (wlvif->ap.recorded_keys[i] == NULL)
                         break;
 
-                key = wl->recorded_ap_keys[i];
+                key = wlvif->ap.recorded_keys[i];
                 hlid = key->hlid;
                 if (hlid == WL12XX_INVALID_LINK_ID)
-                        hlid = wl->ap_bcast_hlid;
+                        hlid = wlvif->ap.bcast_hlid;
 
-                ret = wl1271_cmd_set_ap_key(wl, KEY_ADD_OR_REPLACE,
+                ret = wl1271_cmd_set_ap_key(wl, wlvif, KEY_ADD_OR_REPLACE,
                                             key->id, key->key_type,
                                             key->key_size, key->key,
                                             hlid, key->tx_seq_32,
@@ -2635,23 +2767,24 @@ static int wl1271_ap_init_hwenc(struct wl1271 *wl)
         }
 
         if (wep_key_added) {
-                ret = wl12xx_cmd_set_default_wep_key(wl, wl->default_key,
-                                                     wl->ap_bcast_hlid);
+                ret = wl12xx_cmd_set_default_wep_key(wl, wlvif->default_key,
+                                                     wlvif->ap.bcast_hlid);
                 if (ret < 0)
                         goto out;
         }
 
 out:
-        wl1271_free_ap_keys(wl);
+        wl1271_free_ap_keys(wl, wlvif);
         return ret;
 }
 
-static int wl1271_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
+static int wl1271_set_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                       u16 action, u8 id, u8 key_type,
                        u8 key_size, const u8 *key, u32 tx_seq_32,
                        u16 tx_seq_16, struct ieee80211_sta *sta)
 {
         int ret;
-        bool is_ap = (wl->bss_type == BSS_TYPE_AP_BSS);
+        bool is_ap = (wlvif->bss_type == BSS_TYPE_AP_BSS);
 
         if (is_ap) {
                 struct wl1271_station *wl_sta;
@@ -2661,10 +2794,10 @@ static int wl1271_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
                         wl_sta = (struct wl1271_station *)sta->drv_priv;
                         hlid = wl_sta->hlid;
                 } else {
-                        hlid = wl->ap_bcast_hlid;
+                        hlid = wlvif->ap.bcast_hlid;
                 }
 
-                if (!test_bit(WL1271_FLAG_AP_STARTED, &wl->flags)) {
+                if (!test_bit(WLVIF_FLAG_AP_STARTED, &wlvif->flags)) {
                         /*
                          * We do not support removing keys after AP shutdown.
                          * Pretend we do to make mac80211 happy.
@@ -2672,12 +2805,12 @@ static int wl1271_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
                         if (action != KEY_ADD_OR_REPLACE)
                                 return 0;
 
-                        ret = wl1271_record_ap_key(wl, id,
+                        ret = wl1271_record_ap_key(wl, wlvif, id,
                                              key_type, key_size,
                                              key, hlid, tx_seq_32,
                                              tx_seq_16);
                 } else {
-                        ret = wl1271_cmd_set_ap_key(wl, action,
+                        ret = wl1271_cmd_set_ap_key(wl, wlvif, action,
                                              id, key_type, key_size,
                                              key, hlid, tx_seq_32,
                                              tx_seq_16);
@@ -2718,10 +2851,10 @@ static int wl1271_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
 
                 /* don't remove key if hlid was already deleted */
                 if (action == KEY_REMOVE &&
-                    wl->sta_hlid == WL12XX_INVALID_LINK_ID)
+                    wlvif->sta.hlid == WL12XX_INVALID_LINK_ID)
                         return 0;
 
-                ret = wl1271_cmd_set_sta_key(wl, action,
+                ret = wl1271_cmd_set_sta_key(wl, wlvif, action,
                                              id, key_type, key_size,
                                              key, addr, tx_seq_32,
                                              tx_seq_16);
@@ -2731,8 +2864,8 @@ static int wl1271_set_key(struct wl1271 *wl, u16 action, u8 id, u8 key_type,
                 /* the default WEP key needs to be configured at least once */
                 if (key_type == KEY_WEP) {
                         ret = wl12xx_cmd_set_default_wep_key(wl,
-                                                             wl->default_key,
-                                                             wl->sta_hlid);
+                                                        wlvif->default_key,
+                                                        wlvif->sta.hlid);
                         if (ret < 0)
                                 return ret;
                 }
@@ -2747,6 +2880,7 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                              struct ieee80211_key_conf *key_conf)
 {
         struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         int ret;
         u32 tx_seq_32 = 0;
         u16 tx_seq_16 = 0;
@@ -2782,20 +2916,20 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 key_type = KEY_TKIP;
 
                 key_conf->hw_key_idx = key_conf->keyidx;
-                tx_seq_32 = WL1271_TX_SECURITY_HI32(wl->tx_security_seq);
-                tx_seq_16 = WL1271_TX_SECURITY_LO16(wl->tx_security_seq);
+                tx_seq_32 = WL1271_TX_SECURITY_HI32(wlvif->tx_security_seq);
+                tx_seq_16 = WL1271_TX_SECURITY_LO16(wlvif->tx_security_seq);
                 break;
         case WLAN_CIPHER_SUITE_CCMP:
                 key_type = KEY_AES;
 
-                key_conf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
-                tx_seq_32 = WL1271_TX_SECURITY_HI32(wl->tx_security_seq);
-                tx_seq_16 = WL1271_TX_SECURITY_LO16(wl->tx_security_seq);
+                key_conf->flags |= IEEE80211_KEY_FLAG_PUT_IV_SPACE;
+                tx_seq_32 = WL1271_TX_SECURITY_HI32(wlvif->tx_security_seq);
+                tx_seq_16 = WL1271_TX_SECURITY_LO16(wlvif->tx_security_seq);
                 break;
         case WL1271_CIPHER_SUITE_GEM:
                 key_type = KEY_GEM;
-                tx_seq_32 = WL1271_TX_SECURITY_HI32(wl->tx_security_seq);
-                tx_seq_16 = WL1271_TX_SECURITY_LO16(wl->tx_security_seq);
+                tx_seq_32 = WL1271_TX_SECURITY_HI32(wlvif->tx_security_seq);
+                tx_seq_16 = WL1271_TX_SECURITY_LO16(wlvif->tx_security_seq);
                 break;
         default:
                 wl1271_error("Unknown key algo 0x%x", key_conf->cipher);
@@ -2806,7 +2940,7 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
         switch (cmd) {
         case SET_KEY:
-                ret = wl1271_set_key(wl, KEY_ADD_OR_REPLACE,
+                ret = wl1271_set_key(wl, wlvif, KEY_ADD_OR_REPLACE,
                                  key_conf->keyidx, key_type,
                                  key_conf->keylen, key_conf->key,
                                  tx_seq_32, tx_seq_16, sta);
@@ -2817,7 +2951,7 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 break;
 
         case DISABLE_KEY:
-                ret = wl1271_set_key(wl, KEY_REMOVE,
+                ret = wl1271_set_key(wl, wlvif, KEY_REMOVE,
                                      key_conf->keyidx, key_type,
                                      key_conf->keylen, key_conf->key,
                                      0, 0, sta);
@@ -2847,6 +2981,8 @@ static int wl1271_op_hw_scan(struct ieee80211_hw *hw,
                              struct cfg80211_scan_request *req)
 {
         struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
+
         int ret;
         u8 *ssid = NULL;
         size_t len = 0;
@@ -2876,16 +3012,15 @@ static int wl1271_op_hw_scan(struct ieee80211_hw *hw,
 
         /* cancel ROC before scanning */
         if (wl12xx_is_roc(wl)) {
-                if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags)) {
+                if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) {
                         /* don't allow scanning right now */
                         ret = -EBUSY;
                         goto out_sleep;
                 }
-                wl12xx_croc(wl, wl->dev_role_id);
-                wl12xx_cmd_role_stop_dev(wl);
+                wl12xx_stop_dev(wl, wlvif);
         }
 
-        ret = wl1271_scan(hw->priv, ssid, len, req);
+        ret = wl1271_scan(hw->priv, vif, ssid, len, req);
 out_sleep:
         wl1271_ps_elp_sleep(wl);
 out:
@@ -2921,6 +3056,7 @@ static void wl1271_op_cancel_hw_scan(struct ieee80211_hw *hw,
         }
         wl->scan.state = WL1271_SCAN_STATE_IDLE;
         memset(wl->scan.scanned_ch, 0, sizeof(wl->scan.scanned_ch));
+        wl->scan_vif = NULL;
         wl->scan.req = NULL;
         ieee80211_scan_completed(wl->hw, true);
 
@@ -2938,6 +3074,7 @@ static int wl1271_op_sched_scan_start(struct ieee80211_hw *hw,
                                       struct ieee80211_sched_scan_ies *ies)
 {
         struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         int ret;
 
         wl1271_debug(DEBUG_MAC80211, "wl1271_op_sched_scan_start");
@@ -2948,11 +3085,11 @@ static int wl1271_op_sched_scan_start(struct ieee80211_hw *hw,
         if (ret < 0)
                 goto out;
 
-        ret = wl1271_scan_sched_scan_config(wl, req, ies);
+        ret = wl1271_scan_sched_scan_config(wl, wlvif, req, ies);
         if (ret < 0)
                 goto out_sleep;
 
-        ret = wl1271_scan_sched_scan_start(wl);
+        ret = wl1271_scan_sched_scan_start(wl, wlvif);
         if (ret < 0)
                 goto out_sleep;
 
@@ -3017,6 +3154,7 @@ out:
 static int wl1271_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
 {
         struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif;
         int ret = 0;
 
         mutex_lock(&wl->mutex);
@@ -3030,10 +3168,11 @@ static int wl1271_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
         if (ret < 0)
                 goto out;
 
-        ret = wl1271_acx_rts_threshold(wl, value);
-        if (ret < 0)
-                wl1271_warning("wl1271_op_set_rts_threshold failed: %d", ret);
-
+        wl12xx_for_each_wlvif(wl, wlvif) {
+                ret = wl1271_acx_rts_threshold(wl, wlvif, value);
+                if (ret < 0)
+                        wl1271_warning("set rts threshold failed: %d", ret);
+        }
         wl1271_ps_elp_sleep(wl);
 
 out:
@@ -3042,9 +3181,10 @@ out:
         return ret;
 }
 
-static int wl1271_ssid_set(struct wl1271 *wl, struct sk_buff *skb,
+static int wl1271_ssid_set(struct ieee80211_vif *vif, struct sk_buff *skb,
                             int offset)
 {
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         u8 ssid_len;
         const u8 *ptr = cfg80211_find_ie(WLAN_EID_SSID, skb->data + offset,
                                          skb->len - offset);
@@ -3060,8 +3200,8 @@ static int wl1271_ssid_set(struct wl1271 *wl, struct sk_buff *skb,
                 return -EINVAL;
         }
 
-        wl->ssid_len = ssid_len;
-        memcpy(wl->ssid, ptr+2, ssid_len);
+        wlvif->ssid_len = ssid_len;
+        memcpy(wlvif->ssid, ptr+2, ssid_len);
         return 0;
 }
 
@@ -3096,18 +3236,40 @@ static void wl12xx_remove_vendor_ie(struct sk_buff *skb,
         skb_trim(skb, skb->len - len);
 }
 
-static int wl1271_ap_set_probe_resp_tmpl(struct wl1271 *wl,
-                                         u8 *probe_rsp_data,
-                                         size_t probe_rsp_len,
-                                         u32 rates)
+static int wl1271_ap_set_probe_resp_tmpl(struct wl1271 *wl, u32 rates,
+                                         struct ieee80211_vif *vif)
 {
-        struct ieee80211_bss_conf *bss_conf = &wl->vif->bss_conf;
+        struct sk_buff *skb;
+        int ret;
+
+        skb = ieee80211_proberesp_get(wl->hw, vif);
+        if (!skb)
+                return -EOPNOTSUPP;
+
+        ret = wl1271_cmd_template_set(wl,
+                                      CMD_TEMPL_AP_PROBE_RESPONSE,
+                                      skb->data,
+                                      skb->len, 0,
+                                      rates);
+
+        dev_kfree_skb(skb);
+        return ret;
+}
+
+static int wl1271_ap_set_probe_resp_tmpl_legacy(struct wl1271 *wl,
+                                             struct ieee80211_vif *vif,
+                                             u8 *probe_rsp_data,
+                                             size_t probe_rsp_len,
+                                             u32 rates)
+{
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
+        struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
         u8 probe_rsp_templ[WL1271_CMD_TEMPL_MAX_SIZE];
         int ssid_ie_offset, ie_offset, templ_len;
         const u8 *ptr;
 
         /* no need to change probe response if the SSID is set correctly */
-        if (wl->ssid_len > 0)
+        if (wlvif->ssid_len > 0)
                 return wl1271_cmd_template_set(wl,
                                                CMD_TEMPL_AP_PROBE_RESPONSE,
                                                probe_rsp_data,
@@ -3153,16 +3315,18 @@ static int wl1271_ap_set_probe_resp_tmpl(struct wl1271 *wl,
 }
 
 static int wl1271_bss_erp_info_changed(struct wl1271 *wl,
+                                       struct ieee80211_vif *vif,
                                        struct ieee80211_bss_conf *bss_conf,
                                        u32 changed)
 {
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         int ret = 0;
 
         if (changed & BSS_CHANGED_ERP_SLOT) {
                 if (bss_conf->use_short_slot)
-                        ret = wl1271_acx_slot(wl, SLOT_TIME_SHORT);
+                        ret = wl1271_acx_slot(wl, wlvif, SLOT_TIME_SHORT);
                 else
-                        ret = wl1271_acx_slot(wl, SLOT_TIME_LONG);
+                        ret = wl1271_acx_slot(wl, wlvif, SLOT_TIME_LONG);
                 if (ret < 0) {
                         wl1271_warning("Set slot time failed %d", ret);
                         goto out;
@@ -3171,16 +3335,18 @@ static int wl1271_bss_erp_info_changed(struct wl1271 *wl,
 
         if (changed & BSS_CHANGED_ERP_PREAMBLE) {
                 if (bss_conf->use_short_preamble)
-                        wl1271_acx_set_preamble(wl, ACX_PREAMBLE_SHORT);
+                        wl1271_acx_set_preamble(wl, wlvif, ACX_PREAMBLE_SHORT);
                 else
-                        wl1271_acx_set_preamble(wl, ACX_PREAMBLE_LONG);
+                        wl1271_acx_set_preamble(wl, wlvif, ACX_PREAMBLE_LONG);
         }
 
         if (changed & BSS_CHANGED_ERP_CTS_PROT) {
                 if (bss_conf->use_cts_prot)
-                        ret = wl1271_acx_cts_protect(wl, CTSPROTECT_ENABLE);
+                        ret = wl1271_acx_cts_protect(wl, wlvif,
+                                                     CTSPROTECT_ENABLE);
                 else
-                        ret = wl1271_acx_cts_protect(wl, CTSPROTECT_DISABLE);
+                        ret = wl1271_acx_cts_protect(wl, wlvif,
+                                                     CTSPROTECT_DISABLE);
                 if (ret < 0) {
                         wl1271_warning("Set ctsprotect failed %d", ret);
                         goto out;
@@ -3196,14 +3362,23 @@ static int wl1271_bss_beacon_info_changed(struct wl1271 *wl,
                                           struct ieee80211_bss_conf *bss_conf,
                                           u32 changed)
 {
-        bool is_ap = (wl->bss_type == BSS_TYPE_AP_BSS);
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
+        bool is_ap = (wlvif->bss_type == BSS_TYPE_AP_BSS);
         int ret = 0;
 
         if ((changed & BSS_CHANGED_BEACON_INT)) {
                 wl1271_debug(DEBUG_MASTER, "beacon interval updated: %d",
                         bss_conf->beacon_int);
 
-                wl->beacon_int = bss_conf->beacon_int;
+                wlvif->beacon_int = bss_conf->beacon_int;
+        }
+
+        if ((changed & BSS_CHANGED_AP_PROBE_RESP) && is_ap) {
+                u32 rate = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
+                if (!wl1271_ap_set_probe_resp_tmpl(wl, rate, vif)) {
+                        wl1271_debug(DEBUG_AP, "probe response updated");
+                        set_bit(WLVIF_FLAG_AP_PROBE_RESP_SET, &wlvif->flags);
+                }
         }
 
         if ((changed & BSS_CHANGED_BEACON)) {
@@ -3214,17 +3389,19 @@ static int wl1271_bss_beacon_info_changed(struct wl1271 *wl,
                 struct sk_buff *beacon = ieee80211_beacon_get(wl->hw, vif);
                 u16 tmpl_id;
 
-                if (!beacon)
+                if (!beacon) {
+                        ret = -EINVAL;
                         goto out;
+                }
 
                 wl1271_debug(DEBUG_MASTER, "beacon updated");
 
-                ret = wl1271_ssid_set(wl, beacon, ieoffset);
+                ret = wl1271_ssid_set(vif, beacon, ieoffset);
                 if (ret < 0) {
                         dev_kfree_skb(beacon);
                         goto out;
                 }
-                min_rate = wl1271_tx_min_rate_get(wl, wl->basic_rate_set);
+                min_rate = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
                 tmpl_id = is_ap ? CMD_TEMPL_AP_BEACON :
                                   CMD_TEMPL_BEACON;
                 ret = wl1271_cmd_template_set(wl, tmpl_id,
@@ -3236,6 +3413,13 @@ static int wl1271_bss_beacon_info_changed(struct wl1271 *wl,
                         goto out;
                 }
 
+                /*
+                 * In case we already have a probe-resp beacon set explicitly
+                 * by usermode, don't use the beacon data.
+                 */
+                if (test_bit(WLVIF_FLAG_AP_PROBE_RESP_SET, &wlvif->flags))
+                        goto end_bcn;
+
                 /* remove TIM ie from probe response */
                 wl12xx_remove_ie(beacon, WLAN_EID_TIM, ieoffset);
 
@@ -3254,7 +3438,7 @@ static int wl1271_bss_beacon_info_changed(struct wl1271 *wl,
                 hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
                                                  IEEE80211_STYPE_PROBE_RESP);
                 if (is_ap)
-                        ret = wl1271_ap_set_probe_resp_tmpl(wl,
+                        ret = wl1271_ap_set_probe_resp_tmpl_legacy(wl, vif,
                                                 beacon->data,
                                                 beacon->len,
                                                 min_rate);
@@ -3264,12 +3448,15 @@ static int wl1271_bss_beacon_info_changed(struct wl1271 *wl,
                                                 beacon->data,
                                                 beacon->len, 0,
                                                 min_rate);
+end_bcn:
                 dev_kfree_skb(beacon);
                 if (ret < 0)
                         goto out;
         }
 
 out:
+        if (ret != 0)
+                wl1271_error("beacon info change failed: %d", ret);
         return ret;
 }
 
@@ -3279,23 +3466,24 @@ static void wl1271_bss_info_changed_ap(struct wl1271 *wl,
                                        struct ieee80211_bss_conf *bss_conf,
                                        u32 changed)
 {
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         int ret = 0;
 
         if ((changed & BSS_CHANGED_BASIC_RATES)) {
                 u32 rates = bss_conf->basic_rates;
 
-                wl->basic_rate_set = wl1271_tx_enabled_rates_get(wl, rates,
-                                                                 wl->band);
-                wl->basic_rate = wl1271_tx_min_rate_get(wl,
-                                                        wl->basic_rate_set);
+                wlvif->basic_rate_set = wl1271_tx_enabled_rates_get(wl, rates,
+                                                                 wlvif->band);
+                wlvif->basic_rate = wl1271_tx_min_rate_get(wl,
+                                                        wlvif->basic_rate_set);
 
-                ret = wl1271_init_ap_rates(wl);
+                ret = wl1271_init_ap_rates(wl, wlvif);
                 if (ret < 0) {
                         wl1271_error("AP rate policy change failed %d", ret);
                         goto out;
                 }
 
-                ret = wl1271_ap_init_templates(wl);
+                ret = wl1271_ap_init_templates(wl, vif);
                 if (ret < 0)
                         goto out;
         }
@@ -3306,38 +3494,40 @@ static void wl1271_bss_info_changed_ap(struct wl1271 *wl,
 
         if ((changed & BSS_CHANGED_BEACON_ENABLED)) {
                 if (bss_conf->enable_beacon) {
-                        if (!test_bit(WL1271_FLAG_AP_STARTED, &wl->flags)) {
-                                ret = wl12xx_cmd_role_start_ap(wl);
+                        if (!test_bit(WLVIF_FLAG_AP_STARTED, &wlvif->flags)) {
+                                ret = wl12xx_cmd_role_start_ap(wl, wlvif);
                                 if (ret < 0)
                                         goto out;
 
-                                ret = wl1271_ap_init_hwenc(wl);
+                                ret = wl1271_ap_init_hwenc(wl, wlvif);
                                 if (ret < 0)
                                         goto out;
 
-                                set_bit(WL1271_FLAG_AP_STARTED, &wl->flags);
+                                set_bit(WLVIF_FLAG_AP_STARTED, &wlvif->flags);
                                 wl1271_debug(DEBUG_AP, "started AP");
                         }
                 } else {
-                        if (test_bit(WL1271_FLAG_AP_STARTED, &wl->flags)) {
-                                ret = wl12xx_cmd_role_stop_ap(wl);
+                        if (test_bit(WLVIF_FLAG_AP_STARTED, &wlvif->flags)) {
+                                ret = wl12xx_cmd_role_stop_ap(wl, wlvif);
                                 if (ret < 0)
                                         goto out;
 
-                                clear_bit(WL1271_FLAG_AP_STARTED, &wl->flags);
+                                clear_bit(WLVIF_FLAG_AP_STARTED, &wlvif->flags);
+                                clear_bit(WLVIF_FLAG_AP_PROBE_RESP_SET,
+                                          &wlvif->flags);
                                 wl1271_debug(DEBUG_AP, "stopped AP");
                         }
                 }
         }
 
-        ret = wl1271_bss_erp_info_changed(wl, bss_conf, changed);
+        ret = wl1271_bss_erp_info_changed(wl, vif, bss_conf, changed);
         if (ret < 0)
                 goto out;
 
         /* Handle HT information change */
         if ((changed & BSS_CHANGED_HT) &&
             (bss_conf->channel_type != NL80211_CHAN_NO_HT)) {
-                ret = wl1271_acx_set_ht_information(wl,
+                ret = wl1271_acx_set_ht_information(wl, wlvif,
                                         bss_conf->ht_operation_mode);
                 if (ret < 0) {
                         wl1271_warning("Set ht information failed %d", ret);
@@ -3355,8 +3545,9 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
                                         struct ieee80211_bss_conf *bss_conf,
                                         u32 changed)
 {
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         bool do_join = false, set_assoc = false;
-        bool is_ibss = (wl->bss_type == BSS_TYPE_IBSS);
+        bool is_ibss = (wlvif->bss_type == BSS_TYPE_IBSS);
         bool ibss_joined = false;
         u32 sta_rate_set = 0;
         int ret;
@@ -3373,14 +3564,13 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
 
         if (changed & BSS_CHANGED_IBSS) {
                 if (bss_conf->ibss_joined) {
-                        set_bit(WL1271_FLAG_IBSS_JOINED, &wl->flags);
+                        set_bit(WLVIF_FLAG_IBSS_JOINED, &wlvif->flags);
                         ibss_joined = true;
                 } else {
-                        if (test_and_clear_bit(WL1271_FLAG_IBSS_JOINED,
-                                               &wl->flags)) {
-                                wl1271_unjoin(wl);
-                                wl12xx_cmd_role_start_dev(wl);
-                                wl12xx_roc(wl, wl->dev_role_id);
+                        if (test_and_clear_bit(WLVIF_FLAG_IBSS_JOINED,
+                                               &wlvif->flags)) {
+                                wl1271_unjoin(wl, wlvif);
+                                wl12xx_start_dev(wl, wlvif);
                         }
                 }
         }
@@ -3396,46 +3586,40 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
                 wl1271_debug(DEBUG_ADHOC, "ad-hoc beaconing: %s",
                              bss_conf->enable_beacon ? "enabled" : "disabled");
 
-                if (bss_conf->enable_beacon)
-                        wl->set_bss_type = BSS_TYPE_IBSS;
-                else
-                        wl->set_bss_type = BSS_TYPE_STA_BSS;
                 do_join = true;
         }
 
+        if (changed & BSS_CHANGED_IDLE) {
+                ret = wl1271_sta_handle_idle(wl, wlvif, bss_conf->idle);
+                if (ret < 0)
+                        wl1271_warning("idle mode change failed %d", ret);
+        }
+
         if ((changed & BSS_CHANGED_CQM)) {
                 bool enable = false;
                 if (bss_conf->cqm_rssi_thold)
                         enable = true;
-                ret = wl1271_acx_rssi_snr_trigger(wl, enable,
+                ret = wl1271_acx_rssi_snr_trigger(wl, wlvif, enable,
                                                   bss_conf->cqm_rssi_thold,
                                                   bss_conf->cqm_rssi_hyst);
                 if (ret < 0)
                         goto out;
-                wl->rssi_thold = bss_conf->cqm_rssi_thold;
+                wlvif->rssi_thold = bss_conf->cqm_rssi_thold;
         }
 
-        if ((changed & BSS_CHANGED_BSSID) &&
-            /*
-             * Now we know the correct bssid, so we send a new join command
-             * and enable the BSSID filter
-             */
-            memcmp(wl->bssid, bss_conf->bssid, ETH_ALEN)) {
-                memcpy(wl->bssid, bss_conf->bssid, ETH_ALEN);
-
-                if (!is_zero_ether_addr(wl->bssid)) {
-                        ret = wl1271_cmd_build_null_data(wl);
+        if (changed & BSS_CHANGED_BSSID)
+                if (!is_zero_ether_addr(bss_conf->bssid)) {
+                        ret = wl12xx_cmd_build_null_data(wl, wlvif);
                         if (ret < 0)
                                 goto out;
 
-                        ret = wl1271_build_qos_null_data(wl);
+                        ret = wl1271_build_qos_null_data(wl, vif);
                         if (ret < 0)
                                 goto out;
 
                         /* Need to update the BSSID (for filtering etc) */
                         do_join = true;
                 }
-        }
 
         if (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_HT)) {
                 rcu_read_lock();
@@ -3459,26 +3643,28 @@ sta_not_found:
                 if (bss_conf->assoc) {
                         u32 rates;
                         int ieoffset;
-                        wl->aid = bss_conf->aid;
+                        wlvif->aid = bss_conf->aid;
                         set_assoc = true;
 
-                        wl->ps_poll_failures = 0;
+                        wlvif->ps_poll_failures = 0;
 
                         /*
                          * use basic rates from AP, and determine lowest rate
                          * to use with control frames.
                          */
                         rates = bss_conf->basic_rates;
-                        wl->basic_rate_set =
+                        wlvif->basic_rate_set =
                                 wl1271_tx_enabled_rates_get(wl, rates,
-                                                            wl->band);
-                        wl->basic_rate =
-                                wl1271_tx_min_rate_get(wl, wl->basic_rate_set);
+                                                            wlvif->band);
+                        wlvif->basic_rate =
+                                wl1271_tx_min_rate_get(wl,
+                                                       wlvif->basic_rate_set);
                         if (sta_rate_set)
-                                wl->rate_set = wl1271_tx_enabled_rates_get(wl,
+                                wlvif->rate_set =
+                                        wl1271_tx_enabled_rates_get(wl,
                                                                 sta_rate_set,
-                                                                wl->band);
-                        ret = wl1271_acx_sta_rate_policies(wl);
+                                                                wlvif->band);
+                        ret = wl1271_acx_sta_rate_policies(wl, wlvif);
                         if (ret < 0)
                                 goto out;
 
@@ -3488,53 +3674,56 @@ sta_not_found:
                          * updates it by itself when the first beacon is
                          * received after a join.
                          */
-                        ret = wl1271_cmd_build_ps_poll(wl, wl->aid);
+                        ret = wl1271_cmd_build_ps_poll(wl, wlvif, wlvif->aid);
                         if (ret < 0)
                                 goto out;
 
                         /*
                          * Get a template for hardware connection maintenance
                          */
-                        dev_kfree_skb(wl->probereq);
-                        wl->probereq = wl1271_cmd_build_ap_probe_req(wl, NULL);
+                        dev_kfree_skb(wlvif->probereq);
+                        wlvif->probereq = wl1271_cmd_build_ap_probe_req(wl,
+                                                                        wlvif,
+                                                                        NULL);
                         ieoffset = offsetof(struct ieee80211_mgmt,
                                             u.probe_req.variable);
-                        wl1271_ssid_set(wl, wl->probereq, ieoffset);
+                        wl1271_ssid_set(vif, wlvif->probereq, ieoffset);
 
                         /* enable the connection monitoring feature */
-                        ret = wl1271_acx_conn_monit_params(wl, true);
+                        ret = wl1271_acx_conn_monit_params(wl, wlvif, true);
                         if (ret < 0)
                                 goto out;
                 } else {
                         /* use defaults when not associated */
                         bool was_assoc =
-                            !!test_and_clear_bit(WL1271_FLAG_STA_ASSOCIATED,
-                                                 &wl->flags);
+                            !!test_and_clear_bit(WLVIF_FLAG_STA_ASSOCIATED,
+                                                 &wlvif->flags);
                         bool was_ifup =
-                            !!test_and_clear_bit(WL1271_FLAG_STA_STATE_SENT,
-                                                 &wl->flags);
-                        wl->aid = 0;
+                            !!test_and_clear_bit(WLVIF_FLAG_STA_STATE_SENT,
+                                                 &wlvif->flags);
+                        wlvif->aid = 0;
 
                         /* free probe-request template */
-                        dev_kfree_skb(wl->probereq);
-                        wl->probereq = NULL;
+                        dev_kfree_skb(wlvif->probereq);
+                        wlvif->probereq = NULL;
 
                         /* re-enable dynamic ps - just in case */
-                        ieee80211_enable_dyn_ps(wl->vif);
+                        ieee80211_enable_dyn_ps(vif);
 
                         /* revert back to minimum rates for the current band */
-                        wl1271_set_band_rate(wl);
-                        wl->basic_rate =
-                                wl1271_tx_min_rate_get(wl, wl->basic_rate_set);
-                        ret = wl1271_acx_sta_rate_policies(wl);
+                        wl1271_set_band_rate(wl, wlvif);
+                        wlvif->basic_rate =
+                                wl1271_tx_min_rate_get(wl,
+                                                       wlvif->basic_rate_set);
+                        ret = wl1271_acx_sta_rate_policies(wl, wlvif);
                         if (ret < 0)
                                 goto out;
 
                         /* disable connection monitor features */
-                        ret = wl1271_acx_conn_monit_params(wl, false);
+                        ret = wl1271_acx_conn_monit_params(wl, wlvif, false);
 
                         /* Disable the keep-alive feature */
-                        ret = wl1271_acx_keep_alive_mode(wl, false);
+                        ret = wl1271_acx_keep_alive_mode(wl, wlvif, false);
                         if (ret < 0)
                                 goto out;
 
@@ -3546,7 +3735,7 @@ sta_not_found:
                                  * no IF_OPER_UP notification.
                                  */
                                 if (!was_ifup) {
-                                        ret = wl12xx_croc(wl, wl->role_id);
+                                        ret = wl12xx_croc(wl, wlvif->role_id);
                                         if (ret < 0)
                                                 goto out;
                                 }
@@ -3555,17 +3744,16 @@ sta_not_found:
                                  * roaming on the same channel. until we will
                                  * have a better flow...)
                                  */
-                                if (test_bit(wl->dev_role_id, wl->roc_map)) {
-                                        ret = wl12xx_croc(wl, wl->dev_role_id);
+                                if (test_bit(wlvif->dev_role_id, wl->roc_map)) {
+                                        ret = wl12xx_croc(wl,
+                                                          wlvif->dev_role_id);
                                         if (ret < 0)
                                                 goto out;
                                 }
 
-                                wl1271_unjoin(wl);
-                                if (!(conf_flags & IEEE80211_CONF_IDLE)) {
-                                        wl12xx_cmd_role_start_dev(wl);
-                                        wl12xx_roc(wl, wl->dev_role_id);
-                                }
+                                wl1271_unjoin(wl, wlvif);
+                                if (!(conf_flags & IEEE80211_CONF_IDLE))
+                                        wl12xx_start_dev(wl, wlvif);
                         }
                 }
         }
@@ -3576,27 +3764,28 @@ sta_not_found:
 
                 if (bss_conf->ibss_joined) {
                         u32 rates = bss_conf->basic_rates;
-                        wl->basic_rate_set =
+                        wlvif->basic_rate_set =
                                 wl1271_tx_enabled_rates_get(wl, rates,
-                                                            wl->band);
-                        wl->basic_rate =
-                                wl1271_tx_min_rate_get(wl, wl->basic_rate_set);
+                                                            wlvif->band);
+                        wlvif->basic_rate =
+                                wl1271_tx_min_rate_get(wl,
+                                                       wlvif->basic_rate_set);
 
                         /* by default, use 11b + OFDM rates */
-                        wl->rate_set = CONF_TX_IBSS_DEFAULT_RATES;
-                        ret = wl1271_acx_sta_rate_policies(wl);
+                        wlvif->rate_set = CONF_TX_IBSS_DEFAULT_RATES;
+                        ret = wl1271_acx_sta_rate_policies(wl, wlvif);
                         if (ret < 0)
                                 goto out;
                 }
         }
 
-        ret = wl1271_bss_erp_info_changed(wl, bss_conf, changed);
+        ret = wl1271_bss_erp_info_changed(wl, vif, bss_conf, changed);
         if (ret < 0)
                 goto out;
 
         if (changed & BSS_CHANGED_ARP_FILTER) {
                 __be32 addr = bss_conf->arp_addr_list[0];
-                WARN_ON(wl->bss_type != BSS_TYPE_STA_BSS);
+                WARN_ON(wlvif->bss_type != BSS_TYPE_STA_BSS);
 
                 if (bss_conf->arp_addr_cnt == 1 &&
                     bss_conf->arp_filter_enabled) {
@@ -3606,24 +3795,24 @@ sta_not_found:
                          * isn't being set (when sending), so we have to
                          * reconfigure the template upon every ip change.
                          */
-                        ret = wl1271_cmd_build_arp_rsp(wl, addr);
+                        ret = wl1271_cmd_build_arp_rsp(wl, wlvif, addr);
                         if (ret < 0) {
                                 wl1271_warning("build arp rsp failed: %d", ret);
                                 goto out;
                         }
 
-                        ret = wl1271_acx_arp_ip_filter(wl,
+                        ret = wl1271_acx_arp_ip_filter(wl, wlvif,
                                 ACX_ARP_FILTER_ARP_FILTERING,
                                 addr);
                 } else
-                        ret = wl1271_acx_arp_ip_filter(wl, 0, addr);
+                        ret = wl1271_acx_arp_ip_filter(wl, wlvif, 0, addr);
 
                 if (ret < 0)
                         goto out;
         }
 
         if (do_join) {
-                ret = wl1271_join(wl, set_assoc);
+                ret = wl1271_join(wl, wlvif, set_assoc);
                 if (ret < 0) {
                         wl1271_warning("cmd join failed %d", ret);
                         goto out;
@@ -3631,35 +3820,31 @@ sta_not_found:
 
                 /* ROC until connected (after EAPOL exchange) */
                 if (!is_ibss) {
-                        ret = wl12xx_roc(wl, wl->role_id);
+                        ret = wl12xx_roc(wl, wlvif, wlvif->role_id);
                         if (ret < 0)
                                 goto out;
 
-                        wl1271_check_operstate(wl,
+                        wl1271_check_operstate(wl, wlvif,
                                                ieee80211_get_operstate(vif));
                 }
                 /*
                  * stop device role if started (we might already be in
                  * STA role). TODO: make it better.
                  */
-                if (wl->dev_role_id != WL12XX_INVALID_ROLE_ID) {
-                        ret = wl12xx_croc(wl, wl->dev_role_id);
-                        if (ret < 0)
-                                goto out;
-
-                        ret = wl12xx_cmd_role_stop_dev(wl);
+                if (wlvif->dev_role_id != WL12XX_INVALID_ROLE_ID) {
+                        ret = wl12xx_stop_dev(wl, wlvif);
                         if (ret < 0)
                                 goto out;
                 }
 
                 /* If we want to go in PSM but we're not there yet */
-                if (test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags) &&
-                    !test_bit(WL1271_FLAG_PSM, &wl->flags)) {
+                if (test_bit(WLVIF_FLAG_PSM_REQUESTED, &wlvif->flags) &&
+                    !test_bit(WLVIF_FLAG_PSM, &wlvif->flags)) {
                         enum wl1271_cmd_ps_mode mode;
 
                         mode = STATION_POWER_SAVE_MODE;
-                        ret = wl1271_ps_set_mode(wl, mode,
-                                                 wl->basic_rate,
+                        ret = wl1271_ps_set_mode(wl, wlvif, mode,
+                                                 wlvif->basic_rate,
                                                  true);
                         if (ret < 0)
                                 goto out;
@@ -3673,7 +3858,7 @@ sta_not_found:
                         ret = wl1271_acx_set_ht_capabilities(wl,
                                                              &sta_ht_cap,
                                                              true,
-                                                             wl->sta_hlid);
+                                                             wlvif->sta.hlid);
                         if (ret < 0) {
                                 wl1271_warning("Set ht cap true failed %d",
                                                ret);
@@ -3685,7 +3870,7 @@ sta_not_found:
                         ret = wl1271_acx_set_ht_capabilities(wl,
                                                              &sta_ht_cap,
                                                              false,
-                                                             wl->sta_hlid);
+                                                             wlvif->sta.hlid);
                         if (ret < 0) {
                                 wl1271_warning("Set ht cap false failed %d",
                                                ret);
@@ -3697,7 +3882,7 @@ sta_not_found:
         /* Handle HT information change. Done after join. */
         if ((changed & BSS_CHANGED_HT) &&
             (bss_conf->channel_type != NL80211_CHAN_NO_HT)) {
-                ret = wl1271_acx_set_ht_information(wl,
+                ret = wl1271_acx_set_ht_information(wl, wlvif,
                                         bss_conf->ht_operation_mode);
                 if (ret < 0) {
                         wl1271_warning("Set ht information failed %d", ret);
@@ -3715,7 +3900,8 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
                                        u32 changed)
 {
         struct wl1271 *wl = hw->priv;
-        bool is_ap = (wl->bss_type == BSS_TYPE_AP_BSS);
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
+        bool is_ap = (wlvif->bss_type == BSS_TYPE_AP_BSS);
         int ret;
 
         wl1271_debug(DEBUG_MAC80211, "mac80211 bss info changed 0x%x",
@@ -3726,6 +3912,9 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
         if (unlikely(wl->state == WL1271_STATE_OFF))
                 goto out;
 
+        if (unlikely(!test_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags)))
+                goto out;
+
         ret = wl1271_ps_elp_wakeup(wl);
         if (ret < 0)
                 goto out;
@@ -3746,6 +3935,7 @@ static int wl1271_op_conf_tx(struct ieee80211_hw *hw,
                              const struct ieee80211_tx_queue_params *params)
 {
         struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         u8 ps_scheme;
         int ret = 0;
 
@@ -3792,13 +3982,13 @@ static int wl1271_op_conf_tx(struct ieee80211_hw *hw,
          * the txop is confed in units of 32us by the mac80211,
          * we need us
          */
-        ret = wl1271_acx_ac_cfg(wl, wl1271_tx_get_queue(queue),
+        ret = wl1271_acx_ac_cfg(wl, wlvif, wl1271_tx_get_queue(queue),
                                 params->cw_min, params->cw_max,
                                 params->aifs, params->txop << 5);
         if (ret < 0)
                 goto out_sleep;
 
-        ret = wl1271_acx_tid_cfg(wl, wl1271_tx_get_queue(queue),
+        ret = wl1271_acx_tid_cfg(wl, wlvif, wl1271_tx_get_queue(queue),
                                  CONF_CHANNEL_TYPE_EDCF,
                                  wl1271_tx_get_queue(queue),
                                  ps_scheme, CONF_ACK_POLICY_LEGACY,
@@ -3861,43 +4051,43 @@ static int wl1271_op_get_survey(struct ieee80211_hw *hw, int idx,
 }
 
 static int wl1271_allocate_sta(struct wl1271 *wl,
-                             struct ieee80211_sta *sta,
-                             u8 *hlid)
+                             struct wl12xx_vif *wlvif,
+                             struct ieee80211_sta *sta)
 {
         struct wl1271_station *wl_sta;
-        int id;
+        int ret;
+
 
-        id = find_first_zero_bit(wl->ap_hlid_map, AP_MAX_STATIONS);
-        if (id >= AP_MAX_STATIONS) {
+        if (wl->active_sta_count >= AP_MAX_STATIONS) {
                 wl1271_warning("could not allocate HLID - too much stations");
                 return -EBUSY;
         }
 
         wl_sta = (struct wl1271_station *)sta->drv_priv;
-        set_bit(id, wl->ap_hlid_map);
-        wl_sta->hlid = WL1271_AP_STA_HLID_START + id;
-        *hlid = wl_sta->hlid;
+        ret = wl12xx_allocate_link(wl, wlvif, &wl_sta->hlid);
+        if (ret < 0) {
+                wl1271_warning("could not allocate HLID - too many links");
+                return -EBUSY;
+        }
+
+        set_bit(wl_sta->hlid, wlvif->ap.sta_hlid_map);
         memcpy(wl->links[wl_sta->hlid].addr, sta->addr, ETH_ALEN);
         wl->active_sta_count++;
         return 0;
 }
 
-void wl1271_free_sta(struct wl1271 *wl, u8 hlid)
+void wl1271_free_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 hlid)
 {
-        int id = hlid - WL1271_AP_STA_HLID_START;
-
-        if (hlid < WL1271_AP_STA_HLID_START)
+        if (!test_bit(hlid, wlvif->ap.sta_hlid_map))
                 return;
 
-        if (!test_bit(id, wl->ap_hlid_map))
-                return;
-
-        clear_bit(id, wl->ap_hlid_map);
+        clear_bit(hlid, wlvif->ap.sta_hlid_map);
         memset(wl->links[hlid].addr, 0, ETH_ALEN);
         wl->links[hlid].ba_bitmap = 0;
         wl1271_tx_reset_link_queues(wl, hlid);
         __clear_bit(hlid, &wl->ap_ps_map);
         __clear_bit(hlid, (unsigned long *)&wl->ap_fw_ps_map);
+        wl12xx_free_link(wl, wlvif, &hlid);
         wl->active_sta_count--;
 }
 
@@ -3906,6 +4096,8 @@ static int wl1271_op_sta_add(struct ieee80211_hw *hw,
                              struct ieee80211_sta *sta)
 {
         struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
+        struct wl1271_station *wl_sta;
         int ret = 0;
         u8 hlid;
 
@@ -3914,20 +4106,23 @@ static int wl1271_op_sta_add(struct ieee80211_hw *hw,
         if (unlikely(wl->state == WL1271_STATE_OFF))
                 goto out;
 
-        if (wl->bss_type != BSS_TYPE_AP_BSS)
+        if (wlvif->bss_type != BSS_TYPE_AP_BSS)
                 goto out;
 
         wl1271_debug(DEBUG_MAC80211, "mac80211 add sta %d", (int)sta->aid);
 
-        ret = wl1271_allocate_sta(wl, sta, &hlid);
+        ret = wl1271_allocate_sta(wl, wlvif, sta);
         if (ret < 0)
                 goto out;
 
+        wl_sta = (struct wl1271_station *)sta->drv_priv;
+        hlid = wl_sta->hlid;
+
         ret = wl1271_ps_elp_wakeup(wl);
         if (ret < 0)
                 goto out_free_sta;
 
-        ret = wl12xx_cmd_add_peer(wl, sta, hlid);
+        ret = wl12xx_cmd_add_peer(wl, wlvif, sta, hlid);
         if (ret < 0)
                 goto out_sleep;
 
@@ -3944,7 +4139,7 @@ out_sleep:
 
 out_free_sta:
         if (ret < 0)
-                wl1271_free_sta(wl, hlid);
+                wl1271_free_sta(wl, wlvif, hlid);
 
 out:
         mutex_unlock(&wl->mutex);
@@ -3956,6 +4151,7 @@ static int wl1271_op_sta_remove(struct ieee80211_hw *hw,
                                 struct ieee80211_sta *sta)
 {
         struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         struct wl1271_station *wl_sta;
         int ret = 0, id;
 
@@ -3964,14 +4160,14 @@ static int wl1271_op_sta_remove(struct ieee80211_hw *hw,
         if (unlikely(wl->state == WL1271_STATE_OFF))
                 goto out;
 
-        if (wl->bss_type != BSS_TYPE_AP_BSS)
+        if (wlvif->bss_type != BSS_TYPE_AP_BSS)
                 goto out;
 
         wl1271_debug(DEBUG_MAC80211, "mac80211 remove sta %d", (int)sta->aid);
 
         wl_sta = (struct wl1271_station *)sta->drv_priv;
-        id = wl_sta->hlid - WL1271_AP_STA_HLID_START;
-        if (WARN_ON(!test_bit(id, wl->ap_hlid_map)))
+        id = wl_sta->hlid;
+        if (WARN_ON(!test_bit(id, wlvif->ap.sta_hlid_map)))
                 goto out;
 
         ret = wl1271_ps_elp_wakeup(wl);
@@ -3982,7 +4178,7 @@ static int wl1271_op_sta_remove(struct ieee80211_hw *hw,
         if (ret < 0)
                 goto out_sleep;
 
-        wl1271_free_sta(wl, wl_sta->hlid);
+        wl1271_free_sta(wl, wlvif, wl_sta->hlid);
 
 out_sleep:
         wl1271_ps_elp_sleep(wl);
@@ -3999,6 +4195,7 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw,
                                   u8 buf_size)
 {
         struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         int ret;
         u8 hlid, *ba_bitmap;
 
@@ -4016,10 +4213,10 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw,
                 goto out;
         }
 
-        if (wl->bss_type == BSS_TYPE_STA_BSS) {
-                hlid = wl->sta_hlid;
-                ba_bitmap = &wl->ba_rx_bitmap;
-        } else if (wl->bss_type == BSS_TYPE_AP_BSS) {
+        if (wlvif->bss_type == BSS_TYPE_STA_BSS) {
+                hlid = wlvif->sta.hlid;
+                ba_bitmap = &wlvif->sta.ba_rx_bitmap;
+        } else if (wlvif->bss_type == BSS_TYPE_AP_BSS) {
                 struct wl1271_station *wl_sta;
 
                 wl_sta = (struct wl1271_station *)sta->drv_priv;
@@ -4039,7 +4236,7 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw,
 
         switch (action) {
         case IEEE80211_AMPDU_RX_START:
-                if (!wl->ba_support || !wl->ba_allowed) {
+                if (!wlvif->ba_support || !wlvif->ba_allowed) {
                         ret = -ENOTSUPP;
                         break;
                 }
@@ -4108,8 +4305,9 @@ static int wl12xx_set_bitrate_mask(struct ieee80211_hw *hw,
                                    struct ieee80211_vif *vif,
                                    const struct cfg80211_bitrate_mask *mask)
 {
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         struct wl1271 *wl = hw->priv;
-        int i;
+        int i, ret = 0;
 
         wl1271_debug(DEBUG_MAC80211, "mac80211 set_bitrate_mask 0x%x 0x%x",
                 mask->control[NL80211_BAND_2GHZ].legacy,
@@ -4118,19 +4316,39 @@ static int wl12xx_set_bitrate_mask(struct ieee80211_hw *hw,
         mutex_lock(&wl->mutex);
 
         for (i = 0; i < IEEE80211_NUM_BANDS; i++)
-                wl->bitrate_masks[i] =
+                wlvif->bitrate_masks[i] =
                         wl1271_tx_enabled_rates_get(wl,
                                                     mask->control[i].legacy,
                                                     i);
+
+        if (unlikely(wl->state == WL1271_STATE_OFF))
+                goto out;
+
+        if (wlvif->bss_type == BSS_TYPE_STA_BSS &&
+            !test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) {
+
+                ret = wl1271_ps_elp_wakeup(wl);
+                if (ret < 0)
+                        goto out;
+
+                wl1271_set_band_rate(wl, wlvif);
+                wlvif->basic_rate =
+                        wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
+                ret = wl1271_acx_sta_rate_policies(wl, wlvif);
+
+                wl1271_ps_elp_sleep(wl);
+        }
+out:
         mutex_unlock(&wl->mutex);
 
-        return 0;
+        return ret;
 }
 
 static void wl12xx_op_channel_switch(struct ieee80211_hw *hw,
                                      struct ieee80211_channel_switch *ch_switch)
 {
         struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif;
         int ret;
 
         wl1271_debug(DEBUG_MAC80211, "mac80211 channel switch");
@@ -4138,19 +4356,24 @@ static void wl12xx_op_channel_switch(struct ieee80211_hw *hw,
         mutex_lock(&wl->mutex);
 
         if (unlikely(wl->state == WL1271_STATE_OFF)) {
-                mutex_unlock(&wl->mutex);
-                ieee80211_chswitch_done(wl->vif, false);
-                return;
+                wl12xx_for_each_wlvif_sta(wl, wlvif) {
+                        struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
+                        ieee80211_chswitch_done(vif, false);
+                }
+                goto out;
         }
 
         ret = wl1271_ps_elp_wakeup(wl);
         if (ret < 0)
                 goto out;
 
-        ret = wl12xx_cmd_channel_switch(wl, ch_switch);
+        /* TODO: change mac80211 to pass vif as param */
+        wl12xx_for_each_wlvif_sta(wl, wlvif) {
+                ret = wl12xx_cmd_channel_switch(wl, ch_switch);
 
-        if (!ret)
-                set_bit(WL1271_FLAG_CS_PROGRESS, &wl->flags);
+                if (!ret)
+                        set_bit(WLVIF_FLAG_CS_PROGRESS, &wlvif->flags);
+        }
 
         wl1271_ps_elp_sleep(wl);
 
@@ -4170,10 +4393,6 @@ static bool wl1271_tx_frames_pending(struct ieee80211_hw *hw)
 
         /* packets are considered pending if in the TX queue or the FW */
         ret = (wl1271_tx_total_queue_count(wl) > 0) || (wl->tx_frames_cnt > 0);
-
-        /* the above is appropriate for STA mode for PS purposes */
-        WARN_ON(wl->bss_type != BSS_TYPE_STA_BSS);
-
 out:
         mutex_unlock(&wl->mutex);
 
@@ -4604,7 +4823,7 @@ static struct bin_attribute fwlog_attr = {
         .read = wl1271_sysfs_read_fwlog,
 };
 
-int wl1271_register_hw(struct wl1271 *wl)
+static int wl1271_register_hw(struct wl1271 *wl)
 {
         int ret;
 
@@ -4645,9 +4864,8 @@ int wl1271_register_hw(struct wl1271 *wl)
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(wl1271_register_hw);
 
-void wl1271_unregister_hw(struct wl1271 *wl)
+static void wl1271_unregister_hw(struct wl1271 *wl)
 {
         if (wl->state == WL1271_STATE_PLT)
                 __wl1271_plt_stop(wl);
@@ -4657,9 +4875,8 @@ void wl1271_unregister_hw(struct wl1271 *wl)
         wl->mac80211_registered = false;
 
 }
-EXPORT_SYMBOL_GPL(wl1271_unregister_hw);
 
-int wl1271_init_ieee80211(struct wl1271 *wl)
+static int wl1271_init_ieee80211(struct wl1271 *wl)
 {
         static const u32 cipher_suites[] = {
                 WLAN_CIPHER_SUITE_WEP40,
@@ -4736,27 +4953,33 @@ int wl1271_init_ieee80211(struct wl1271 *wl)
 
         wl->hw->wiphy->reg_notifier = wl1271_reg_notify;
 
-        SET_IEEE80211_DEV(wl->hw, wl1271_wl_to_dev(wl));
+        /* the FW answers probe-requests in AP-mode */
+        wl->hw->wiphy->flags |= WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD;
+        wl->hw->wiphy->probe_resp_offload =
+                NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS |
+                NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 |
+                NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P;
+
+        SET_IEEE80211_DEV(wl->hw, wl->dev);
 
         wl->hw->sta_data_size = sizeof(struct wl1271_station);
+        wl->hw->vif_data_size = sizeof(struct wl12xx_vif);
 
         wl->hw->max_rx_aggregation_subframes = 8;
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(wl1271_init_ieee80211);
 
 #define WL1271_DEFAULT_CHANNEL 0
 
-struct ieee80211_hw *wl1271_alloc_hw(void)
+static struct ieee80211_hw *wl1271_alloc_hw(void)
 {
         struct ieee80211_hw *hw;
-        struct platform_device *plat_dev = NULL;
         struct wl1271 *wl;
         int i, j, ret;
         unsigned int order;
 
-        BUILD_BUG_ON(AP_MAX_LINKS > WL12XX_MAX_LINKS);
+        BUILD_BUG_ON(AP_MAX_STATIONS > WL12XX_MAX_LINKS);
 
         hw = ieee80211_alloc_hw(sizeof(*wl), &wl1271_ops);
         if (!hw) {
@@ -4765,41 +4988,26 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
                 goto err_hw_alloc;
         }
 
-        plat_dev = kmemdup(&wl1271_device, sizeof(wl1271_device), GFP_KERNEL);
-        if (!plat_dev) {
-                wl1271_error("could not allocate platform_device");
-                ret = -ENOMEM;
-                goto err_plat_alloc;
-        }
-
         wl = hw->priv;
         memset(wl, 0, sizeof(*wl));
 
         INIT_LIST_HEAD(&wl->list);
+        INIT_LIST_HEAD(&wl->wlvif_list);
 
         wl->hw = hw;
-        wl->plat_dev = plat_dev;
-
-        for (i = 0; i < NUM_TX_QUEUES; i++)
-                skb_queue_head_init(&wl->tx_queue[i]);
 
         for (i = 0; i < NUM_TX_QUEUES; i++)
-                for (j = 0; j < AP_MAX_LINKS; j++)
+                for (j = 0; j < WL12XX_MAX_LINKS; j++)
                         skb_queue_head_init(&wl->links[j].tx_queue[i]);
 
         skb_queue_head_init(&wl->deferred_rx_queue);
         skb_queue_head_init(&wl->deferred_tx_queue);
 
         INIT_DELAYED_WORK(&wl->elp_work, wl1271_elp_work);
-        INIT_DELAYED_WORK(&wl->pspoll_work, wl1271_pspoll_work);
         INIT_WORK(&wl->netstack_work, wl1271_netstack_work);
         INIT_WORK(&wl->tx_work, wl1271_tx_work);
         INIT_WORK(&wl->recovery_work, wl1271_recovery_work);
         INIT_DELAYED_WORK(&wl->scan_complete_work, wl1271_scan_complete_work);
-        INIT_WORK(&wl->rx_streaming_enable_work,
-                  wl1271_rx_streaming_enable_work);
-        INIT_WORK(&wl->rx_streaming_disable_work,
-                  wl1271_rx_streaming_disable_work);
 
         wl->freezable_wq = create_freezable_workqueue("wl12xx_wq");
         if (!wl->freezable_wq) {
@@ -4808,41 +5016,21 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
         }
 
         wl->channel = WL1271_DEFAULT_CHANNEL;
-        wl->beacon_int = WL1271_DEFAULT_BEACON_INT;
-        wl->default_key = 0;
         wl->rx_counter = 0;
-        wl->psm_entry_retry = 0;
         wl->power_level = WL1271_DEFAULT_POWER_LEVEL;
-        wl->basic_rate_set = CONF_TX_RATE_MASK_BASIC;
-        wl->basic_rate = CONF_TX_RATE_MASK_BASIC;
-        wl->rate_set = CONF_TX_RATE_MASK_BASIC;
         wl->band = IEEE80211_BAND_2GHZ;
         wl->vif = NULL;
         wl->flags = 0;
         wl->sg_enabled = true;
         wl->hw_pg_ver = -1;
-        wl->bss_type = MAX_BSS_TYPE;
-        wl->set_bss_type = MAX_BSS_TYPE;
-        wl->last_tx_hlid = 0;
         wl->ap_ps_map = 0;
         wl->ap_fw_ps_map = 0;
         wl->quirks = 0;
         wl->platform_quirks = 0;
         wl->sched_scanning = false;
-        wl->tx_security_seq = 0;
-        wl->tx_security_last_seq_lsb = 0;
         wl->tx_spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;
-        wl->role_id = WL12XX_INVALID_ROLE_ID;
         wl->system_hlid = WL12XX_SYSTEM_HLID;
-        wl->sta_hlid = WL12XX_INVALID_LINK_ID;
-        wl->dev_role_id = WL12XX_INVALID_ROLE_ID;
-        wl->dev_hlid = WL12XX_INVALID_LINK_ID;
-        wl->session_counter = 0;
-        wl->ap_bcast_hlid = WL12XX_INVALID_LINK_ID;
-        wl->ap_global_hlid = WL12XX_INVALID_LINK_ID;
         wl->active_sta_count = 0;
-        setup_timer(&wl->rx_streaming_timer, wl1271_rx_streaming_timer,
-                    (unsigned long) wl);
         wl->fwlog_size = 0;
         init_waitqueue_head(&wl->fwlog_waitq);
 
@@ -4860,8 +5048,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
 
         /* Apply default driver configuration. */
         wl1271_conf_init(wl);
-        wl->bitrate_masks[IEEE80211_BAND_2GHZ] = wl->conf.tx.basic_rate;
-        wl->bitrate_masks[IEEE80211_BAND_5GHZ] = wl->conf.tx.basic_rate_5;
 
         order = get_order(WL1271_AGGR_BUFFER_SIZE);
         wl->aggr_buf = (u8 *)__get_free_pages(GFP_KERNEL, order);
@@ -4883,49 +5069,8 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
                 goto err_dummy_packet;
         }
 
-        /* Register platform device */
-        ret = platform_device_register(wl->plat_dev);
-        if (ret) {
-                wl1271_error("couldn't register platform device");
-                goto err_fwlog;
-        }
-        dev_set_drvdata(&wl->plat_dev->dev, wl);
-
-        /* Create sysfs file to control bt coex state */
-        ret = device_create_file(&wl->plat_dev->dev, &dev_attr_bt_coex_state);
-        if (ret < 0) {
-                wl1271_error("failed to create sysfs file bt_coex_state");
-                goto err_platform;
-        }
-
-        /* Create sysfs file to get HW PG version */
-        ret = device_create_file(&wl->plat_dev->dev, &dev_attr_hw_pg_ver);
-        if (ret < 0) {
-                wl1271_error("failed to create sysfs file hw_pg_ver");
-                goto err_bt_coex_state;
-        }
-
-        /* Create sysfs file for the FW log */
-        ret = device_create_bin_file(&wl->plat_dev->dev, &fwlog_attr);
-        if (ret < 0) {
-                wl1271_error("failed to create sysfs file fwlog");
-                goto err_hw_pg_ver;
-        }
-
         return hw;
 
-err_hw_pg_ver:
-        device_remove_file(&wl->plat_dev->dev, &dev_attr_hw_pg_ver);
-
-err_bt_coex_state:
-        device_remove_file(&wl->plat_dev->dev, &dev_attr_bt_coex_state);
-
-err_platform:
-        platform_device_unregister(wl->plat_dev);
-
-err_fwlog:
-        free_page((unsigned long)wl->fwlog);
-
 err_dummy_packet:
         dev_kfree_skb(wl->dummy_packet);
 
@@ -4937,18 +5082,14 @@ err_wq:
 
 err_hw:
         wl1271_debugfs_exit(wl);
-        kfree(plat_dev);
-
-err_plat_alloc:
         ieee80211_free_hw(hw);
 
 err_hw_alloc:
 
         return ERR_PTR(ret);
 }
-EXPORT_SYMBOL_GPL(wl1271_alloc_hw);
 
-int wl1271_free_hw(struct wl1271 *wl)
+static int wl1271_free_hw(struct wl1271 *wl)
 {
         /* Unblock any fwlog readers */
         mutex_lock(&wl->mutex);
@@ -4956,17 +5097,15 @@ int wl1271_free_hw(struct wl1271 *wl)
         wake_up_interruptible_all(&wl->fwlog_waitq);
         mutex_unlock(&wl->mutex);
 
-        device_remove_bin_file(&wl->plat_dev->dev, &fwlog_attr);
+        device_remove_bin_file(wl->dev, &fwlog_attr);
 
-        device_remove_file(&wl->plat_dev->dev, &dev_attr_hw_pg_ver);
+        device_remove_file(wl->dev, &dev_attr_hw_pg_ver);
 
-        device_remove_file(&wl->plat_dev->dev, &dev_attr_bt_coex_state);
-        platform_device_unregister(wl->plat_dev);
+        device_remove_file(wl->dev, &dev_attr_bt_coex_state);
         free_page((unsigned long)wl->fwlog);
         dev_kfree_skb(wl->dummy_packet);
         free_pages((unsigned long)wl->aggr_buf,
                         get_order(WL1271_AGGR_BUFFER_SIZE));
-        kfree(wl->plat_dev);
 
         wl1271_debugfs_exit(wl);
 
@@ -4983,7 +5122,174 @@ int wl1271_free_hw(struct wl1271 *wl)
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(wl1271_free_hw);
+
+static irqreturn_t wl12xx_hardirq(int irq, void *cookie)
+{
+        struct wl1271 *wl = cookie;
+        unsigned long flags;
+
+        wl1271_debug(DEBUG_IRQ, "IRQ");
+
+        /* complete the ELP completion */
+        spin_lock_irqsave(&wl->wl_lock, flags);
+        set_bit(WL1271_FLAG_IRQ_RUNNING, &wl->flags);
+        if (wl->elp_compl) {
+                complete(wl->elp_compl);
+                wl->elp_compl = NULL;
+        }
+
+        if (test_bit(WL1271_FLAG_SUSPENDED, &wl->flags)) {
+                /* don't enqueue a work right now. mark it as pending */
+                set_bit(WL1271_FLAG_PENDING_WORK, &wl->flags);
+                wl1271_debug(DEBUG_IRQ, "should not enqueue work");
+                disable_irq_nosync(wl->irq);
+                pm_wakeup_event(wl->dev, 0);
+                spin_unlock_irqrestore(&wl->wl_lock, flags);
+                return IRQ_HANDLED;
+        }
+        spin_unlock_irqrestore(&wl->wl_lock, flags);
+
+        return IRQ_WAKE_THREAD;
+}
+
+static int __devinit wl12xx_probe(struct platform_device *pdev)
+{
+        struct wl12xx_platform_data *pdata = pdev->dev.platform_data;
+        struct ieee80211_hw *hw;
+        struct wl1271 *wl;
+        unsigned long irqflags;
+        int ret = -ENODEV;
+
+        hw = wl1271_alloc_hw();
+        if (IS_ERR(hw)) {
+                wl1271_error("can't allocate hw");
+                ret = PTR_ERR(hw);
+                goto out;
+        }
+
+        wl = hw->priv;
+        wl->irq = platform_get_irq(pdev, 0);
+        wl->ref_clock = pdata->board_ref_clock;
+        wl->tcxo_clock = pdata->board_tcxo_clock;
+        wl->platform_quirks = pdata->platform_quirks;
+        wl->set_power = pdata->set_power;
+        wl->dev = &pdev->dev;
+        wl->if_ops = pdata->ops;
+
+        platform_set_drvdata(pdev, wl);
+
+        if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ)
+                irqflags = IRQF_TRIGGER_RISING;
+        else
+                irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;
+
+        ret = request_threaded_irq(wl->irq, wl12xx_hardirq, wl1271_irq,
+                                   irqflags,
+                                   pdev->name, wl);
+        if (ret < 0) {
+                wl1271_error("request_irq() failed: %d", ret);
+                goto out_free_hw;
+        }
+
+        ret = enable_irq_wake(wl->irq);
+        if (!ret) {
+                wl->irq_wake_enabled = true;
+                device_init_wakeup(wl->dev, 1);
+                if (pdata->pwr_in_suspend)
+                        hw->wiphy->wowlan.flags = WIPHY_WOWLAN_ANY;
+
+        }
+        disable_irq(wl->irq);
+
+        ret = wl1271_init_ieee80211(wl);
+        if (ret)
+                goto out_irq;
+
+        ret = wl1271_register_hw(wl);
+        if (ret)
+                goto out_irq;
+
+        /* Create sysfs file to control bt coex state */
+        ret = device_create_file(wl->dev, &dev_attr_bt_coex_state);
+        if (ret < 0) {
+                wl1271_error("failed to create sysfs file bt_coex_state");
+                goto out_irq;
+        }
+
+        /* Create sysfs file to get HW PG version */
+        ret = device_create_file(wl->dev, &dev_attr_hw_pg_ver);
+        if (ret < 0) {
+                wl1271_error("failed to create sysfs file hw_pg_ver");
+                goto out_bt_coex_state;
+        }
+
+        /* Create sysfs file for the FW log */
+        ret = device_create_bin_file(wl->dev, &fwlog_attr);
+        if (ret < 0) {
+                wl1271_error("failed to create sysfs file fwlog");
+                goto out_hw_pg_ver;
+        }
+
+        return 0;
+
+out_hw_pg_ver:
+        device_remove_file(wl->dev, &dev_attr_hw_pg_ver);
+
+out_bt_coex_state:
+        device_remove_file(wl->dev, &dev_attr_bt_coex_state);
+
+out_irq:
+        free_irq(wl->irq, wl);
+
+out_free_hw:
+        wl1271_free_hw(wl);
+
+out:
+        return ret;
+}
+
+static int __devexit wl12xx_remove(struct platform_device *pdev)
+{
+        struct wl1271 *wl = platform_get_drvdata(pdev);
+
+        if (wl->irq_wake_enabled) {
+                device_init_wakeup(wl->dev, 0);
+                disable_irq_wake(wl->irq);
+        }
+        wl1271_unregister_hw(wl);
+        free_irq(wl->irq, wl);
+        wl1271_free_hw(wl);
+
+        return 0;
+}
+
+static const struct platform_device_id wl12xx_id_table[] __devinitconst = {
+        { "wl12xx", 0 },
+        {  } /* Terminating Entry */
+};
+MODULE_DEVICE_TABLE(platform, wl12xx_id_table);
+
+static struct platform_driver wl12xx_driver = {
+        .probe          = wl12xx_probe,
+        .remove         = __devexit_p(wl12xx_remove),
+        .id_table       = wl12xx_id_table,
+        .driver = {
+                .name   = "wl12xx_driver",
+                .owner  = THIS_MODULE,
+        }
+};
+
+static int __init wl12xx_init(void)
+{
+        return platform_driver_register(&wl12xx_driver);
+}
+module_init(wl12xx_init);
+
+static void __exit wl12xx_exit(void)
+{
+        platform_driver_unregister(&wl12xx_driver);
+}
+module_exit(wl12xx_exit);
 
 u32 wl12xx_debug_level = DEBUG_NONE;
 EXPORT_SYMBOL_GPL(wl12xx_debug_level);
diff --git a/drivers/net/wireless/wl12xx/ps.c b/drivers/net/wireless/wl12xx/ps.c
index c15ebf2efd40..a7a11088dd31 100644
--- a/drivers/net/wireless/wl12xx/ps.c
+++ b/drivers/net/wireless/wl12xx/ps.c
@@ -25,6 +25,7 @@
 #include "ps.h"
 #include "io.h"
 #include "tx.h"
+#include "debug.h"
 
 #define WL1271_WAKEUP_TIMEOUT 500
 
@@ -32,6 +33,7 @@ void wl1271_elp_work(struct work_struct *work)
 {
         struct delayed_work *dwork;
         struct wl1271 *wl;
+        struct wl12xx_vif *wlvif;
 
         dwork = container_of(work, struct delayed_work, work);
         wl = container_of(dwork, struct wl1271, elp_work);
@@ -47,11 +49,15 @@ void wl1271_elp_work(struct work_struct *work)
         if (unlikely(!test_bit(WL1271_FLAG_ELP_REQUESTED, &wl->flags)))
                 goto out;
 
-        if (test_bit(WL1271_FLAG_IN_ELP, &wl->flags) ||
-            (!test_bit(WL1271_FLAG_PSM, &wl->flags) &&
-             !test_bit(WL1271_FLAG_IDLE, &wl->flags)))
+        if (test_bit(WL1271_FLAG_IN_ELP, &wl->flags))
                 goto out;
 
+        wl12xx_for_each_wlvif(wl, wlvif) {
+                if (!test_bit(WLVIF_FLAG_PSM, &wlvif->flags) &&
+                    !test_bit(WL1271_FLAG_IDLE, &wl->flags))
+                        goto out;
+        }
+
         wl1271_debug(DEBUG_PSM, "chip to elp");
         wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, ELPCTRL_SLEEP);
         set_bit(WL1271_FLAG_IN_ELP, &wl->flags);
@@ -65,13 +71,17 @@ out:
 /* Routines to toggle sleep mode while in ELP */
 void wl1271_ps_elp_sleep(struct wl1271 *wl)
 {
+        struct wl12xx_vif *wlvif;
+
         /* we shouldn't get consecutive sleep requests */
         if (WARN_ON(test_and_set_bit(WL1271_FLAG_ELP_REQUESTED, &wl->flags)))
                 return;
 
-        if (!test_bit(WL1271_FLAG_PSM, &wl->flags) &&
-            !test_bit(WL1271_FLAG_IDLE, &wl->flags))
-                return;
+        wl12xx_for_each_wlvif(wl, wlvif) {
+                if (!test_bit(WLVIF_FLAG_PSM, &wlvif->flags) &&
+                    !test_bit(WL1271_FLAG_IDLE, &wl->flags))
+                        return;
+        }
 
         ieee80211_queue_delayed_work(wl->hw, &wl->elp_work,
                                      msecs_to_jiffies(ELP_ENTRY_DELAY));
@@ -143,8 +153,8 @@ out:
         return 0;
 }
 
-int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode,
-                       u32 rates, bool send)
+int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                       enum wl1271_cmd_ps_mode mode, u32 rates, bool send)
 {
         int ret;
 
@@ -152,39 +162,34 @@ int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode,
         case STATION_POWER_SAVE_MODE:
                 wl1271_debug(DEBUG_PSM, "entering psm");
 
-                ret = wl1271_acx_wake_up_conditions(wl);
+                ret = wl1271_acx_wake_up_conditions(wl, wlvif);
                 if (ret < 0) {
                         wl1271_error("couldn't set wake up conditions");
                         return ret;
                 }
 
-                ret = wl1271_cmd_ps_mode(wl, STATION_POWER_SAVE_MODE);
+                ret = wl1271_cmd_ps_mode(wl, wlvif, STATION_POWER_SAVE_MODE);
                 if (ret < 0)
                         return ret;
 
-                set_bit(WL1271_FLAG_PSM, &wl->flags);
+                set_bit(WLVIF_FLAG_PSM, &wlvif->flags);
                 break;
         case STATION_ACTIVE_MODE:
         default:
                 wl1271_debug(DEBUG_PSM, "leaving psm");
 
                 /* disable beacon early termination */
-                if (wl->band == IEEE80211_BAND_2GHZ) {
-                        ret = wl1271_acx_bet_enable(wl, false);
+                if (wlvif->band == IEEE80211_BAND_2GHZ) {
+                        ret = wl1271_acx_bet_enable(wl, wlvif, false);
                         if (ret < 0)
                                 return ret;
                 }
 
-                /* disable beacon filtering */
-                ret = wl1271_acx_beacon_filter_opt(wl, false);
-                if (ret < 0)
-                        return ret;
-
-                ret = wl1271_cmd_ps_mode(wl, STATION_ACTIVE_MODE);
+                ret = wl1271_cmd_ps_mode(wl, wlvif, STATION_ACTIVE_MODE);
                 if (ret < 0)
                         return ret;
 
-                clear_bit(WL1271_FLAG_PSM, &wl->flags);
+                clear_bit(WLVIF_FLAG_PSM, &wlvif->flags);
                 break;
         }
 
@@ -223,9 +228,11 @@ static void wl1271_ps_filter_frames(struct wl1271 *wl, u8 hlid)
         wl1271_handle_tx_low_watermark(wl);
 }
 
-void wl1271_ps_link_start(struct wl1271 *wl, u8 hlid, bool clean_queues)
+void wl12xx_ps_link_start(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                          u8 hlid, bool clean_queues)
 {
         struct ieee80211_sta *sta;
+        struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
 
         if (test_bit(hlid, &wl->ap_ps_map))
                 return;
@@ -235,7 +242,7 @@ void wl1271_ps_link_start(struct wl1271 *wl, u8 hlid, bool clean_queues)
                      clean_queues);
 
         rcu_read_lock();
-        sta = ieee80211_find_sta(wl->vif, wl->links[hlid].addr);
+        sta = ieee80211_find_sta(vif, wl->links[hlid].addr);
         if (!sta) {
                 wl1271_error("could not find sta %pM for starting ps",
                              wl->links[hlid].addr);
@@ -253,9 +260,10 @@ void wl1271_ps_link_start(struct wl1271 *wl, u8 hlid, bool clean_queues)
         __set_bit(hlid, &wl->ap_ps_map);
 }
 
-void wl1271_ps_link_end(struct wl1271 *wl, u8 hlid)
+void wl12xx_ps_link_end(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 hlid)
 {
         struct ieee80211_sta *sta;
+        struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
 
         if (!test_bit(hlid, &wl->ap_ps_map))
                 return;
@@ -265,7 +273,7 @@ void wl1271_ps_link_end(struct wl1271 *wl, u8 hlid)
         __clear_bit(hlid, &wl->ap_ps_map);
 
         rcu_read_lock();
-        sta = ieee80211_find_sta(wl->vif, wl->links[hlid].addr);
+        sta = ieee80211_find_sta(vif, wl->links[hlid].addr);
         if (!sta) {
                 wl1271_error("could not find sta %pM for ending ps",
                              wl->links[hlid].addr);
diff --git a/drivers/net/wireless/wl12xx/ps.h b/drivers/net/wireless/wl12xx/ps.h
index 25eb9bc9b628..a12052f02026 100644
--- a/drivers/net/wireless/wl12xx/ps.h
+++ b/drivers/net/wireless/wl12xx/ps.h
@@ -27,13 +27,14 @@
 #include "wl12xx.h"
 #include "acx.h"
 
-int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode,
-                       u32 rates, bool send);
+int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                       enum wl1271_cmd_ps_mode mode, u32 rates, bool send);
 void wl1271_ps_elp_sleep(struct wl1271 *wl);
 int wl1271_ps_elp_wakeup(struct wl1271 *wl);
 void wl1271_elp_work(struct work_struct *work);
-void wl1271_ps_link_start(struct wl1271 *wl, u8 hlid, bool clean_queues);
-void wl1271_ps_link_end(struct wl1271 *wl, u8 hlid);
+void wl12xx_ps_link_start(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                          u8 hlid, bool clean_queues);
+void wl12xx_ps_link_end(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 hlid);
 
 #define WL1271_PS_COMPLETE_TIMEOUT 500
 
diff --git a/drivers/net/wireless/wl12xx/reg.h b/drivers/net/wireless/wl12xx/reg.h
index 3f570f397586..df34d5977b98 100644
--- a/drivers/net/wireless/wl12xx/reg.h
+++ b/drivers/net/wireless/wl12xx/reg.h
@@ -408,7 +408,7 @@
 
 
 /* Firmware image load chunk size */
-#define CHUNK_SIZE          512
+#define CHUNK_SIZE      16384
 
 /* Firmware image header size */
 #define FW_HDR_SIZE 8
diff --git a/drivers/net/wireless/wl12xx/rx.c b/drivers/net/wireless/wl12xx/rx.c
index dee4cfe9ccc1..4fbd2a722ffa 100644
--- a/drivers/net/wireless/wl12xx/rx.c
+++ b/drivers/net/wireless/wl12xx/rx.c
@@ -25,9 +25,11 @@
 #include <linux/sched.h>
 
 #include "wl12xx.h"
+#include "debug.h"
 #include "acx.h"
 #include "reg.h"
 #include "rx.h"
+#include "tx.h"
 #include "io.h"
 
 static u8 wl12xx_rx_get_mem_block(struct wl12xx_fw_status *status,
@@ -96,7 +98,7 @@ static void wl1271_rx_status(struct wl1271 *wl,
 }
 
 static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
-                                 bool unaligned)
+                                 bool unaligned, u8 *hlid)
 {
         struct wl1271_rx_descriptor *desc;
         struct sk_buff *skb;
@@ -159,6 +161,7 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
          * payload aligned to 4 bytes.
          */
         memcpy(buf, data + sizeof(*desc), length - sizeof(*desc));
+        *hlid = desc->hlid;
 
         hdr = (struct ieee80211_hdr *)skb->data;
         if (ieee80211_is_beacon(hdr->frame_control))
@@ -169,10 +172,10 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
         wl1271_rx_status(wl, desc, IEEE80211_SKB_RXCB(skb), beacon);
 
         seq_num = (le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4;
-        wl1271_debug(DEBUG_RX, "rx skb 0x%p: %d B %s seq %d", skb,
+        wl1271_debug(DEBUG_RX, "rx skb 0x%p: %d B %s seq %d hlid %d", skb,
                      skb->len - desc->pad_len,
                      beacon ? "beacon" : "",
-                     seq_num);
+                     seq_num, *hlid);
 
         skb_trim(skb, skb->len - desc->pad_len);
 
@@ -185,6 +188,7 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
 void wl12xx_rx(struct wl1271 *wl, struct wl12xx_fw_status *status)
 {
         struct wl1271_acx_mem_map *wl_mem_map = wl->target_mem_map;
+        unsigned long active_hlids[BITS_TO_LONGS(WL12XX_MAX_LINKS)] = {0};
         u32 buf_size;
         u32 fw_rx_counter  = status->fw_rx_counter & NUM_RX_PKT_DESC_MOD_MASK;
         u32 drv_rx_counter = wl->rx_counter & NUM_RX_PKT_DESC_MOD_MASK;
@@ -192,8 +196,7 @@ void wl12xx_rx(struct wl1271 *wl, struct wl12xx_fw_status *status)
         u32 mem_block;
         u32 pkt_length;
         u32 pkt_offset;
-        bool is_ap = (wl->bss_type == BSS_TYPE_AP_BSS);
-        bool had_data = false;
+        u8 hlid;
         bool unaligned = false;
 
         while (drv_rx_counter != fw_rx_counter) {
@@ -253,8 +256,15 @@ void wl12xx_rx(struct wl1271 *wl, struct wl12xx_fw_status *status)
                          */
                         if (wl1271_rx_handle_data(wl,
                                                   wl->aggr_buf + pkt_offset,
-                                                  pkt_length, unaligned) == 1)
-                                had_data = true;
+                                                  pkt_length, unaligned,
+                                                  &hlid) == 1) {
+                                if (hlid < WL12XX_MAX_LINKS)
+                                        __set_bit(hlid, active_hlids);
+                                else
+                                        WARN(1,
+                                             "hlid exceeded WL12XX_MAX_LINKS "
+                                             "(%d)\n", hlid);
+                        }
 
                         wl->rx_counter++;
                         drv_rx_counter++;
@@ -270,17 +280,5 @@ void wl12xx_rx(struct wl1271 *wl, struct wl12xx_fw_status *status)
         if (wl->quirks & WL12XX_QUIRK_END_OF_TRANSACTION)
                 wl1271_write32(wl, RX_DRIVER_COUNTER_ADDRESS, wl->rx_counter);
 
-        if (!is_ap && wl->conf.rx_streaming.interval && had_data &&
-            (wl->conf.rx_streaming.always ||
-             test_bit(WL1271_FLAG_SOFT_GEMINI, &wl->flags))) {
-                u32 timeout = wl->conf.rx_streaming.duration;
-
-                /* restart rx streaming */
-                if (!test_bit(WL1271_FLAG_RX_STREAMING_STARTED, &wl->flags))
-                        ieee80211_queue_work(wl->hw,
-                                             &wl->rx_streaming_enable_work);
-
-                mod_timer(&wl->rx_streaming_timer,
-                          jiffies + msecs_to_jiffies(timeout));
-        }
+        wl12xx_rearm_rx_streaming(wl, active_hlids);
 }
diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c
index fc29c671cf3b..8599dab1fe2a 100644
--- a/drivers/net/wireless/wl12xx/scan.c
+++ b/drivers/net/wireless/wl12xx/scan.c
@@ -24,6 +24,7 @@
 #include <linux/ieee80211.h>
 
 #include "wl12xx.h"
+#include "debug.h"
 #include "cmd.h"
 #include "scan.h"
 #include "acx.h"
@@ -34,6 +35,8 @@ void wl1271_scan_complete_work(struct work_struct *work)
 {
         struct delayed_work *dwork;
         struct wl1271 *wl;
+        struct ieee80211_vif *vif;
+        struct wl12xx_vif *wlvif;
         int ret;
         bool is_sta, is_ibss;
 
@@ -50,28 +53,31 @@ void wl1271_scan_complete_work(struct work_struct *work)
         if (wl->scan.state == WL1271_SCAN_STATE_IDLE)
                 goto out;
 
+        vif = wl->scan_vif;
+        wlvif = wl12xx_vif_to_data(vif);
+
         wl->scan.state = WL1271_SCAN_STATE_IDLE;
         memset(wl->scan.scanned_ch, 0, sizeof(wl->scan.scanned_ch));
         wl->scan.req = NULL;
+        wl->scan_vif = NULL;
 
         ret = wl1271_ps_elp_wakeup(wl);
         if (ret < 0)
                 goto out;
 
-        if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags)) {
+        if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) {
                 /* restore hardware connection monitoring template */
-                wl1271_cmd_build_ap_probe_req(wl, wl->probereq);
+                wl1271_cmd_build_ap_probe_req(wl, wlvif, wlvif->probereq);
         }
 
         /* return to ROC if needed */
-        is_sta = (wl->bss_type == BSS_TYPE_STA_BSS);
-        is_ibss = (wl->bss_type == BSS_TYPE_IBSS);
-        if (((is_sta && !test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags)) ||
-             (is_ibss && !test_bit(WL1271_FLAG_IBSS_JOINED, &wl->flags))) &&
-            !test_bit(wl->dev_role_id, wl->roc_map)) {
+        is_sta = (wlvif->bss_type == BSS_TYPE_STA_BSS);
+        is_ibss = (wlvif->bss_type == BSS_TYPE_IBSS);
+        if (((is_sta && !test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) ||
+             (is_ibss && !test_bit(WLVIF_FLAG_IBSS_JOINED, &wlvif->flags))) &&
+            !test_bit(wlvif->dev_role_id, wl->roc_map)) {
                 /* restore remain on channel */
-                wl12xx_cmd_role_start_dev(wl);
-                wl12xx_roc(wl, wl->dev_role_id);
+                wl12xx_start_dev(wl, wlvif);
         }
         wl1271_ps_elp_sleep(wl);
 
@@ -155,9 +161,11 @@ static int wl1271_get_scan_channels(struct wl1271 *wl,
 
 #define WL1271_NOTHING_TO_SCAN 1
 
-static int wl1271_scan_send(struct wl1271 *wl, enum ieee80211_band band,
-                             bool passive, u32 basic_rate)
+static int wl1271_scan_send(struct wl1271 *wl, struct ieee80211_vif *vif,
+                            enum ieee80211_band band,
+                            bool passive, u32 basic_rate)
 {
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         struct wl1271_cmd_scan *cmd;
         struct wl1271_cmd_trigger_scan_to *trigger;
         int ret;
@@ -177,11 +185,11 @@ static int wl1271_scan_send(struct wl1271 *wl, enum ieee80211_band band,
         if (passive)
                 scan_options |= WL1271_SCAN_OPT_PASSIVE;
 
-        if (WARN_ON(wl->role_id == WL12XX_INVALID_ROLE_ID)) {
+        if (WARN_ON(wlvif->role_id == WL12XX_INVALID_ROLE_ID)) {
                 ret = -EINVAL;
                 goto out;
         }
-        cmd->params.role_id = wl->role_id;
+        cmd->params.role_id = wlvif->role_id;
         cmd->params.scan_options = cpu_to_le16(scan_options);
 
         cmd->params.n_ch = wl1271_get_scan_channels(wl, wl->scan.req,
@@ -194,7 +202,6 @@ static int wl1271_scan_send(struct wl1271 *wl, enum ieee80211_band band,
 
         cmd->params.tx_rate = cpu_to_le32(basic_rate);
         cmd->params.n_probe_reqs = wl->conf.scan.num_probe_reqs;
-        cmd->params.tx_rate = cpu_to_le32(basic_rate);
         cmd->params.tid_trigger = 0;
         cmd->params.scan_tag = WL1271_SCAN_DEFAULT_TAG;
 
@@ -208,11 +215,11 @@ static int wl1271_scan_send(struct wl1271 *wl, enum ieee80211_band band,
                 memcpy(cmd->params.ssid, wl->scan.ssid, wl->scan.ssid_len);
         }
 
-        memcpy(cmd->addr, wl->mac_addr, ETH_ALEN);
+        memcpy(cmd->addr, vif->addr, ETH_ALEN);
 
-        ret = wl1271_cmd_build_probe_req(wl, wl->scan.ssid, wl->scan.ssid_len,
-                                         wl->scan.req->ie, wl->scan.req->ie_len,
-                                         band);
+        ret = wl1271_cmd_build_probe_req(wl, wlvif, wl->scan.ssid,
+                                         wl->scan.ssid_len, wl->scan.req->ie,
+                                         wl->scan.req->ie_len, band);
         if (ret < 0) {
                 wl1271_error("PROBE request template failed");
                 goto out;
@@ -241,11 +248,12 @@ out:
         return ret;
 }
 
-void wl1271_scan_stm(struct wl1271 *wl)
+void wl1271_scan_stm(struct wl1271 *wl, struct ieee80211_vif *vif)
 {
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         int ret = 0;
         enum ieee80211_band band;
-        u32 rate;
+        u32 rate, mask;
 
         switch (wl->scan.state) {
         case WL1271_SCAN_STATE_IDLE:
@@ -253,47 +261,59 @@ void wl1271_scan_stm(struct wl1271 *wl)
 
         case WL1271_SCAN_STATE_2GHZ_ACTIVE:
                 band = IEEE80211_BAND_2GHZ;
-                rate = wl1271_tx_min_rate_get(wl, wl->bitrate_masks[band]);
-                ret = wl1271_scan_send(wl, band, false, rate);
+                mask = wlvif->bitrate_masks[band];
+                if (wl->scan.req->no_cck) {
+                        mask &= ~CONF_TX_CCK_RATES;
+                        if (!mask)
+                                mask = CONF_TX_RATE_MASK_BASIC_P2P;
+                }
+                rate = wl1271_tx_min_rate_get(wl, mask);
+                ret = wl1271_scan_send(wl, vif, band, false, rate);
                 if (ret == WL1271_NOTHING_TO_SCAN) {
                         wl->scan.state = WL1271_SCAN_STATE_2GHZ_PASSIVE;
-                        wl1271_scan_stm(wl);
+                        wl1271_scan_stm(wl, vif);
                 }
 
                 break;
 
         case WL1271_SCAN_STATE_2GHZ_PASSIVE:
                 band = IEEE80211_BAND_2GHZ;
-                rate = wl1271_tx_min_rate_get(wl, wl->bitrate_masks[band]);
-                ret = wl1271_scan_send(wl, band, true, rate);
+                mask = wlvif->bitrate_masks[band];
+                if (wl->scan.req->no_cck) {
+                        mask &= ~CONF_TX_CCK_RATES;
+                        if (!mask)
+                                mask = CONF_TX_RATE_MASK_BASIC_P2P;
+                }
+                rate = wl1271_tx_min_rate_get(wl, mask);
+                ret = wl1271_scan_send(wl, vif, band, true, rate);
                 if (ret == WL1271_NOTHING_TO_SCAN) {
                         if (wl->enable_11a)
                                 wl->scan.state = WL1271_SCAN_STATE_5GHZ_ACTIVE;
                         else
                                 wl->scan.state = WL1271_SCAN_STATE_DONE;
-                        wl1271_scan_stm(wl);
+                        wl1271_scan_stm(wl, vif);
                 }
 
                 break;
 
         case WL1271_SCAN_STATE_5GHZ_ACTIVE:
                 band = IEEE80211_BAND_5GHZ;
-                rate = wl1271_tx_min_rate_get(wl, wl->bitrate_masks[band]);
-                ret = wl1271_scan_send(wl, band, false, rate);
+                rate = wl1271_tx_min_rate_get(wl, wlvif->bitrate_masks[band]);
+                ret = wl1271_scan_send(wl, vif, band, false, rate);
                 if (ret == WL1271_NOTHING_TO_SCAN) {
                         wl->scan.state = WL1271_SCAN_STATE_5GHZ_PASSIVE;
-                        wl1271_scan_stm(wl);
+                        wl1271_scan_stm(wl, vif);
                 }
 
                 break;
 
         case WL1271_SCAN_STATE_5GHZ_PASSIVE:
                 band = IEEE80211_BAND_5GHZ;
-                rate = wl1271_tx_min_rate_get(wl, wl->bitrate_masks[band]);
-                ret = wl1271_scan_send(wl, band, true, rate);
+                rate = wl1271_tx_min_rate_get(wl, wlvif->bitrate_masks[band]);
+                ret = wl1271_scan_send(wl, vif, band, true, rate);
                 if (ret == WL1271_NOTHING_TO_SCAN) {
                         wl->scan.state = WL1271_SCAN_STATE_DONE;
-                        wl1271_scan_stm(wl);
+                        wl1271_scan_stm(wl, vif);
                 }
 
                 break;
@@ -317,7 +337,8 @@ void wl1271_scan_stm(struct wl1271 *wl)
         }
 }
 
-int wl1271_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,
+int wl1271_scan(struct wl1271 *wl, struct ieee80211_vif *vif,
+                const u8 *ssid, size_t ssid_len,
                 struct cfg80211_scan_request *req)
 {
         /*
@@ -338,6 +359,7 @@ int wl1271_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,
                 wl->scan.ssid_len = 0;
         }
 
+        wl->scan_vif = vif;
         wl->scan.req = req;
         memset(wl->scan.scanned_ch, 0, sizeof(wl->scan.scanned_ch));
 
@@ -346,7 +368,7 @@ int wl1271_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,
         ieee80211_queue_delayed_work(wl->hw, &wl->scan_complete_work,
                                      msecs_to_jiffies(WL1271_SCAN_TIMEOUT));
 
-        wl1271_scan_stm(wl);
+        wl1271_scan_stm(wl, vif);
 
         return 0;
 }
@@ -550,6 +572,9 @@ wl12xx_scan_sched_scan_ssid_list(struct wl1271 *wl,
                          * so they're used in probe requests.
                          */
                         for (i = 0; i < req->n_ssids; i++) {
+                                if (!req->ssids[i].ssid_len)
+                                        continue;
+
                                 for (j = 0; j < cmd->n_ssids; j++)
                                         if (!memcmp(req->ssids[i].ssid,
                                                    cmd->ssids[j].ssid,
@@ -585,6 +610,7 @@ out:
 }
 
 int wl1271_scan_sched_scan_config(struct wl1271 *wl,
+                                  struct wl12xx_vif *wlvif,
                                   struct cfg80211_sched_scan_request *req,
                                   struct ieee80211_sched_scan_ies *ies)
 {
@@ -631,7 +657,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
         }
 
         if (!force_passive && cfg->active[0]) {
-                ret = wl1271_cmd_build_probe_req(wl, req->ssids[0].ssid,
+                ret = wl1271_cmd_build_probe_req(wl, wlvif, req->ssids[0].ssid,
                                                  req->ssids[0].ssid_len,
                                                  ies->ie[IEEE80211_BAND_2GHZ],
                                                  ies->len[IEEE80211_BAND_2GHZ],
@@ -643,7 +669,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
         }
 
         if (!force_passive && cfg->active[1]) {
-                ret = wl1271_cmd_build_probe_req(wl,  req->ssids[0].ssid,
+                ret = wl1271_cmd_build_probe_req(wl, wlvif, req->ssids[0].ssid,
                                                  req->ssids[0].ssid_len,
                                                  ies->ie[IEEE80211_BAND_5GHZ],
                                                  ies->len[IEEE80211_BAND_5GHZ],
@@ -667,14 +693,14 @@ out:
         return ret;
 }
 
-int wl1271_scan_sched_scan_start(struct wl1271 *wl)
+int wl1271_scan_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         struct wl1271_cmd_sched_scan_start *start;
         int ret = 0;
 
         wl1271_debug(DEBUG_CMD, "cmd periodic scan start");
 
-        if (wl->bss_type != BSS_TYPE_STA_BSS)
+        if (wlvif->bss_type != BSS_TYPE_STA_BSS)
                 return -EOPNOTSUPP;
 
         if (!test_bit(WL1271_FLAG_IDLE, &wl->flags))
diff --git a/drivers/net/wireless/wl12xx/scan.h b/drivers/net/wireless/wl12xx/scan.h
index 92115156522f..a7ed43dc08c9 100644
--- a/drivers/net/wireless/wl12xx/scan.h
+++ b/drivers/net/wireless/wl12xx/scan.h
@@ -26,18 +26,20 @@
 
 #include "wl12xx.h"
 
-int wl1271_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,
+int wl1271_scan(struct wl1271 *wl, struct ieee80211_vif *vif,
+                const u8 *ssid, size_t ssid_len,
                 struct cfg80211_scan_request *req);
 int wl1271_scan_stop(struct wl1271 *wl);
 int wl1271_scan_build_probe_req(struct wl1271 *wl,
                                 const u8 *ssid, size_t ssid_len,
                                 const u8 *ie, size_t ie_len, u8 band);
-void wl1271_scan_stm(struct wl1271 *wl);
+void wl1271_scan_stm(struct wl1271 *wl, struct ieee80211_vif *vif);
 void wl1271_scan_complete_work(struct work_struct *work);
 int wl1271_scan_sched_scan_config(struct wl1271 *wl,
+                                     struct wl12xx_vif *wlvif,
                                      struct cfg80211_sched_scan_request *req,
                                      struct ieee80211_sched_scan_ies *ies);
-int wl1271_scan_sched_scan_start(struct wl1271 *wl);
+int wl1271_scan_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 void wl1271_scan_sched_scan_stop(struct wl1271 *wl);
 void wl1271_scan_sched_scan_results(struct wl1271 *wl);
 
diff --git a/drivers/net/wireless/wl12xx/sdio.c b/drivers/net/wireless/wl12xx/sdio.c
index 516a8980723c..468a50553fac 100644
--- a/drivers/net/wireless/wl12xx/sdio.c
+++ b/drivers/net/wireless/wl12xx/sdio.c
@@ -24,6 +24,7 @@
 #include <linux/irq.h>
 #include <linux/module.h>
 #include <linux/vmalloc.h>
+#include <linux/platform_device.h>
 #include <linux/mmc/sdio_func.h>
 #include <linux/mmc/sdio_ids.h>
 #include <linux/mmc/card.h>
@@ -44,107 +45,67 @@
 #define SDIO_DEVICE_ID_TI_WL1271        0x4076
 #endif
 
+struct wl12xx_sdio_glue {
+        struct device *dev;
+        struct platform_device *core;
+};
+
 static const struct sdio_device_id wl1271_devices[] __devinitconst = {
         { SDIO_DEVICE(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1271) },
         {}
 };
 MODULE_DEVICE_TABLE(sdio, wl1271_devices);
 
-static void wl1271_sdio_set_block_size(struct wl1271 *wl, unsigned int blksz)
-{
-        sdio_claim_host(wl->if_priv);
-        sdio_set_block_size(wl->if_priv, blksz);
-        sdio_release_host(wl->if_priv);
-}
-
-static inline struct sdio_func *wl_to_func(struct wl1271 *wl)
-{
-        return wl->if_priv;
-}
-
-static struct device *wl1271_sdio_wl_to_dev(struct wl1271 *wl)
-{
-        return &(wl_to_func(wl)->dev);
-}
-
-static irqreturn_t wl1271_hardirq(int irq, void *cookie)
+static void wl1271_sdio_set_block_size(struct device *child,
+                                       unsigned int blksz)
 {
-        struct wl1271 *wl = cookie;
-        unsigned long flags;
+        struct wl12xx_sdio_glue *glue = dev_get_drvdata(child->parent);
+        struct sdio_func *func = dev_to_sdio_func(glue->dev);
 
-        wl1271_debug(DEBUG_IRQ, "IRQ");
-
-        /* complete the ELP completion */
-        spin_lock_irqsave(&wl->wl_lock, flags);
-        set_bit(WL1271_FLAG_IRQ_RUNNING, &wl->flags);
-        if (wl->elp_compl) {
-                complete(wl->elp_compl);
-                wl->elp_compl = NULL;
-        }
-
-        if (test_bit(WL1271_FLAG_SUSPENDED, &wl->flags)) {
-                /* don't enqueue a work right now. mark it as pending */
-                set_bit(WL1271_FLAG_PENDING_WORK, &wl->flags);
-                wl1271_debug(DEBUG_IRQ, "should not enqueue work");
-                disable_irq_nosync(wl->irq);
-                pm_wakeup_event(wl1271_sdio_wl_to_dev(wl), 0);
-                spin_unlock_irqrestore(&wl->wl_lock, flags);
-                return IRQ_HANDLED;
-        }
-        spin_unlock_irqrestore(&wl->wl_lock, flags);
-
-        return IRQ_WAKE_THREAD;
-}
-
-static void wl1271_sdio_disable_interrupts(struct wl1271 *wl)
-{
-        disable_irq(wl->irq);
-}
-
-static void wl1271_sdio_enable_interrupts(struct wl1271 *wl)
-{
-        enable_irq(wl->irq);
+        sdio_claim_host(func);
+        sdio_set_block_size(func, blksz);
+        sdio_release_host(func);
 }
 
-static void wl1271_sdio_raw_read(struct wl1271 *wl, int addr, void *buf,
+static void wl12xx_sdio_raw_read(struct device *child, int addr, void *buf,
                                  size_t len, bool fixed)
 {
         int ret;
-        struct sdio_func *func = wl_to_func(wl);
+        struct wl12xx_sdio_glue *glue = dev_get_drvdata(child->parent);
+        struct sdio_func *func = dev_to_sdio_func(glue->dev);
 
         if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) {
                 ((u8 *)buf)[0] = sdio_f0_readb(func, addr, &ret);
-                wl1271_debug(DEBUG_SDIO, "sdio read 52 addr 0x%x, byte 0x%02x",
-                             addr, ((u8 *)buf)[0]);
+                dev_dbg(child->parent, "sdio read 52 addr 0x%x, byte 0x%02x\n",
+                        addr, ((u8 *)buf)[0]);
         } else {
                 if (fixed)
                         ret = sdio_readsb(func, buf, addr, len);
                 else
                         ret = sdio_memcpy_fromio(func, buf, addr, len);
 
-                wl1271_debug(DEBUG_SDIO, "sdio read 53 addr 0x%x, %zu bytes",
-                             addr, len);
-                wl1271_dump_ascii(DEBUG_SDIO, "data: ", buf, len);
+                dev_dbg(child->parent, "sdio read 53 addr 0x%x, %zu bytes\n",
+                        addr, len);
         }
 
         if (ret)
-                wl1271_error("sdio read failed (%d)", ret);
+                dev_err(child->parent, "sdio read failed (%d)\n", ret);
 }
 
-static void wl1271_sdio_raw_write(struct wl1271 *wl, int addr, void *buf,
+static void wl12xx_sdio_raw_write(struct device *child, int addr, void *buf,
                                   size_t len, bool fixed)
 {
         int ret;
-        struct sdio_func *func = wl_to_func(wl);
+        struct wl12xx_sdio_glue *glue = dev_get_drvdata(child->parent);
+        struct sdio_func *func = dev_to_sdio_func(glue->dev);
 
         if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) {
                 sdio_f0_writeb(func, ((u8 *)buf)[0], addr, &ret);
-                wl1271_debug(DEBUG_SDIO, "sdio write 52 addr 0x%x, byte 0x%02x",
-                             addr, ((u8 *)buf)[0]);
+                dev_dbg(child->parent, "sdio write 52 addr 0x%x, byte 0x%02x\n",
+                        addr, ((u8 *)buf)[0]);
         } else {
-                wl1271_debug(DEBUG_SDIO, "sdio write 53 addr 0x%x, %zu bytes",
-                             addr, len);
-                wl1271_dump_ascii(DEBUG_SDIO, "data: ", buf, len);
+                dev_dbg(child->parent, "sdio write 53 addr 0x%x, %zu bytes\n",
+                        addr, len);
 
                 if (fixed)
                         ret = sdio_writesb(func, addr, buf, len);
@@ -153,13 +114,13 @@ static void wl1271_sdio_raw_write(struct wl1271 *wl, int addr, void *buf,
         }
 
         if (ret)
-                wl1271_error("sdio write failed (%d)", ret);
+                dev_err(child->parent, "sdio write failed (%d)\n", ret);
 }
 
-static int wl1271_sdio_power_on(struct wl1271 *wl)
+static int wl12xx_sdio_power_on(struct wl12xx_sdio_glue *glue)
 {
-        struct sdio_func *func = wl_to_func(wl);
         int ret;
+        struct sdio_func *func = dev_to_sdio_func(glue->dev);
 
         /* If enabled, tell runtime PM not to power off the card */
         if (pm_runtime_enabled(&func->dev)) {
@@ -180,10 +141,10 @@ out:
         return ret;
 }
 
-static int wl1271_sdio_power_off(struct wl1271 *wl)
+static int wl12xx_sdio_power_off(struct wl12xx_sdio_glue *glue)
 {
-        struct sdio_func *func = wl_to_func(wl);
         int ret;
+        struct sdio_func *func = dev_to_sdio_func(glue->dev);
 
         sdio_disable_func(func);
         sdio_release_host(func);
@@ -200,46 +161,43 @@ static int wl1271_sdio_power_off(struct wl1271 *wl)
         return ret;
 }
 
-static int wl1271_sdio_set_power(struct wl1271 *wl, bool enable)
+static int wl12xx_sdio_set_power(struct device *child, bool enable)
 {
+        struct wl12xx_sdio_glue *glue = dev_get_drvdata(child->parent);
+
         if (enable)
-                return wl1271_sdio_power_on(wl);
+                return wl12xx_sdio_power_on(glue);
         else
-                return wl1271_sdio_power_off(wl);
+                return wl12xx_sdio_power_off(glue);
 }
 
 static struct wl1271_if_operations sdio_ops = {
-        .read           = wl1271_sdio_raw_read,
-        .write          = wl1271_sdio_raw_write,
-        .power          = wl1271_sdio_set_power,
-        .dev            = wl1271_sdio_wl_to_dev,
-        .enable_irq     = wl1271_sdio_enable_interrupts,
-        .disable_irq    = wl1271_sdio_disable_interrupts,
+        .read           = wl12xx_sdio_raw_read,
+        .write          = wl12xx_sdio_raw_write,
+        .power          = wl12xx_sdio_set_power,
         .set_block_size = wl1271_sdio_set_block_size,
 };
 
 static int __devinit wl1271_probe(struct sdio_func *func,
                                   const struct sdio_device_id *id)
 {
-        struct ieee80211_hw *hw;
-        const struct wl12xx_platform_data *wlan_data;
-        struct wl1271 *wl;
-        unsigned long irqflags;
+        struct wl12xx_platform_data *wlan_data;
+        struct wl12xx_sdio_glue *glue;
+        struct resource res[1];
         mmc_pm_flag_t mmcflags;
-        int ret;
+        int ret = -ENOMEM;
 
         /* We are only able to handle the wlan function */
         if (func->num != 0x02)
                 return -ENODEV;
 
-        hw = wl1271_alloc_hw();
-        if (IS_ERR(hw))
-                return PTR_ERR(hw);
-
-        wl = hw->priv;
+        glue = kzalloc(sizeof(*glue), GFP_KERNEL);
+        if (!glue) {
+                dev_err(&func->dev, "can't allocate glue\n");
+                goto out;
+        }
 
-        wl->if_priv = func;
-        wl->if_ops = &sdio_ops;
+        glue->dev = &func->dev;
 
         /* Grab access to FN0 for ELP reg. */
         func->card->quirks |= MMC_QUIRK_LENIENT_FN0;
@@ -250,80 +208,79 @@ static int __devinit wl1271_probe(struct sdio_func *func,
         wlan_data = wl12xx_get_platform_data();
         if (IS_ERR(wlan_data)) {
                 ret = PTR_ERR(wlan_data);
-                wl1271_error("missing wlan platform data: %d", ret);
-                goto out_free;
+                dev_err(glue->dev, "missing wlan platform data: %d\n", ret);
+                goto out_free_glue;
         }
 
-        wl->irq = wlan_data->irq;
-        wl->ref_clock = wlan_data->board_ref_clock;
-        wl->tcxo_clock = wlan_data->board_tcxo_clock;
-        wl->platform_quirks = wlan_data->platform_quirks;
+        /* if sdio can keep power while host is suspended, enable wow */
+        mmcflags = sdio_get_host_pm_caps(func);
+        dev_dbg(glue->dev, "sdio PM caps = 0x%x\n", mmcflags);
 
-        if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ)
-                irqflags = IRQF_TRIGGER_RISING;
-        else
-                irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;
-
-        ret = request_threaded_irq(wl->irq, wl1271_hardirq, wl1271_irq,
-                                   irqflags,
-                                   DRIVER_NAME, wl);
-        if (ret < 0) {
-                wl1271_error("request_irq() failed: %d", ret);
-                goto out_free;
-        }
+        if (mmcflags & MMC_PM_KEEP_POWER)
+                wlan_data->pwr_in_suspend = true;
+
+        wlan_data->ops = &sdio_ops;
 
-        ret = enable_irq_wake(wl->irq);
-        if (!ret) {
-                wl->irq_wake_enabled = true;
-                device_init_wakeup(wl1271_sdio_wl_to_dev(wl), 1);
+        sdio_set_drvdata(func, glue);
 
-                /* if sdio can keep power while host is suspended, enable wow */
-                mmcflags = sdio_get_host_pm_caps(func);
-                wl1271_debug(DEBUG_SDIO, "sdio PM caps = 0x%x", mmcflags);
+        /* Tell PM core that we don't need the card to be powered now */
+        pm_runtime_put_noidle(&func->dev);
 
-                if (mmcflags & MMC_PM_KEEP_POWER)
-                        hw->wiphy->wowlan.flags = WIPHY_WOWLAN_ANY;
+        glue->core = platform_device_alloc("wl12xx", -1);
+        if (!glue->core) {
+                dev_err(glue->dev, "can't allocate platform_device");
+                ret = -ENOMEM;
+                goto out_free_glue;
         }
-        disable_irq(wl->irq);
 
-        ret = wl1271_init_ieee80211(wl);
-        if (ret)
-                goto out_irq;
+        glue->core->dev.parent = &func->dev;
 
-        ret = wl1271_register_hw(wl);
-        if (ret)
-                goto out_irq;
+        memset(res, 0x00, sizeof(res));
 
-        sdio_set_drvdata(func, wl);
+        res[0].start = wlan_data->irq;
+        res[0].flags = IORESOURCE_IRQ;
+        res[0].name = "irq";
 
-        /* Tell PM core that we don't need the card to be powered now */
-        pm_runtime_put_noidle(&func->dev);
+        ret = platform_device_add_resources(glue->core, res, ARRAY_SIZE(res));
+        if (ret) {
+                dev_err(glue->dev, "can't add resources\n");
+                goto out_dev_put;
+        }
 
+        ret = platform_device_add_data(glue->core, wlan_data,
+                                       sizeof(*wlan_data));
+        if (ret) {
+                dev_err(glue->dev, "can't add platform data\n");
+                goto out_dev_put;
+        }
+
+        ret = platform_device_add(glue->core);
+        if (ret) {
+                dev_err(glue->dev, "can't add platform device\n");
+                goto out_dev_put;
+        }
         return 0;
 
- out_irq:
-        free_irq(wl->irq, wl);
+out_dev_put:
+        platform_device_put(glue->core);
 
- out_free:
-        wl1271_free_hw(wl);
+out_free_glue:
+        kfree(glue);
 
+out:
         return ret;
 }
 
 static void __devexit wl1271_remove(struct sdio_func *func)
 {
-        struct wl1271 *wl = sdio_get_drvdata(func);
+        struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);
 
         /* Undo decrement done above in wl1271_probe */
         pm_runtime_get_noresume(&func->dev);
 
-        wl1271_unregister_hw(wl);
-        if (wl->irq_wake_enabled) {
-                device_init_wakeup(wl1271_sdio_wl_to_dev(wl), 0);
-                disable_irq_wake(wl->irq);
-        }
-        free_irq(wl->irq, wl);
-        wl1271_free_hw(wl);
+        platform_device_del(glue->core);
+        platform_device_put(glue->core);
+        kfree(glue);
 }
 
 #ifdef CONFIG_PM
@@ -332,20 +289,21 @@ static int wl1271_suspend(struct device *dev)
         /* Tell MMC/SDIO core it's OK to power down the card
          * (if it isn't already), but not to remove it completely */
         struct sdio_func *func = dev_to_sdio_func(dev);
-        struct wl1271 *wl = sdio_get_drvdata(func);
+        struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);
+        struct wl1271 *wl = platform_get_drvdata(glue->core);
         mmc_pm_flag_t sdio_flags;
         int ret = 0;
 
-        wl1271_debug(DEBUG_MAC80211, "wl1271 suspend. wow_enabled: %d",
-                     wl->wow_enabled);
+        dev_dbg(dev, "wl1271 suspend. wow_enabled: %d\n",
+                wl->wow_enabled);
 
         /* check whether sdio should keep power */
         if (wl->wow_enabled) {
                 sdio_flags = sdio_get_host_pm_caps(func);
 
                 if (!(sdio_flags & MMC_PM_KEEP_POWER)) {
-                        wl1271_error("can't keep power while host "
-                                     "is suspended");
+                        dev_err(dev, "can't keep power while host "
+                                     "is suspended\n");
                         ret = -EINVAL;
                         goto out;
                 }
@@ -353,7 +311,7 @@ static int wl1271_suspend(struct device *dev)
                 /* keep power while host suspended */
                 ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);
                 if (ret) {
-                        wl1271_error("error while trying to keep power");
+                        dev_err(dev, "error while trying to keep power\n");
                         goto out;
                 }
 
@@ -367,9 +325,10 @@ out:
 static int wl1271_resume(struct device *dev)
 {
         struct sdio_func *func = dev_to_sdio_func(dev);
-        struct wl1271 *wl = sdio_get_drvdata(func);
+        struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);
+        struct wl1271 *wl = platform_get_drvdata(glue->core);
 
-        wl1271_debug(DEBUG_MAC80211, "wl1271 resume");
+        dev_dbg(dev, "wl1271 resume\n");
         if (wl->wow_enabled) {
                 /* claim back host */
                 sdio_claim_host(func);
diff --git a/drivers/net/wireless/wl12xx/sdio_test.c b/drivers/net/wireless/wl12xx/sdio_test.c
deleted file mode 100644
index f25d5d9212e7..000000000000
--- a/drivers/net/wireless/wl12xx/sdio_test.c
+++ /dev/null
@@ -1,543 +0,0 @@
-/*
- * SDIO testing driver for wl12xx
- *
- * Copyright (C) 2010 Nokia Corporation
- *
- * Contact: Roger Quadros <roger.quadros@nokia.com>
- *
- * wl12xx read/write routines taken from the main module
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 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 St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#include <linux/irq.h>
-#include <linux/module.h>
-#include <linux/crc7.h>
-#include <linux/vmalloc.h>
-#include <linux/mmc/sdio_func.h>
-#include <linux/mmc/sdio_ids.h>
-#include <linux/mmc/card.h>
-#include <linux/mmc/host.h>
-#include <linux/gpio.h>
-#include <linux/wl12xx.h>
-#include <linux/kthread.h>
-#include <linux/firmware.h>
-#include <linux/pm_runtime.h>
-
-#include "wl12xx.h"
-#include "io.h"
-#include "boot.h"
-
-#ifndef SDIO_VENDOR_ID_TI
-#define SDIO_VENDOR_ID_TI               0x0097
-#endif
-
-#ifndef SDIO_DEVICE_ID_TI_WL1271
-#define SDIO_DEVICE_ID_TI_WL1271        0x4076
-#endif
-
-static bool rx, tx;
-
-module_param(rx, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(rx, "Perform rx test. Default (0). "
-        "This test continuously reads data from the SDIO device.\n");
-
-module_param(tx, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(tx, "Perform tx test. Default (0). "
-        "This test continuously writes data to the SDIO device.\n");
-
-struct wl1271_test {
-        struct wl1271 wl;
-        struct task_struct *test_task;
-};
-
-static const struct sdio_device_id wl1271_devices[] = {
-        { SDIO_DEVICE(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1271) },
-        {}
-};
-
-static inline struct sdio_func *wl_to_func(struct wl1271 *wl)
-{
-        return wl->if_priv;
-}
-
-static struct device *wl1271_sdio_wl_to_dev(struct wl1271 *wl)
-{
-        return &(wl_to_func(wl)->dev);
-}
-
-static void wl1271_sdio_raw_read(struct wl1271 *wl, int addr, void *buf,
-                size_t len, bool fixed)
-{
-        int ret = 0;
-        struct sdio_func *func = wl_to_func(wl);
-
-        if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) {
-                ((u8 *)buf)[0] = sdio_f0_readb(func, addr, &ret);
-                wl1271_debug(DEBUG_SDIO, "sdio read 52 addr 0x%x, byte 0x%02x",
-                                addr, ((u8 *)buf)[0]);
-        } else {
-                if (fixed)
-                        ret = sdio_readsb(func, buf, addr, len);
-                else
-                        ret = sdio_memcpy_fromio(func, buf, addr, len);
-
-                wl1271_debug(DEBUG_SDIO, "sdio read 53 addr 0x%x, %zu bytes",
-                                addr, len);
-                wl1271_dump_ascii(DEBUG_SDIO, "data: ", buf, len);
-        }
-
-        if (ret)
-                wl1271_error("sdio read failed (%d)", ret);
-}
-
-static void wl1271_sdio_raw_write(struct wl1271 *wl, int addr, void *buf,
-                size_t len, bool fixed)
-{
-        int ret = 0;
-        struct sdio_func *func = wl_to_func(wl);
-
-        if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) {
-                sdio_f0_writeb(func, ((u8 *)buf)[0], addr, &ret);
-                wl1271_debug(DEBUG_SDIO, "sdio write 52 addr 0x%x, byte 0x%02x",
-                                addr, ((u8 *)buf)[0]);
-        } else {
-                wl1271_debug(DEBUG_SDIO, "sdio write 53 addr 0x%x, %zu bytes",
-                                addr, len);
-                wl1271_dump_ascii(DEBUG_SDIO, "data: ", buf, len);
-
-                if (fixed)
-                        ret = sdio_writesb(func, addr, buf, len);
-                else
-                        ret = sdio_memcpy_toio(func, addr, buf, len);
-        }
-        if (ret)
-                wl1271_error("sdio write failed (%d)", ret);
-
-}
-
-static int wl1271_sdio_set_power(struct wl1271 *wl, bool enable)
-{
-        struct sdio_func *func = wl_to_func(wl);
-        int ret;
-
-        /* Let the SDIO stack handle wlan_enable control, so we
-         * keep host claimed while wlan is in use to keep wl1271
-         * alive.
-         */
-        if (enable) {
-                /* Power up the card */
-                ret = pm_runtime_get_sync(&func->dev);
-                if (ret < 0)
-                        goto out;
-
-                /* Runtime PM might be disabled, power up the card manually */
-                ret = mmc_power_restore_host(func->card->host);
-                if (ret < 0)
-                        goto out;
-
-                sdio_claim_host(func);
-                sdio_enable_func(func);
-        } else {
-                sdio_disable_func(func);
-                sdio_release_host(func);
-
-                /* Runtime PM might be disabled, power off the card manually */
-                ret = mmc_power_save_host(func->card->host);
-                if (ret < 0)
-                        goto out;
-
-                /* Power down the card */
-                ret = pm_runtime_put_sync(&func->dev);
-        }
-
-out:
-        return ret;
-}
-
-static void wl1271_sdio_disable_interrupts(struct wl1271 *wl)
-{
-}
-
-static void wl1271_sdio_enable_interrupts(struct wl1271 *wl)
-{
-}
-
-
-static struct wl1271_if_operations sdio_ops = {
-        .read           = wl1271_sdio_raw_read,
-        .write          = wl1271_sdio_raw_write,
-        .power          = wl1271_sdio_set_power,
-        .dev            = wl1271_sdio_wl_to_dev,
-        .enable_irq     = wl1271_sdio_enable_interrupts,
-        .disable_irq    = wl1271_sdio_disable_interrupts,
-};
-
-static void wl1271_fw_wakeup(struct wl1271 *wl)
-{
-        u32 elp_reg;
-
-        elp_reg = ELPCTRL_WAKE_UP;
-        wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, elp_reg);
-}
-
-static int wl1271_fetch_firmware(struct wl1271 *wl)
-{
-        const struct firmware *fw;
-        int ret;
-
-        if (wl->chip.id == CHIP_ID_1283_PG20)
-                ret = request_firmware(&fw, WL128X_FW_NAME,
-                                       wl1271_wl_to_dev(wl));
-        else
-                ret = request_firmware(&fw, WL127X_FW_NAME,
-                                       wl1271_wl_to_dev(wl));
-
-        if (ret < 0) {
-                wl1271_error("could not get firmware: %d", ret);
-                return ret;
-        }
-
-        if (fw->size % 4) {
-                wl1271_error("firmware size is not multiple of 32 bits: %zu",
-                                fw->size);
-                ret = -EILSEQ;
-                goto out;
-        }
-
-        wl->fw_len = fw->size;
-        wl->fw = vmalloc(wl->fw_len);
-
-        if (!wl->fw) {
-                wl1271_error("could not allocate memory for the firmware");
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        memcpy(wl->fw, fw->data, wl->fw_len);
-
-        ret = 0;
-
-out:
-        release_firmware(fw);
-
-        return ret;
-}
-
-static int wl1271_fetch_nvs(struct wl1271 *wl)
-{
-        const struct firmware *fw;
-        int ret;
-
-        ret = request_firmware(&fw, WL12XX_NVS_NAME, wl1271_wl_to_dev(wl));
-
-        if (ret < 0) {
-                wl1271_error("could not get nvs file: %d", ret);
-                return ret;
-        }
-
-        wl->nvs = kmemdup(fw->data, fw->size, GFP_KERNEL);
-
-        if (!wl->nvs) {
-                wl1271_error("could not allocate memory for the nvs file");
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        wl->nvs_len = fw->size;
-
-out:
-        release_firmware(fw);
-
-        return ret;
-}
-
-static int wl1271_chip_wakeup(struct wl1271 *wl)
-{
-        struct wl1271_partition_set partition;
-        int ret;
-
-        msleep(WL1271_PRE_POWER_ON_SLEEP);
-        ret = wl1271_power_on(wl);
-        if (ret)
-                return ret;
-
-        msleep(WL1271_POWER_ON_SLEEP);
-
-        /* We don't need a real memory partition here, because we only want
-         * to use the registers at this point. */
-        memset(&partition, 0, sizeof(partition));
-        partition.reg.start = REGISTERS_BASE;
-        partition.reg.size = REGISTERS_DOWN_SIZE;
-        wl1271_set_partition(wl, &partition);
-
-        /* ELP module wake up */
-        wl1271_fw_wakeup(wl);
-
-        /* whal_FwCtrl_BootSm() */
-
-        /* 0. read chip id from CHIP_ID */
-        wl->chip.id = wl1271_read32(wl, CHIP_ID_B);
-
-        /* 1. check if chip id is valid */
-
-        switch (wl->chip.id) {
-        case CHIP_ID_1271_PG10:
-                wl1271_warning("chip id 0x%x (1271 PG10) support is obsolete",
-                                wl->chip.id);
-                break;
-        case CHIP_ID_1271_PG20:
-                wl1271_notice("chip id 0x%x (1271 PG20)",
-                                wl->chip.id);
-                break;
-        case CHIP_ID_1283_PG20:
-                wl1271_notice("chip id 0x%x (1283 PG20)",
-                                wl->chip.id);
-                break;
-        case CHIP_ID_1283_PG10:
-        default:
-                wl1271_warning("unsupported chip id: 0x%x", wl->chip.id);
-                return -ENODEV;
-        }
-
-        return ret;
-}
-
-static struct wl1271_partition_set part_down = {
-        .mem = {
-                .start = 0x00000000,
-                .size  = 0x000177c0
-        },
-        .reg = {
-                .start = REGISTERS_BASE,
-                .size  = 0x00008800
-        },
-        .mem2 = {
-                .start = 0x00000000,
-                .size  = 0x00000000
-        },
-        .mem3 = {
-                .start = 0x00000000,
-                .size  = 0x00000000
-        },
-};
-
-static int tester(void *data)
-{
-        struct wl1271 *wl = data;
-        struct sdio_func *func = wl_to_func(wl);
-        struct device *pdev = &func->dev;
-        int ret = 0;
-        bool rx_started = 0;
-        bool tx_started = 0;
-        uint8_t *tx_buf, *rx_buf;
-        int test_size = PAGE_SIZE;
-        u32 addr = 0;
-        struct wl1271_partition_set partition;
-
-        /* We assume chip is powered up and firmware fetched */
-
-        memcpy(&partition, &part_down, sizeof(partition));
-        partition.mem.start = addr;
-        wl1271_set_partition(wl, &partition);
-
-        tx_buf = kmalloc(test_size, GFP_KERNEL);
-        rx_buf = kmalloc(test_size, GFP_KERNEL);
-        if (!tx_buf || !rx_buf) {
-                dev_err(pdev,
-                        "Could not allocate memory. Test will not run.\n");
-                ret = -ENOMEM;
-                goto free;
-        }
-
-        memset(tx_buf, 0x5a, test_size);
-
-        /* write something in data area so we can read it back */
-        wl1271_write(wl, addr, tx_buf, test_size, false);
-
-        while (!kthread_should_stop()) {
-                if (rx && !rx_started) {
-                        dev_info(pdev, "starting rx test\n");
-                        rx_started = 1;
-                } else if (!rx && rx_started) {
-                        dev_info(pdev, "stopping rx test\n");
-                        rx_started = 0;
-                }
-
-                if (tx && !tx_started) {
-                        dev_info(pdev, "starting tx test\n");
-                        tx_started = 1;
-                } else if (!tx && tx_started) {
-                        dev_info(pdev, "stopping tx test\n");
-                        tx_started = 0;
-                }
-
-                if (rx_started)
-                        wl1271_read(wl, addr, rx_buf, test_size, false);
-
-                if (tx_started)
-                        wl1271_write(wl, addr, tx_buf, test_size, false);
-
-                if (!rx_started && !tx_started)
-                        msleep(100);
-        }
-
-free:
-        kfree(tx_buf);
-        kfree(rx_buf);
-        return ret;
-}
-
-static int __devinit wl1271_probe(struct sdio_func *func,
-                const struct sdio_device_id *id)
-{
-        const struct wl12xx_platform_data *wlan_data;
-        struct wl1271 *wl;
-        struct wl1271_test *wl_test;
-        int ret = 0;
-
-        /* wl1271 has 2 sdio functions we handle just the wlan part */
-        if (func->num != 0x02)
-                return -ENODEV;
-
-        wl_test = kzalloc(sizeof(struct wl1271_test), GFP_KERNEL);
-        if (!wl_test) {
-                dev_err(&func->dev, "Could not allocate memory\n");
-                return -ENOMEM;
-        }
-
-        wl = &wl_test->wl;
-
-        wl->if_priv = func;
-        wl->if_ops = &sdio_ops;
-
-        /* Grab access to FN0 for ELP reg. */
-        func->card->quirks |= MMC_QUIRK_LENIENT_FN0;
-
-        /* Use block mode for transferring over one block size of data */
-        func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE;
-
-        wlan_data = wl12xx_get_platform_data();
-        if (IS_ERR(wlan_data)) {
-                ret = PTR_ERR(wlan_data);
-                dev_err(&func->dev, "missing wlan platform data: %d\n", ret);
-                goto out_free;
-        }
-
-        wl->irq = wlan_data->irq;
-        wl->ref_clock = wlan_data->board_ref_clock;
-        wl->tcxo_clock = wlan_data->board_tcxo_clock;
-
-        sdio_set_drvdata(func, wl_test);
-
-        /* power up the device */
-        ret = wl1271_chip_wakeup(wl);
-        if (ret) {
-                dev_err(&func->dev, "could not wake up chip\n");
-                goto out_free;
-        }
-
-        if (wl->fw == NULL) {
-                ret = wl1271_fetch_firmware(wl);
-                if (ret < 0) {
-                        dev_err(&func->dev, "firmware fetch error\n");
-                        goto out_off;
-                }
-        }
-
-        /* fetch NVS */
-        if (wl->nvs == NULL) {
-                ret = wl1271_fetch_nvs(wl);
-                if (ret < 0) {
-                        dev_err(&func->dev, "NVS fetch error\n");
-                        goto out_off;
-                }
-        }
-
-        ret = wl1271_load_firmware(wl);
-        if (ret < 0) {
-                dev_err(&func->dev, "firmware load error: %d\n", ret);
-                goto out_free;
-        }
-
-        dev_info(&func->dev, "initialized\n");
-
-        /* I/O testing will be done in the tester thread */
-
-        wl_test->test_task = kthread_run(tester, wl, "sdio_tester");
-        if (IS_ERR(wl_test->test_task)) {
-                dev_err(&func->dev, "unable to create kernel thread\n");
-                ret = PTR_ERR(wl_test->test_task);
-                goto out_free;
-        }
-
-        return 0;
-
-out_off:
-        /* power off the chip */
-        wl1271_power_off(wl);
-
-out_free:
-        kfree(wl_test);
-        return ret;
-}
-
-static void __devexit wl1271_remove(struct sdio_func *func)
-{
-        struct wl1271_test *wl_test = sdio_get_drvdata(func);
-
-        /* stop the I/O test thread */
-        kthread_stop(wl_test->test_task);
-
-        /* power off the chip */
-        wl1271_power_off(&wl_test->wl);
-
-        vfree(wl_test->wl.fw);
-        wl_test->wl.fw = NULL;
-        kfree(wl_test->wl.nvs);
-        wl_test->wl.nvs = NULL;
-
-        kfree(wl_test);
-}
-
-static struct sdio_driver wl1271_sdio_driver = {
-        .name           = "wl12xx_sdio_test",
-        .id_table       = wl1271_devices,
-        .probe          = wl1271_probe,
-        .remove         = __devexit_p(wl1271_remove),
-};
-
-static int __init wl1271_init(void)
-{
-        int ret;
-
-        ret = sdio_register_driver(&wl1271_sdio_driver);
-        if (ret < 0)
-                pr_err("failed to register sdio driver: %d\n", ret);
-
-        return ret;
-}
-module_init(wl1271_init);
-
-static void __exit wl1271_exit(void)
-{
-        sdio_unregister_driver(&wl1271_sdio_driver);
-}
-module_exit(wl1271_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Roger Quadros <roger.quadros@nokia.com>");
-
diff --git a/drivers/net/wireless/wl12xx/spi.c b/drivers/net/wireless/wl12xx/spi.c
index 0f9718677860..92caa7ce6053 100644
--- a/drivers/net/wireless/wl12xx/spi.c
+++ b/drivers/net/wireless/wl12xx/spi.c
@@ -27,6 +27,7 @@
 #include <linux/crc7.h>
 #include <linux/spi/spi.h>
 #include <linux/wl12xx.h>
+#include <linux/platform_device.h>
 #include <linux/slab.h>
 
 #include "wl12xx.h"
@@ -69,35 +70,22 @@
 
 #define WSPI_MAX_NUM_OF_CHUNKS (WL1271_AGGR_BUFFER_SIZE / WSPI_MAX_CHUNK_SIZE)
 
-static inline struct spi_device *wl_to_spi(struct wl1271 *wl)
-{
-        return wl->if_priv;
-}
-
-static struct device *wl1271_spi_wl_to_dev(struct wl1271 *wl)
-{
-        return &(wl_to_spi(wl)->dev);
-}
-
-static void wl1271_spi_disable_interrupts(struct wl1271 *wl)
-{
-        disable_irq(wl->irq);
-}
-
-static void wl1271_spi_enable_interrupts(struct wl1271 *wl)
-{
-        enable_irq(wl->irq);
-}
+struct wl12xx_spi_glue {
+        struct device *dev;
+        struct platform_device *core;
+};
 
-static void wl1271_spi_reset(struct wl1271 *wl)
+static void wl12xx_spi_reset(struct device *child)
 {
+        struct wl12xx_spi_glue *glue = dev_get_drvdata(child->parent);
         u8 *cmd;
         struct spi_transfer t;
         struct spi_message m;
 
         cmd = kzalloc(WSPI_INIT_CMD_LEN, GFP_KERNEL);
         if (!cmd) {
-                wl1271_error("could not allocate cmd for spi reset");
+                dev_err(child->parent,
+                        "could not allocate cmd for spi reset\n");
                 return;
         }
 
@@ -110,21 +98,22 @@ static void wl1271_spi_reset(struct wl1271 *wl)
         t.len = WSPI_INIT_CMD_LEN;
         spi_message_add_tail(&t, &m);
 
-        spi_sync(wl_to_spi(wl), &m);
+        spi_sync(to_spi_device(glue->dev), &m);
 
-        wl1271_dump(DEBUG_SPI, "spi reset -> ", cmd, WSPI_INIT_CMD_LEN);
         kfree(cmd);
 }
 
-static void wl1271_spi_init(struct wl1271 *wl)
+static void wl12xx_spi_init(struct device *child)
 {
+        struct wl12xx_spi_glue *glue = dev_get_drvdata(child->parent);
         u8 crc[WSPI_INIT_CMD_CRC_LEN], *cmd;
         struct spi_transfer t;
         struct spi_message m;
 
         cmd = kzalloc(WSPI_INIT_CMD_LEN, GFP_KERNEL);
         if (!cmd) {
-                wl1271_error("could not allocate cmd for spi init");
+                dev_err(child->parent,
+                        "could not allocate cmd for spi init\n");
                 return;
         }
 
@@ -165,15 +154,16 @@ static void wl1271_spi_init(struct wl1271 *wl)
         t.len = WSPI_INIT_CMD_LEN;
         spi_message_add_tail(&t, &m);
 
-        spi_sync(wl_to_spi(wl), &m);
-        wl1271_dump(DEBUG_SPI, "spi init -> ", cmd, WSPI_INIT_CMD_LEN);
+        spi_sync(to_spi_device(glue->dev), &m);
         kfree(cmd);
 }
 
 #define WL1271_BUSY_WORD_TIMEOUT 1000
 
-static int wl1271_spi_read_busy(struct wl1271 *wl)
+static int wl12xx_spi_read_busy(struct device *child)
 {
+        struct wl12xx_spi_glue *glue = dev_get_drvdata(child->parent);
+        struct wl1271 *wl = dev_get_drvdata(child);
         struct spi_transfer t[1];
         struct spi_message m;
         u32 *busy_buf;
@@ -194,20 +184,22 @@ static int wl1271_spi_read_busy(struct wl1271 *wl)
                 t[0].len = sizeof(u32);
                 t[0].cs_change = true;
                 spi_message_add_tail(&t[0], &m);
-                spi_sync(wl_to_spi(wl), &m);
+                spi_sync(to_spi_device(glue->dev), &m);
 
                 if (*busy_buf & 0x1)
                         return 0;
         }
 
         /* The SPI bus is unresponsive, the read failed. */
-        wl1271_error("SPI read busy-word timeout!\n");
+        dev_err(child->parent, "SPI read busy-word timeout!\n");
         return -ETIMEDOUT;
 }
 
-static void wl1271_spi_raw_read(struct wl1271 *wl, int addr, void *buf,
+static void wl12xx_spi_raw_read(struct device *child, int addr, void *buf,
                                 size_t len, bool fixed)
 {
+        struct wl12xx_spi_glue *glue = dev_get_drvdata(child->parent);
+        struct wl1271 *wl = dev_get_drvdata(child);
         struct spi_transfer t[2];
         struct spi_message m;
         u32 *busy_buf;
@@ -243,10 +235,10 @@ static void wl1271_spi_raw_read(struct wl1271 *wl, int addr, void *buf,
                 t[1].cs_change = true;
                 spi_message_add_tail(&t[1], &m);
 
-                spi_sync(wl_to_spi(wl), &m);
+                spi_sync(to_spi_device(glue->dev), &m);
 
                 if (!(busy_buf[WL1271_BUSY_WORD_CNT - 1] & 0x1) &&
-                    wl1271_spi_read_busy(wl)) {
+                    wl12xx_spi_read_busy(child)) {
                         memset(buf, 0, chunk_len);
                         return;
                 }
@@ -259,10 +251,7 @@ static void wl1271_spi_raw_read(struct wl1271 *wl, int addr, void *buf,
                 t[0].cs_change = true;
                 spi_message_add_tail(&t[0], &m);
 
-                spi_sync(wl_to_spi(wl), &m);
-
-                wl1271_dump(DEBUG_SPI, "spi_read cmd -> ", cmd, sizeof(*cmd));
-                wl1271_dump(DEBUG_SPI, "spi_read buf <- ", buf, chunk_len);
+                spi_sync(to_spi_device(glue->dev), &m);
 
                 if (!fixed)
                         addr += chunk_len;
@@ -271,9 +260,10 @@ static void wl1271_spi_raw_read(struct wl1271 *wl, int addr, void *buf,
         }
 }
 
-static void wl1271_spi_raw_write(struct wl1271 *wl, int addr, void *buf,
-                          size_t len, bool fixed)
+static void wl12xx_spi_raw_write(struct device *child, int addr, void *buf,
+                                 size_t len, bool fixed)
 {
+        struct wl12xx_spi_glue *glue = dev_get_drvdata(child->parent);
         struct spi_transfer t[2 * WSPI_MAX_NUM_OF_CHUNKS];
         struct spi_message m;
         u32 commands[WSPI_MAX_NUM_OF_CHUNKS];
@@ -308,9 +298,6 @@ static void wl1271_spi_raw_write(struct wl1271 *wl, int addr, void *buf,
                 t[i].len = chunk_len;
                 spi_message_add_tail(&t[i++], &m);
 
-                wl1271_dump(DEBUG_SPI, "spi_write cmd -> ", cmd, sizeof(*cmd));
-                wl1271_dump(DEBUG_SPI, "spi_write buf -> ", buf, chunk_len);
-
                 if (!fixed)
                         addr += chunk_len;
                 buf += chunk_len;
@@ -318,72 +305,41 @@ static void wl1271_spi_raw_write(struct wl1271 *wl, int addr, void *buf,
                 cmd++;
         }
 
-        spi_sync(wl_to_spi(wl), &m);
-}
-
-static irqreturn_t wl1271_hardirq(int irq, void *cookie)
-{
-        struct wl1271 *wl = cookie;
-        unsigned long flags;
-
-        wl1271_debug(DEBUG_IRQ, "IRQ");
-
-        /* complete the ELP completion */
-        spin_lock_irqsave(&wl->wl_lock, flags);
-        set_bit(WL1271_FLAG_IRQ_RUNNING, &wl->flags);
-        if (wl->elp_compl) {
-                complete(wl->elp_compl);
-                wl->elp_compl = NULL;
-        }
-        spin_unlock_irqrestore(&wl->wl_lock, flags);
-
-        return IRQ_WAKE_THREAD;
-}
-
-static int wl1271_spi_set_power(struct wl1271 *wl, bool enable)
-{
-        if (wl->set_power)
-                wl->set_power(enable);
-
-        return 0;
+        spi_sync(to_spi_device(glue->dev), &m);
 }
 
 static struct wl1271_if_operations spi_ops = {
-        .read           = wl1271_spi_raw_read,
-        .write          = wl1271_spi_raw_write,
-        .reset          = wl1271_spi_reset,
-        .init           = wl1271_spi_init,
-        .power          = wl1271_spi_set_power,
-        .dev            = wl1271_spi_wl_to_dev,
-        .enable_irq     = wl1271_spi_enable_interrupts,
-        .disable_irq    = wl1271_spi_disable_interrupts,
+        .read           = wl12xx_spi_raw_read,
+        .write          = wl12xx_spi_raw_write,
+        .reset          = wl12xx_spi_reset,
+        .init           = wl12xx_spi_init,
         .set_block_size = NULL,
 };
 
 static int __devinit wl1271_probe(struct spi_device *spi)
 {
+        struct wl12xx_spi_glue *glue;
         struct wl12xx_platform_data *pdata;
-        struct ieee80211_hw *hw;
-        struct wl1271 *wl;
-        unsigned long irqflags;
-        int ret;
+        struct resource res[1];
+        int ret = -ENOMEM;
 
         pdata = spi->dev.platform_data;
         if (!pdata) {
-                wl1271_error("no platform data");
+                dev_err(&spi->dev, "no platform data\n");
                 return -ENODEV;
         }
 
-        hw = wl1271_alloc_hw();
-        if (IS_ERR(hw))
-                return PTR_ERR(hw);
+        pdata->ops = &spi_ops;
 
-        wl = hw->priv;
+        glue = kzalloc(sizeof(*glue), GFP_KERNEL);
+        if (!glue) {
+                dev_err(&spi->dev, "can't allocate glue\n");
+                goto out;
+        }
 
-        dev_set_drvdata(&spi->dev, wl);
-        wl->if_priv = spi;
+        glue->dev = &spi->dev;
 
-        wl->if_ops = &spi_ops;
+        spi_set_drvdata(spi, glue);
 
         /* This is the only SPI value that we need to set here, the rest
          * comes from the board-peripherals file */
@@ -391,69 +347,61 @@ static int __devinit wl1271_probe(struct spi_device *spi)
 
         ret = spi_setup(spi);
         if (ret < 0) {
-                wl1271_error("spi_setup failed");
-                goto out_free;
+                dev_err(glue->dev, "spi_setup failed\n");
+                goto out_free_glue;
         }
 
-        wl->set_power = pdata->set_power;
-        if (!wl->set_power) {
-                wl1271_error("set power function missing in platform data");
-                ret = -ENODEV;
-                goto out_free;
+        glue->core = platform_device_alloc("wl12xx", -1);
+        if (!glue->core) {
+                dev_err(glue->dev, "can't allocate platform_device\n");
+                ret = -ENOMEM;
+                goto out_free_glue;
         }
 
-        wl->ref_clock = pdata->board_ref_clock;
-        wl->tcxo_clock = pdata->board_tcxo_clock;
-        wl->platform_quirks = pdata->platform_quirks;
+        glue->core->dev.parent = &spi->dev;
 
-        if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ)
-                irqflags = IRQF_TRIGGER_RISING;
-        else
-                irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;
+        memset(res, 0x00, sizeof(res));
 
-        wl->irq = spi->irq;
-        if (wl->irq < 0) {
-                wl1271_error("irq missing in platform data");
-                ret = -ENODEV;
-                goto out_free;
-        }
+        res[0].start = spi->irq;
+        res[0].flags = IORESOURCE_IRQ;
+        res[0].name = "irq";
 
-        ret = request_threaded_irq(wl->irq, wl1271_hardirq, wl1271_irq,
-                                   irqflags,
-                                   DRIVER_NAME, wl);
-        if (ret < 0) {
-                wl1271_error("request_irq() failed: %d", ret);
-                goto out_free;
+        ret = platform_device_add_resources(glue->core, res, ARRAY_SIZE(res));
+        if (ret) {
+                dev_err(glue->dev, "can't add resources\n");
+                goto out_dev_put;
         }
 
-        disable_irq(wl->irq);
-
-        ret = wl1271_init_ieee80211(wl);
-        if (ret)
-                goto out_irq;
+        ret = platform_device_add_data(glue->core, pdata, sizeof(*pdata));
+        if (ret) {
+                dev_err(glue->dev, "can't add platform data\n");
+                goto out_dev_put;
+        }
 
-        ret = wl1271_register_hw(wl);
-        if (ret)
-                goto out_irq;
+        ret = platform_device_add(glue->core);
+        if (ret) {
+                dev_err(glue->dev, "can't register platform device\n");
+                goto out_dev_put;
+        }
 
         return 0;
 
- out_irq:
-        free_irq(wl->irq, wl);
-
- out_free:
-        wl1271_free_hw(wl);
+out_dev_put:
+        platform_device_put(glue->core);
 
+out_free_glue:
+        kfree(glue);
+out:
         return ret;
 }
 
 static int __devexit wl1271_remove(struct spi_device *spi)
 {
-        struct wl1271 *wl = dev_get_drvdata(&spi->dev);
+        struct wl12xx_spi_glue *glue = spi_get_drvdata(spi);
 
-        wl1271_unregister_hw(wl);
-        free_irq(wl->irq, wl);
-        wl1271_free_hw(wl);
+        platform_device_del(glue->core);
+        platform_device_put(glue->core);
+        kfree(glue);
 
         return 0;
 }
@@ -462,7 +410,6 @@ static int __devexit wl1271_remove(struct spi_device *spi)
 static struct spi_driver wl1271_spi_driver = {
         .driver = {
                 .name           = "wl1271_spi",
-                .bus            = &spi_bus_type,
                 .owner          = THIS_MODULE,
         },
 
diff --git a/drivers/net/wireless/wl12xx/testmode.c b/drivers/net/wireless/wl12xx/testmode.c
index 4ae8effaee22..25093c0cb0ed 100644
--- a/drivers/net/wireless/wl12xx/testmode.c
+++ b/drivers/net/wireless/wl12xx/testmode.c
@@ -26,8 +26,10 @@
 #include <net/genetlink.h>
 
 #include "wl12xx.h"
+#include "debug.h"
 #include "acx.h"
 #include "reg.h"
+#include "ps.h"
 
 #define WL1271_TM_MAX_DATA_LENGTH 1024
 
@@ -36,6 +38,7 @@ enum wl1271_tm_commands {
         WL1271_TM_CMD_TEST,
         WL1271_TM_CMD_INTERROGATE,
         WL1271_TM_CMD_CONFIGURE,
+        WL1271_TM_CMD_NVS_PUSH,         /* Not in use. Keep to not break ABI */
         WL1271_TM_CMD_SET_PLT_MODE,
         WL1271_TM_CMD_RECOVER,
 
@@ -87,31 +90,47 @@ static int wl1271_tm_cmd_test(struct wl1271 *wl, struct nlattr *tb[])
                 return -EMSGSIZE;
 
         mutex_lock(&wl->mutex);
-        ret = wl1271_cmd_test(wl, buf, buf_len, answer);
-        mutex_unlock(&wl->mutex);
 
+        if (wl->state == WL1271_STATE_OFF) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        ret = wl1271_ps_elp_wakeup(wl);
+        if (ret < 0)
+                goto out;
+
+        ret = wl1271_cmd_test(wl, buf, buf_len, answer);
         if (ret < 0) {
                 wl1271_warning("testmode cmd test failed: %d", ret);
-                return ret;
+                goto out_sleep;
         }
 
         if (answer) {
                 len = nla_total_size(buf_len);
                 skb = cfg80211_testmode_alloc_reply_skb(wl->hw->wiphy, len);
-                if (!skb)
-                        return -ENOMEM;
+                if (!skb) {
+                        ret = -ENOMEM;
+                        goto out_sleep;
+                }
 
                 NLA_PUT(skb, WL1271_TM_ATTR_DATA, buf_len, buf);
                 ret = cfg80211_testmode_reply(skb);
                 if (ret < 0)
-                        return ret;
+                        goto out_sleep;
         }
 
-        return 0;
+out_sleep:
+        wl1271_ps_elp_sleep(wl);
+out:
+        mutex_unlock(&wl->mutex);
+
+        return ret;
 
 nla_put_failure:
         kfree_skb(skb);
-        return -EMSGSIZE;
+        ret = -EMSGSIZE;
+        goto out_sleep;
 }
 
 static int wl1271_tm_cmd_interrogate(struct wl1271 *wl, struct nlattr *tb[])
@@ -128,33 +147,53 @@ static int wl1271_tm_cmd_interrogate(struct wl1271 *wl, struct nlattr *tb[])
 
         ie_id = nla_get_u8(tb[WL1271_TM_ATTR_IE_ID]);
 
+        mutex_lock(&wl->mutex);
+
+        if (wl->state == WL1271_STATE_OFF) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        ret = wl1271_ps_elp_wakeup(wl);
+        if (ret < 0)
+                goto out;
+
         cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
-        if (!cmd)
-                return -ENOMEM;
+        if (!cmd) {
+                ret = -ENOMEM;
+                goto out_sleep;
+        }
 
-        mutex_lock(&wl->mutex);
         ret = wl1271_cmd_interrogate(wl, ie_id, cmd, sizeof(*cmd));
-        mutex_unlock(&wl->mutex);
-
         if (ret < 0) {
                 wl1271_warning("testmode cmd interrogate failed: %d", ret);
-                kfree(cmd);
-                return ret;
+                goto out_free;
         }
 
         skb = cfg80211_testmode_alloc_reply_skb(wl->hw->wiphy, sizeof(*cmd));
         if (!skb) {
-                kfree(cmd);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out_free;
         }
 
         NLA_PUT(skb, WL1271_TM_ATTR_DATA, sizeof(*cmd), cmd);
+        ret = cfg80211_testmode_reply(skb);
+        if (ret < 0)
+                goto out_free;
+
+out_free:
+        kfree(cmd);
+out_sleep:
+        wl1271_ps_elp_sleep(wl);
+out:
+        mutex_unlock(&wl->mutex);
 
-        return 0;
+        return ret;
 
 nla_put_failure:
         kfree_skb(skb);
-        return -EMSGSIZE;
+        ret = -EMSGSIZE;
+        goto out_free;
 }
 
 static int wl1271_tm_cmd_configure(struct wl1271 *wl, struct nlattr *tb[])
diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index bad9e29d49b0..4508ccd78328 100644
--- a/drivers/net/wireless/wl12xx/tx.c
+++ b/drivers/net/wireless/wl12xx/tx.c
@@ -26,22 +26,24 @@
 #include <linux/etherdevice.h>
 
 #include "wl12xx.h"
+#include "debug.h"
 #include "io.h"
 #include "reg.h"
 #include "ps.h"
 #include "tx.h"
 #include "event.h"
 
-static int wl1271_set_default_wep_key(struct wl1271 *wl, u8 id)
+static int wl1271_set_default_wep_key(struct wl1271 *wl,
+                                      struct wl12xx_vif *wlvif, u8 id)
 {
         int ret;
-        bool is_ap = (wl->bss_type == BSS_TYPE_AP_BSS);
+        bool is_ap = (wlvif->bss_type == BSS_TYPE_AP_BSS);
 
         if (is_ap)
                 ret = wl12xx_cmd_set_default_wep_key(wl, id,
-                                                     wl->ap_bcast_hlid);
+                                                     wlvif->ap.bcast_hlid);
         else
-                ret = wl12xx_cmd_set_default_wep_key(wl, id, wl->sta_hlid);
+                ret = wl12xx_cmd_set_default_wep_key(wl, id, wlvif->sta.hlid);
 
         if (ret < 0)
                 return ret;
@@ -76,7 +78,8 @@ static void wl1271_free_tx_id(struct wl1271 *wl, int id)
 }
 
 static int wl1271_tx_update_filters(struct wl1271 *wl,
-                                                 struct sk_buff *skb)
+                                    struct wl12xx_vif *wlvif,
+                                    struct sk_buff *skb)
 {
         struct ieee80211_hdr *hdr;
         int ret;
@@ -92,15 +95,11 @@ static int wl1271_tx_update_filters(struct wl1271 *wl,
         if (!ieee80211_is_auth(hdr->frame_control))
                 return 0;
 
-        if (wl->dev_hlid != WL12XX_INVALID_LINK_ID)
+        if (wlvif->dev_hlid != WL12XX_INVALID_LINK_ID)
                 goto out;
 
         wl1271_debug(DEBUG_CMD, "starting device role for roaming");
-        ret = wl12xx_cmd_role_start_dev(wl);
-        if (ret < 0)
-                goto out;
-
-        ret = wl12xx_roc(wl, wl->dev_role_id);
+        ret = wl12xx_start_dev(wl, wlvif);
         if (ret < 0)
                 goto out;
 out:
@@ -123,18 +122,16 @@ static void wl1271_tx_ap_update_inconnection_sta(struct wl1271 *wl,
                 wl1271_acx_set_inconnection_sta(wl, hdr->addr1);
 }
 
-static void wl1271_tx_regulate_link(struct wl1271 *wl, u8 hlid)
+static void wl1271_tx_regulate_link(struct wl1271 *wl,
+                                    struct wl12xx_vif *wlvif,
+                                    u8 hlid)
 {
         bool fw_ps, single_sta;
         u8 tx_pkts;
 
-        /* only regulate station links */
-        if (hlid < WL1271_AP_STA_HLID_START)
+        if (WARN_ON(!test_bit(hlid, wlvif->links_map)))
                 return;
 
-        if (WARN_ON(!wl1271_is_active_sta(wl, hlid)))
-            return;
-
         fw_ps = test_bit(hlid, (unsigned long *)&wl->ap_fw_ps_map);
         tx_pkts = wl->links[hlid].allocated_pkts;
         single_sta = (wl->active_sta_count == 1);
@@ -146,7 +143,7 @@ static void wl1271_tx_regulate_link(struct wl1271 *wl, u8 hlid)
          * case FW-memory congestion is not a problem.
          */
         if (!single_sta && fw_ps && tx_pkts >= WL1271_PS_STA_MAX_PACKETS)
-                wl1271_ps_link_start(wl, hlid, true);
+                wl12xx_ps_link_start(wl, wlvif, hlid, true);
 }
 
 bool wl12xx_is_dummy_packet(struct wl1271 *wl, struct sk_buff *skb)
@@ -154,7 +151,8 @@ bool wl12xx_is_dummy_packet(struct wl1271 *wl, struct sk_buff *skb)
         return wl->dummy_packet == skb;
 }
 
-u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct sk_buff *skb)
+u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                         struct sk_buff *skb)
 {
         struct ieee80211_tx_info *control = IEEE80211_SKB_CB(skb);
 
@@ -167,49 +165,51 @@ u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct sk_buff *skb)
         } else {
                 struct ieee80211_hdr *hdr;
 
-                if (!test_bit(WL1271_FLAG_AP_STARTED, &wl->flags))
+                if (!test_bit(WLVIF_FLAG_AP_STARTED, &wlvif->flags))
                         return wl->system_hlid;
 
                 hdr = (struct ieee80211_hdr *)skb->data;
                 if (ieee80211_is_mgmt(hdr->frame_control))
-                        return wl->ap_global_hlid;
+                        return wlvif->ap.global_hlid;
                 else
-                        return wl->ap_bcast_hlid;
+                        return wlvif->ap.bcast_hlid;
         }
 }
 
-static u8 wl1271_tx_get_hlid(struct wl1271 *wl, struct sk_buff *skb)
+u8 wl12xx_tx_get_hlid(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                      struct sk_buff *skb)
 {
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
 
-        if (wl12xx_is_dummy_packet(wl, skb))
+        if (!wlvif || wl12xx_is_dummy_packet(wl, skb))
                 return wl->system_hlid;
 
-        if (wl->bss_type == BSS_TYPE_AP_BSS)
-                return wl12xx_tx_get_hlid_ap(wl, skb);
+        if (wlvif->bss_type == BSS_TYPE_AP_BSS)
+                return wl12xx_tx_get_hlid_ap(wl, wlvif, skb);
 
-        wl1271_tx_update_filters(wl, skb);
+        wl1271_tx_update_filters(wl, wlvif, skb);
 
-        if ((test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags) ||
-             test_bit(WL1271_FLAG_IBSS_JOINED, &wl->flags)) &&
+        if ((test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags) ||
+             test_bit(WLVIF_FLAG_IBSS_JOINED, &wlvif->flags)) &&
             !ieee80211_is_auth(hdr->frame_control) &&
             !ieee80211_is_assoc_req(hdr->frame_control))
-                return wl->sta_hlid;
+                return wlvif->sta.hlid;
         else
-                return wl->dev_hlid;
+                return wlvif->dev_hlid;
 }
 
 static unsigned int wl12xx_calc_packet_alignment(struct wl1271 *wl,
                                                 unsigned int packet_length)
 {
-        if (wl->quirks & WL12XX_QUIRK_BLOCKSIZE_ALIGNMENT)
-                return ALIGN(packet_length, WL12XX_BUS_BLOCK_SIZE);
-        else
+        if (wl->quirks & WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT)
                 return ALIGN(packet_length, WL1271_TX_ALIGN_TO);
+        else
+                return ALIGN(packet_length, WL12XX_BUS_BLOCK_SIZE);
 }
 
-static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra,
-                                u32 buf_offset, u8 hlid)
+static int wl1271_tx_allocate(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                              struct sk_buff *skb, u32 extra, u32 buf_offset,
+                              u8 hlid)
 {
         struct wl1271_tx_hw_descr *desc;
         u32 total_len = skb->len + sizeof(struct wl1271_tx_hw_descr) + extra;
@@ -217,6 +217,7 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra,
         u32 total_blocks;
         int id, ret = -EBUSY, ac;
         u32 spare_blocks = wl->tx_spare_blocks;
+        bool is_dummy = false;
 
         if (buf_offset + total_len > WL1271_AGGR_BUFFER_SIZE)
                 return -EAGAIN;
@@ -231,8 +232,10 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra,
         len = wl12xx_calc_packet_alignment(wl, total_len);
 
         /* in case of a dummy packet, use default amount of spare mem blocks */
-        if (unlikely(wl12xx_is_dummy_packet(wl, skb)))
+        if (unlikely(wl12xx_is_dummy_packet(wl, skb))) {
+                is_dummy = true;
                 spare_blocks = TX_HW_BLOCK_SPARE_DEFAULT;
+        }
 
         total_blocks = (len + TX_HW_BLOCK_SIZE - 1) / TX_HW_BLOCK_SIZE +
                 spare_blocks;
@@ -257,8 +260,9 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra,
                 ac = wl1271_tx_get_queue(skb_get_queue_mapping(skb));
                 wl->tx_allocated_pkts[ac]++;
 
-                if (wl->bss_type == BSS_TYPE_AP_BSS &&
-                    hlid >= WL1271_AP_STA_HLID_START)
+                if (!is_dummy && wlvif &&
+                    wlvif->bss_type == BSS_TYPE_AP_BSS &&
+                    test_bit(hlid, wlvif->ap.sta_hlid_map))
                         wl->links[hlid].allocated_pkts++;
 
                 ret = 0;
@@ -273,15 +277,16 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct sk_buff *skb, u32 extra,
         return ret;
 }
 
-static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb,
-                              u32 extra, struct ieee80211_tx_info *control,
-                              u8 hlid)
+static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                               struct sk_buff *skb, u32 extra,
+                               struct ieee80211_tx_info *control, u8 hlid)
 {
         struct timespec ts;
         struct wl1271_tx_hw_descr *desc;
         int aligned_len, ac, rate_idx;
         s64 hosttime;
-        u16 tx_attr;
+        u16 tx_attr = 0;
+        bool is_dummy;
 
         desc = (struct wl1271_tx_hw_descr *) skb->data;
 
@@ -298,7 +303,8 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb,
         hosttime = (timespec_to_ns(&ts) >> 10);
         desc->start_time = cpu_to_le32(hosttime - wl->time_offset);
 
-        if (wl->bss_type != BSS_TYPE_AP_BSS)
+        is_dummy = wl12xx_is_dummy_packet(wl, skb);
+        if (is_dummy || !wlvif || wlvif->bss_type != BSS_TYPE_AP_BSS)
                 desc->life_time = cpu_to_le16(TX_HW_MGMT_PKT_LIFETIME_TU);
         else
                 desc->life_time = cpu_to_le16(TX_HW_AP_MODE_PKT_LIFETIME_TU);
@@ -307,39 +313,42 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb,
         ac = wl1271_tx_get_queue(skb_get_queue_mapping(skb));
         desc->tid = skb->priority;
 
-        if (wl12xx_is_dummy_packet(wl, skb)) {
+        if (is_dummy) {
                 /*
                  * FW expects the dummy packet to have an invalid session id -
                  * any session id that is different than the one set in the join
                  */
-                tx_attr = ((~wl->session_counter) <<
+                tx_attr = (SESSION_COUNTER_INVALID <<
                            TX_HW_ATTR_OFST_SESSION_COUNTER) &
                            TX_HW_ATTR_SESSION_COUNTER;
 
                 tx_attr |= TX_HW_ATTR_TX_DUMMY_REQ;
-        } else {
+        } else if (wlvif) {
                 /* configure the tx attributes */
-                tx_attr =
-                        wl->session_counter << TX_HW_ATTR_OFST_SESSION_COUNTER;
+                tx_attr = wlvif->session_counter <<
+                          TX_HW_ATTR_OFST_SESSION_COUNTER;
         }
 
         desc->hlid = hlid;
-
-        if (wl->bss_type != BSS_TYPE_AP_BSS) {
+        if (is_dummy || !wlvif)
+                rate_idx = 0;
+        else if (wlvif->bss_type != BSS_TYPE_AP_BSS) {
                 /* if the packets are destined for AP (have a STA entry)
                    send them with AP rate policies, otherwise use default
                    basic rates */
-                if (control->control.sta)
-                        rate_idx = ACX_TX_AP_FULL_RATE;
+                if (control->flags & IEEE80211_TX_CTL_NO_CCK_RATE)
+                        rate_idx = wlvif->sta.p2p_rate_idx;
+                else if (control->control.sta)
+                        rate_idx = wlvif->sta.ap_rate_idx;
                 else
-                        rate_idx = ACX_TX_BASIC_RATE;
+                        rate_idx = wlvif->sta.basic_rate_idx;
         } else {
-                if (hlid == wl->ap_global_hlid)
-                        rate_idx = ACX_TX_AP_MODE_MGMT_RATE;
-                else if (hlid == wl->ap_bcast_hlid)
-                        rate_idx = ACX_TX_AP_MODE_BCST_RATE;
+                if (hlid == wlvif->ap.global_hlid)
+                        rate_idx = wlvif->ap.mgmt_rate_idx;
+                else if (hlid == wlvif->ap.bcast_hlid)
+                        rate_idx = wlvif->ap.bcast_rate_idx;
                 else
-                        rate_idx = ac;
+                        rate_idx = wlvif->ap.ucast_rate_idx[ac];
         }
 
         tx_attr |= rate_idx << TX_HW_ATTR_OFST_RATE_POLICY;
@@ -379,20 +388,24 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb,
 }
 
 /* caller must hold wl->mutex */
-static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct sk_buff *skb,
-                                                        u32 buf_offset)
+static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                                   struct sk_buff *skb, u32 buf_offset)
 {
         struct ieee80211_tx_info *info;
         u32 extra = 0;
         int ret = 0;
         u32 total_len;
         u8 hlid;
+        bool is_dummy;
 
         if (!skb)
                 return -EINVAL;
 
         info = IEEE80211_SKB_CB(skb);
 
+        /* TODO: handle dummy packets on multi-vifs */
+        is_dummy = wl12xx_is_dummy_packet(wl, skb);
+
         if (info->control.hw_key &&
             info->control.hw_key->cipher == WLAN_CIPHER_SUITE_TKIP)
                 extra = WL1271_TKIP_IV_SPACE;
@@ -405,29 +418,28 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct sk_buff *skb,
                 is_wep = (cipher == WLAN_CIPHER_SUITE_WEP40) ||
                          (cipher == WLAN_CIPHER_SUITE_WEP104);
 
-                if (unlikely(is_wep && wl->default_key != idx)) {
-                        ret = wl1271_set_default_wep_key(wl, idx);
+                if (unlikely(is_wep && wlvif->default_key != idx)) {
+                        ret = wl1271_set_default_wep_key(wl, wlvif, idx);
                         if (ret < 0)
                                 return ret;
-                        wl->default_key = idx;
+                        wlvif->default_key = idx;
                 }
         }
-
-        hlid = wl1271_tx_get_hlid(wl, skb);
+        hlid = wl12xx_tx_get_hlid(wl, wlvif, skb);
         if (hlid == WL12XX_INVALID_LINK_ID) {
                 wl1271_error("invalid hlid. dropping skb 0x%p", skb);
                 return -EINVAL;
         }
 
-        ret = wl1271_tx_allocate(wl, skb, extra, buf_offset, hlid);
+        ret = wl1271_tx_allocate(wl, wlvif, skb, extra, buf_offset, hlid);
         if (ret < 0)
                 return ret;
 
-        wl1271_tx_fill_hdr(wl, skb, extra, info, hlid);
+        wl1271_tx_fill_hdr(wl, wlvif, skb, extra, info, hlid);
 
-        if (wl->bss_type == BSS_TYPE_AP_BSS) {
+        if (!is_dummy && wlvif && wlvif->bss_type == BSS_TYPE_AP_BSS) {
                 wl1271_tx_ap_update_inconnection_sta(wl, skb);
-                wl1271_tx_regulate_link(wl, hlid);
+                wl1271_tx_regulate_link(wl, wlvif, hlid);
         }
 
         /*
@@ -444,7 +456,7 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct sk_buff *skb,
         memset(wl->aggr_buf + buf_offset + skb->len, 0, total_len - skb->len);
 
         /* Revert side effects in the dummy packet skb, so it can be reused */
-        if (wl12xx_is_dummy_packet(wl, skb))
+        if (is_dummy)
                 skb_pull(skb, sizeof(struct wl1271_tx_hw_descr));
 
         return total_len;
@@ -522,19 +534,18 @@ static struct sk_buff_head *wl1271_select_queue(struct wl1271 *wl,
         return &queues[q];
 }
 
-static struct sk_buff *wl1271_sta_skb_dequeue(struct wl1271 *wl)
+static struct sk_buff *wl12xx_lnk_skb_dequeue(struct wl1271 *wl,
+                                              struct wl1271_link *lnk)
 {
-        struct sk_buff *skb = NULL;
+        struct sk_buff *skb;
         unsigned long flags;
         struct sk_buff_head *queue;
 
-        queue = wl1271_select_queue(wl, wl->tx_queue);
+        queue = wl1271_select_queue(wl, lnk->tx_queue);
         if (!queue)
-                goto out;
+                return NULL;
 
         skb = skb_dequeue(queue);
-
-out:
         if (skb) {
                 int q = wl1271_tx_get_queue(skb_get_queue_mapping(skb));
                 spin_lock_irqsave(&wl->wl_lock, flags);
@@ -545,43 +556,33 @@ out:
         return skb;
 }
 
-static struct sk_buff *wl1271_ap_skb_dequeue(struct wl1271 *wl)
+static struct sk_buff *wl12xx_vif_skb_dequeue(struct wl1271 *wl,
+                                              struct wl12xx_vif *wlvif)
 {
         struct sk_buff *skb = NULL;
-        unsigned long flags;
         int i, h, start_hlid;
-        struct sk_buff_head *queue;
 
         /* start from the link after the last one */
-        start_hlid = (wl->last_tx_hlid + 1) % AP_MAX_LINKS;
+        start_hlid = (wlvif->last_tx_hlid + 1) % WL12XX_MAX_LINKS;
 
         /* dequeue according to AC, round robin on each link */
-        for (i = 0; i < AP_MAX_LINKS; i++) {
-                h = (start_hlid + i) % AP_MAX_LINKS;
+        for (i = 0; i < WL12XX_MAX_LINKS; i++) {
+                h = (start_hlid + i) % WL12XX_MAX_LINKS;
 
                 /* only consider connected stations */
-                if (h >= WL1271_AP_STA_HLID_START &&
-                    !test_bit(h - WL1271_AP_STA_HLID_START, wl->ap_hlid_map))
+                if (!test_bit(h, wlvif->links_map))
                         continue;
 
-                queue = wl1271_select_queue(wl, wl->links[h].tx_queue);
-                if (!queue)
+                skb = wl12xx_lnk_skb_dequeue(wl, &wl->links[h]);
+                if (!skb)
                         continue;
 
-                skb = skb_dequeue(queue);
-                if (skb)
-                        break;
+                wlvif->last_tx_hlid = h;
+                break;
         }
 
-        if (skb) {
-                int q = wl1271_tx_get_queue(skb_get_queue_mapping(skb));
-                wl->last_tx_hlid = h;
-                spin_lock_irqsave(&wl->wl_lock, flags);
-                wl->tx_queue_count[q]--;
-                spin_unlock_irqrestore(&wl->wl_lock, flags);
-        } else {
-                wl->last_tx_hlid = 0;
-        }
+        if (!skb)
+                wlvif->last_tx_hlid = 0;
 
         return skb;
 }
@@ -589,12 +590,32 @@ static struct sk_buff *wl1271_ap_skb_dequeue(struct wl1271 *wl)
 static struct sk_buff *wl1271_skb_dequeue(struct wl1271 *wl)
 {
         unsigned long flags;
+        struct wl12xx_vif *wlvif = wl->last_wlvif;
         struct sk_buff *skb = NULL;
 
-        if (wl->bss_type == BSS_TYPE_AP_BSS)
-                skb = wl1271_ap_skb_dequeue(wl);
-        else
-                skb = wl1271_sta_skb_dequeue(wl);
+        if (wlvif) {
+                wl12xx_for_each_wlvif_continue(wl, wlvif) {
+                        skb = wl12xx_vif_skb_dequeue(wl, wlvif);
+                        if (skb) {
+                                wl->last_wlvif = wlvif;
+                                break;
+                        }
+                }
+        }
+
+        /* do another pass */
+        if (!skb) {
+                wl12xx_for_each_wlvif(wl, wlvif) {
+                        skb = wl12xx_vif_skb_dequeue(wl, wlvif);
+                        if (skb) {
+                                wl->last_wlvif = wlvif;
+                                break;
+                        }
+                }
+        }
+
+        if (!skb)
+                skb = wl12xx_lnk_skb_dequeue(wl, &wl->links[wl->system_hlid]);
 
         if (!skb &&
             test_and_clear_bit(WL1271_FLAG_DUMMY_PACKET_PENDING, &wl->flags)) {
@@ -610,21 +631,21 @@ static struct sk_buff *wl1271_skb_dequeue(struct wl1271 *wl)
         return skb;
 }
 
-static void wl1271_skb_queue_head(struct wl1271 *wl, struct sk_buff *skb)
+static void wl1271_skb_queue_head(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                                  struct sk_buff *skb)
 {
         unsigned long flags;
         int q = wl1271_tx_get_queue(skb_get_queue_mapping(skb));
 
         if (wl12xx_is_dummy_packet(wl, skb)) {
                 set_bit(WL1271_FLAG_DUMMY_PACKET_PENDING, &wl->flags);
-        } else if (wl->bss_type == BSS_TYPE_AP_BSS) {
-                u8 hlid = wl1271_tx_get_hlid(wl, skb);
+        } else {
+                u8 hlid = wl12xx_tx_get_hlid(wl, wlvif, skb);
                 skb_queue_head(&wl->links[hlid].tx_queue[q], skb);
 
                 /* make sure we dequeue the same packet next time */
-                wl->last_tx_hlid = (hlid + AP_MAX_LINKS - 1) % AP_MAX_LINKS;
-        } else {
-                skb_queue_head(&wl->tx_queue[q], skb);
+                wlvif->last_tx_hlid = (hlid + WL12XX_MAX_LINKS - 1) %
+                                      WL12XX_MAX_LINKS;
         }
 
         spin_lock_irqsave(&wl->wl_lock, flags);
@@ -639,29 +660,71 @@ static bool wl1271_tx_is_data_present(struct sk_buff *skb)
         return ieee80211_is_data_present(hdr->frame_control);
 }
 
+void wl12xx_rearm_rx_streaming(struct wl1271 *wl, unsigned long *active_hlids)
+{
+        struct wl12xx_vif *wlvif;
+        u32 timeout;
+        u8 hlid;
+
+        if (!wl->conf.rx_streaming.interval)
+                return;
+
+        if (!wl->conf.rx_streaming.always &&
+            !test_bit(WL1271_FLAG_SOFT_GEMINI, &wl->flags))
+                return;
+
+        timeout = wl->conf.rx_streaming.duration;
+        wl12xx_for_each_wlvif_sta(wl, wlvif) {
+                bool found = false;
+                for_each_set_bit(hlid, active_hlids, WL12XX_MAX_LINKS) {
+                        if (test_bit(hlid, wlvif->links_map)) {
+                                found  = true;
+                                break;
+                        }
+                }
+
+                if (!found)
+                        continue;
+
+                /* enable rx streaming */
+                if (!test_bit(WLVIF_FLAG_RX_STREAMING_STARTED, &wlvif->flags))
+                        ieee80211_queue_work(wl->hw,
+                                             &wlvif->rx_streaming_enable_work);
+
+                mod_timer(&wlvif->rx_streaming_timer,
+                          jiffies + msecs_to_jiffies(timeout));
+        }
+}
+
 void wl1271_tx_work_locked(struct wl1271 *wl)
 {
+        struct wl12xx_vif *wlvif;
         struct sk_buff *skb;
+        struct wl1271_tx_hw_descr *desc;
         u32 buf_offset = 0;
         bool sent_packets = false;
-        bool had_data = false;
-        bool is_ap = (wl->bss_type == BSS_TYPE_AP_BSS);
+        unsigned long active_hlids[BITS_TO_LONGS(WL12XX_MAX_LINKS)] = {0};
         int ret;
 
         if (unlikely(wl->state == WL1271_STATE_OFF))
                 return;
 
         while ((skb = wl1271_skb_dequeue(wl))) {
-                if (wl1271_tx_is_data_present(skb))
-                        had_data = true;
+                struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+                bool has_data = false;
 
-                ret = wl1271_prepare_tx_frame(wl, skb, buf_offset);
+                wlvif = NULL;
+                if (!wl12xx_is_dummy_packet(wl, skb) && info->control.vif)
+                        wlvif = wl12xx_vif_to_data(info->control.vif);
+
+                has_data = wlvif && wl1271_tx_is_data_present(skb);
+                ret = wl1271_prepare_tx_frame(wl, wlvif, skb, buf_offset);
                 if (ret == -EAGAIN) {
                         /*
                          * Aggregation buffer is full.
                          * Flush buffer and try again.
                          */
-                        wl1271_skb_queue_head(wl, skb);
+                        wl1271_skb_queue_head(wl, wlvif, skb);
                         wl1271_write(wl, WL1271_SLV_MEM_DATA, wl->aggr_buf,
                                      buf_offset, true);
                         sent_packets = true;
@@ -672,16 +735,27 @@ void wl1271_tx_work_locked(struct wl1271 *wl)
                          * Firmware buffer is full.
                          * Queue back last skb, and stop aggregating.
                          */
-                        wl1271_skb_queue_head(wl, skb);
+                        wl1271_skb_queue_head(wl, wlvif, skb);
                         /* No work left, avoid scheduling redundant tx work */
                         set_bit(WL1271_FLAG_FW_TX_BUSY, &wl->flags);
                         goto out_ack;
                 } else if (ret < 0) {
-                        dev_kfree_skb(skb);
+                        if (wl12xx_is_dummy_packet(wl, skb))
+                                /*
+                                 * fw still expects dummy packet,
+                                 * so re-enqueue it
+                                 */
+                                wl1271_skb_queue_head(wl, wlvif, skb);
+                        else
+                                ieee80211_free_txskb(wl->hw, skb);
                         goto out_ack;
                 }
                 buf_offset += ret;
                 wl->tx_packets_count++;
+                if (has_data) {
+                        desc = (struct wl1271_tx_hw_descr *) skb->data;
+                        __set_bit(desc->hlid, active_hlids);
+                }
         }
 
 out_ack:
@@ -701,19 +775,7 @@ out_ack:
 
                 wl1271_handle_tx_low_watermark(wl);
         }
-        if (!is_ap && wl->conf.rx_streaming.interval && had_data &&
-            (wl->conf.rx_streaming.always ||
-             test_bit(WL1271_FLAG_SOFT_GEMINI, &wl->flags))) {
-                u32 timeout = wl->conf.rx_streaming.duration;
-
-                /* enable rx streaming */
-                if (!test_bit(WL1271_FLAG_RX_STREAMING_STARTED, &wl->flags))
-                        ieee80211_queue_work(wl->hw,
-                                             &wl->rx_streaming_enable_work);
-
-                mod_timer(&wl->rx_streaming_timer,
-                          jiffies + msecs_to_jiffies(timeout));
-        }
+        wl12xx_rearm_rx_streaming(wl, active_hlids);
 }
 
 void wl1271_tx_work(struct work_struct *work)
@@ -737,6 +799,8 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
                                       struct wl1271_tx_hw_res_descr *result)
 {
         struct ieee80211_tx_info *info;
+        struct ieee80211_vif *vif;
+        struct wl12xx_vif *wlvif;
         struct sk_buff *skb;
         int id = result->id;
         int rate = -1;
@@ -756,11 +820,16 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
                 return;
         }
 
+        /* info->control is valid as long as we don't update info->status */
+        vif = info->control.vif;
+        wlvif = wl12xx_vif_to_data(vif);
+
         /* update the TX status info */
         if (result->status == TX_SUCCESS) {
                 if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
                         info->flags |= IEEE80211_TX_STAT_ACK;
-                rate = wl1271_rate_to_idx(result->rate_class_index, wl->band);
+                rate = wl1271_rate_to_idx(result->rate_class_index,
+                                          wlvif->band);
                 retries = result->ack_failures;
         } else if (result->status == TX_RETRY_EXCEEDED) {
                 wl->stats.excessive_retries++;
@@ -783,14 +852,14 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
              info->control.hw_key->cipher == WLAN_CIPHER_SUITE_CCMP ||
              info->control.hw_key->cipher == WL1271_CIPHER_SUITE_GEM)) {
                 u8 fw_lsb = result->tx_security_sequence_number_lsb;
-                u8 cur_lsb = wl->tx_security_last_seq_lsb;
+                u8 cur_lsb = wlvif->tx_security_last_seq_lsb;
 
                 /*
                  * update security sequence number, taking care of potential
                  * wrap-around
                  */
-                wl->tx_security_seq += (fw_lsb - cur_lsb + 256) % 256;
-                wl->tx_security_last_seq_lsb = fw_lsb;
+                wlvif->tx_security_seq += (fw_lsb - cur_lsb) & 0xff;
+                wlvif->tx_security_last_seq_lsb = fw_lsb;
         }
 
         /* remove private header from packet */
@@ -886,39 +955,30 @@ void wl1271_tx_reset_link_queues(struct wl1271 *wl, u8 hlid)
 }
 
 /* caller must hold wl->mutex and TX must be stopped */
-void wl1271_tx_reset(struct wl1271 *wl, bool reset_tx_queues)
+void wl12xx_tx_reset_wlvif(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         int i;
-        struct sk_buff *skb;
-        struct ieee80211_tx_info *info;
 
         /* TX failure */
-        if (wl->bss_type == BSS_TYPE_AP_BSS) {
-                for (i = 0; i < AP_MAX_LINKS; i++) {
-                        wl1271_free_sta(wl, i);
-                        wl1271_tx_reset_link_queues(wl, i);
-                        wl->links[i].allocated_pkts = 0;
-                        wl->links[i].prev_freed_pkts = 0;
-                }
-
-                wl->last_tx_hlid = 0;
-        } else {
-                for (i = 0; i < NUM_TX_QUEUES; i++) {
-                        while ((skb = skb_dequeue(&wl->tx_queue[i]))) {
-                                wl1271_debug(DEBUG_TX, "freeing skb 0x%p",
-                                             skb);
-
-                                if (!wl12xx_is_dummy_packet(wl, skb)) {
-                                        info = IEEE80211_SKB_CB(skb);
-                                        info->status.rates[0].idx = -1;
-                                        info->status.rates[0].count = 0;
-                                        ieee80211_tx_status_ni(wl->hw, skb);
-                                }
-                        }
-                }
+        for_each_set_bit(i, wlvif->links_map, WL12XX_MAX_LINKS) {
+                if (wlvif->bss_type == BSS_TYPE_AP_BSS)
+                        wl1271_free_sta(wl, wlvif, i);
+                else
+                        wlvif->sta.ba_rx_bitmap = 0;
 
-                wl->ba_rx_bitmap = 0;
+                wl1271_tx_reset_link_queues(wl, i);
+                wl->links[i].allocated_pkts = 0;
+                wl->links[i].prev_freed_pkts = 0;
         }
+        wlvif->last_tx_hlid = 0;
+
+}
+/* caller must hold wl->mutex and TX must be stopped */
+void wl12xx_tx_reset(struct wl1271 *wl, bool reset_tx_queues)
+{
+        int i;
+        struct sk_buff *skb;
+        struct ieee80211_tx_info *info;
 
         for (i = 0; i < NUM_TX_QUEUES; i++)
                 wl->tx_queue_count[i] = 0;
diff --git a/drivers/net/wireless/wl12xx/tx.h b/drivers/net/wireless/wl12xx/tx.h
index dc4f09adf088..2dbb24e6d541 100644
--- a/drivers/net/wireless/wl12xx/tx.h
+++ b/drivers/net/wireless/wl12xx/tx.h
@@ -206,18 +206,23 @@ static inline int wl1271_tx_total_queue_count(struct wl1271 *wl)
 void wl1271_tx_work(struct work_struct *work);
 void wl1271_tx_work_locked(struct wl1271 *wl);
 void wl1271_tx_complete(struct wl1271 *wl);
-void wl1271_tx_reset(struct wl1271 *wl, bool reset_tx_queues);
+void wl12xx_tx_reset_wlvif(struct wl1271 *wl, struct wl12xx_vif *wlvif);
+void wl12xx_tx_reset(struct wl1271 *wl, bool reset_tx_queues);
 void wl1271_tx_flush(struct wl1271 *wl);
 u8 wl1271_rate_to_idx(int rate, enum ieee80211_band band);
 u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set,
                                 enum ieee80211_band rate_band);
 u32 wl1271_tx_min_rate_get(struct wl1271 *wl, u32 rate_set);
-u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct sk_buff *skb);
+u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                         struct sk_buff *skb);
+u8 wl12xx_tx_get_hlid(struct wl1271 *wl, struct wl12xx_vif *wlvif,
+                      struct sk_buff *skb);
 void wl1271_tx_reset_link_queues(struct wl1271 *wl, u8 hlid);
 void wl1271_handle_tx_low_watermark(struct wl1271 *wl);
 bool wl12xx_is_dummy_packet(struct wl1271 *wl, struct sk_buff *skb);
+void wl12xx_rearm_rx_streaming(struct wl1271 *wl, unsigned long *active_hlids);
 
 /* from main.c */
-void wl1271_free_sta(struct wl1271 *wl, u8 hlid);
+void wl1271_free_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 hlid);
 
 #endif
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 1ec90fc7505e..d21f71ff6f64 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -35,83 +35,6 @@
 #include "conf.h"
 #include "ini.h"
 
-#define DRIVER_NAME "wl1271"
-#define DRIVER_PREFIX DRIVER_NAME ": "
-
-/*
- * FW versions support BA 11n
- * versions marks x.x.x.50-60.x
- */
-#define WL12XX_BA_SUPPORT_FW_COST_VER2_START    50
-#define WL12XX_BA_SUPPORT_FW_COST_VER2_END      60
-
-enum {
-        DEBUG_NONE      = 0,
-        DEBUG_IRQ       = BIT(0),
-        DEBUG_SPI       = BIT(1),
-        DEBUG_BOOT      = BIT(2),
-        DEBUG_MAILBOX   = BIT(3),
-        DEBUG_TESTMODE  = BIT(4),
-        DEBUG_EVENT     = BIT(5),
-        DEBUG_TX        = BIT(6),
-        DEBUG_RX        = BIT(7),
-        DEBUG_SCAN      = BIT(8),
-        DEBUG_CRYPT     = BIT(9),
-        DEBUG_PSM       = BIT(10),
-        DEBUG_MAC80211  = BIT(11),
-        DEBUG_CMD       = BIT(12),
-        DEBUG_ACX       = BIT(13),
-        DEBUG_SDIO      = BIT(14),
-        DEBUG_FILTERS   = BIT(15),
-        DEBUG_ADHOC     = BIT(16),
-        DEBUG_AP        = BIT(17),
-        DEBUG_MASTER    = (DEBUG_ADHOC | DEBUG_AP),
-        DEBUG_ALL       = ~0,
-};
-
-extern u32 wl12xx_debug_level;
-
-#define DEBUG_DUMP_LIMIT 1024
-
-#define wl1271_error(fmt, arg...) \
-        pr_err(DRIVER_PREFIX "ERROR " fmt "\n", ##arg)
-
-#define wl1271_warning(fmt, arg...) \
-        pr_warning(DRIVER_PREFIX "WARNING " fmt "\n", ##arg)
-
-#define wl1271_notice(fmt, arg...) \
-        pr_info(DRIVER_PREFIX fmt "\n", ##arg)
-
-#define wl1271_info(fmt, arg...) \
-        pr_info(DRIVER_PREFIX fmt "\n", ##arg)
-
-#define wl1271_debug(level, fmt, arg...) \
-        do { \
-                if (level & wl12xx_debug_level) \
-                        pr_debug(DRIVER_PREFIX fmt "\n", ##arg); \
-        } while (0)
-
-/* TODO: use pr_debug_hex_dump when it will be available */
-#define wl1271_dump(level, prefix, buf, len)    \
-        do { \
-                if (level & wl12xx_debug_level) \
-                        print_hex_dump(KERN_DEBUG, DRIVER_PREFIX prefix, \
-                                       DUMP_PREFIX_OFFSET, 16, 1,       \
-                                       buf,                             \
-                                       min_t(size_t, len, DEBUG_DUMP_LIMIT), \
-                                       0);                              \
-        } while (0)
-
-#define wl1271_dump_ascii(level, prefix, buf, len)      \
-        do { \
-                if (level & wl12xx_debug_level) \
-                        print_hex_dump(KERN_DEBUG, DRIVER_PREFIX prefix, \
-                                       DUMP_PREFIX_OFFSET, 16, 1,       \
-                                       buf,                             \
-                                       min_t(size_t, len, DEBUG_DUMP_LIMIT), \
-                                       true);                           \
-        } while (0)
-
 #define WL127X_FW_NAME "ti-connectivity/wl127x-fw-3.bin"
 #define WL128X_FW_NAME "ti-connectivity/wl128x-fw-3.bin"
 
@@ -142,16 +65,12 @@ extern u32 wl12xx_debug_level;
 #define WL12XX_INVALID_ROLE_ID     0xff
 #define WL12XX_INVALID_LINK_ID     0xff
 
+#define WL12XX_MAX_RATE_POLICIES 16
+
 /* Defined by FW as 0. Will not be freed or allocated. */
 #define WL12XX_SYSTEM_HLID         0
 
 /*
- * TODO: we currently don't support multirole. remove
- * this constant from the code when we do.
- */
-#define WL1271_AP_STA_HLID_START   3
-
-/*
  * When in AP-mode, we allow (at least) this number of packets
  * to be transmitted to FW for a STA in PS-mode. Only when packets are
  * present in the FW buffers it will wake the sleeping STA. We want to put
@@ -236,13 +155,6 @@ struct wl1271_stats {
 
 #define AP_MAX_STATIONS            8
 
-/* Broadcast and Global links + system link + links to stations */
-/*
- * TODO: when WL1271_AP_STA_HLID_START is no longer constant, change all
- * the places that use this.
- */
-#define AP_MAX_LINKS               (AP_MAX_STATIONS + WL1271_AP_STA_HLID_START)
-
 /* FW status registers */
 struct wl12xx_fw_status {
         __le32 intr;
@@ -299,17 +211,14 @@ struct wl1271_scan {
 };
 
 struct wl1271_if_operations {
-        void (*read)(struct wl1271 *wl, int addr, void *buf, size_t len,
+        void (*read)(struct device *child, int addr, void *buf, size_t len,
                      bool fixed);
-        void (*write)(struct wl1271 *wl, int addr, void *buf, size_t len,
+        void (*write)(struct device *child, int addr, void *buf, size_t len,
                      bool fixed);
-        void (*reset)(struct wl1271 *wl);
-        void (*init)(struct wl1271 *wl);
-        int (*power)(struct wl1271 *wl, bool enable);
-        struct device* (*dev)(struct wl1271 *wl);
-        void (*enable_irq)(struct wl1271 *wl);
-        void (*disable_irq)(struct wl1271 *wl);
-        void (*set_block_size) (struct wl1271 *wl, unsigned int blksz);
+        void (*reset)(struct device *child);
+        void (*init)(struct device *child);
+        int (*power)(struct device *child, bool enable);
+        void (*set_block_size) (struct device *child, unsigned int blksz);
 };
 
 #define MAX_NUM_KEYS 14
@@ -326,29 +235,33 @@ struct wl1271_ap_key {
 };
 
 enum wl12xx_flags {
-        WL1271_FLAG_STA_ASSOCIATED,
-        WL1271_FLAG_IBSS_JOINED,
         WL1271_FLAG_GPIO_POWER,
         WL1271_FLAG_TX_QUEUE_STOPPED,
         WL1271_FLAG_TX_PENDING,
         WL1271_FLAG_IN_ELP,
         WL1271_FLAG_ELP_REQUESTED,
-        WL1271_FLAG_PSM,
-        WL1271_FLAG_PSM_REQUESTED,
         WL1271_FLAG_IRQ_RUNNING,
         WL1271_FLAG_IDLE,
-        WL1271_FLAG_PSPOLL_FAILURE,
-        WL1271_FLAG_STA_STATE_SENT,
         WL1271_FLAG_FW_TX_BUSY,
-        WL1271_FLAG_AP_STARTED,
-        WL1271_FLAG_IF_INITIALIZED,
         WL1271_FLAG_DUMMY_PACKET_PENDING,
         WL1271_FLAG_SUSPENDED,
         WL1271_FLAG_PENDING_WORK,
         WL1271_FLAG_SOFT_GEMINI,
-        WL1271_FLAG_RX_STREAMING_STARTED,
         WL1271_FLAG_RECOVERY_IN_PROGRESS,
-        WL1271_FLAG_CS_PROGRESS,
+};
+
+enum wl12xx_vif_flags {
+        WLVIF_FLAG_INITIALIZED,
+        WLVIF_FLAG_STA_ASSOCIATED,
+        WLVIF_FLAG_IBSS_JOINED,
+        WLVIF_FLAG_AP_STARTED,
+        WLVIF_FLAG_PSM,
+        WLVIF_FLAG_PSM_REQUESTED,
+        WLVIF_FLAG_STA_STATE_SENT,
+        WLVIF_FLAG_RX_STREAMING_STARTED,
+        WLVIF_FLAG_PSPOLL_FAILURE,
+        WLVIF_FLAG_CS_PROGRESS,
+        WLVIF_FLAG_AP_PROBE_RESP_SET,
 };
 
 struct wl1271_link {
@@ -366,10 +279,11 @@ struct wl1271_link {
 };
 
 struct wl1271 {
-        struct platform_device *plat_dev;
         struct ieee80211_hw *hw;
         bool mac80211_registered;
 
+        struct device *dev;
+
         void *if_priv;
 
         struct wl1271_if_operations *if_ops;
@@ -399,25 +313,20 @@ struct wl1271 {
 
         s8 hw_pg_ver;
 
-        u8 bssid[ETH_ALEN];
         u8 mac_addr[ETH_ALEN];
-        u8 bss_type;
-        u8 set_bss_type;
-        u8 p2p; /* we are using p2p role */
-        u8 ssid[IEEE80211_MAX_SSID_LEN + 1];
-        u8 ssid_len;
         int channel;
-        u8 role_id;
-        u8 dev_role_id;
         u8 system_hlid;
-        u8 sta_hlid;
-        u8 dev_hlid;
-        u8 ap_global_hlid;
-        u8 ap_bcast_hlid;
 
         unsigned long links_map[BITS_TO_LONGS(WL12XX_MAX_LINKS)];
         unsigned long roles_map[BITS_TO_LONGS(WL12XX_MAX_ROLES)];
         unsigned long roc_map[BITS_TO_LONGS(WL12XX_MAX_ROLES)];
+        unsigned long rate_policies_map[
+                        BITS_TO_LONGS(WL12XX_MAX_RATE_POLICIES)];
+
+        struct list_head wlvif_list;
+
+        u8 sta_count;
+        u8 ap_count;
 
         struct wl1271_acx_mem_map *target_mem_map;
 
@@ -440,11 +349,7 @@ struct wl1271 {
         /* Time-offset between host and chipset clocks */
         s64 time_offset;
 
-        /* Session counter for the chipset */
-        int session_counter;
-
         /* Frames scheduled for transmission, not handled yet */
-        struct sk_buff_head tx_queue[NUM_TX_QUEUES];
         int tx_queue_count[NUM_TX_QUEUES];
         long stopped_queues_map;
 
@@ -462,17 +367,6 @@ struct wl1271 {
         struct sk_buff *tx_frames[ACX_TX_DESCRIPTORS];
         int tx_frames_cnt;
 
-        /*
-         * Security sequence number
-         *     bits 0-15: lower 16 bits part of sequence number
-         *     bits 16-47: higher 32 bits part of sequence number
-         *     bits 48-63: not in use
-         */
-        u64 tx_security_seq;
-
-        /* 8 bits of the last sequence number in use */
-        u8 tx_security_last_seq_lsb;
-
         /* FW Rx counter */
         u32 rx_counter;
 
@@ -507,59 +401,21 @@ struct wl1271 {
         u32 mbox_ptr[2];
 
         /* Are we currently scanning */
+        struct ieee80211_vif *scan_vif;
         struct wl1271_scan scan;
         struct delayed_work scan_complete_work;
 
         bool sched_scanning;
 
-        /* probe-req template for the current AP */
-        struct sk_buff *probereq;
-
-        /* Our association ID */
-        u16 aid;
-
-        /*
-         * currently configured rate set:
-         *      bits  0-15 - 802.11abg rates
-         *      bits 16-23 - 802.11n   MCS index mask
-         * support only 1 stream, thus only 8 bits for the MCS rates (0-7).
-         */
-        u32 basic_rate_set;
-        u32 basic_rate;
-        u32 rate_set;
-        u32 bitrate_masks[IEEE80211_NUM_BANDS];
-
         /* The current band */
         enum ieee80211_band band;
 
-        /* Beaconing interval (needed for ad-hoc) */
-        u32 beacon_int;
-
-        /* Default key (for WEP) */
-        u32 default_key;
-
-        /* Rx Streaming */
-        struct work_struct rx_streaming_enable_work;
-        struct work_struct rx_streaming_disable_work;
-        struct timer_list rx_streaming_timer;
-
         struct completion *elp_compl;
-        struct completion *ps_compl;
         struct delayed_work elp_work;
-        struct delayed_work pspoll_work;
-
-        /* counter for ps-poll delivery failures */
-        int ps_poll_failures;
-
-        /* retry counter for PSM entries */
-        u8 psm_entry_retry;
 
         /* in dBm */
         int power_level;
 
-        int rssi_thold;
-        int last_rssi_event;
-
         struct wl1271_stats stats;
 
         __le32 buffer_32;
@@ -583,20 +439,9 @@ struct wl1271 {
         /* Most recently reported noise in dBm */
         s8 noise;
 
-        /* map for HLIDs of associated stations - when operating in AP mode */
-        unsigned long ap_hlid_map[BITS_TO_LONGS(AP_MAX_STATIONS)];
-
-        /* recoreded keys for AP-mode - set here before AP startup */
-        struct wl1271_ap_key *recorded_ap_keys[MAX_NUM_KEYS];
-
         /* bands supported by this instance of wl12xx */
         struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
 
-        /* RX BA constraint value */
-        bool ba_support;
-        u8 ba_rx_bitmap;
-        bool ba_allowed;
-
         int tcxo_clock;
 
         /*
@@ -610,10 +455,7 @@ struct wl1271 {
          * AP-mode - links indexed by HLID. The global and broadcast links
          * are always active.
          */
-        struct wl1271_link links[AP_MAX_LINKS];
-
-        /* the hlid of the link where the last transmitted skb came from */
-        int last_tx_hlid;
+        struct wl1271_link links[WL12XX_MAX_LINKS];
 
         /* AP-mode - a bitmap of links currently in PS mode according to FW */
         u32 ap_fw_ps_map;
@@ -632,21 +474,173 @@ struct wl1271 {
 
         /* AP-mode - number of currently connected stations */
         int active_sta_count;
+
+        /* last wlvif we transmitted from */
+        struct wl12xx_vif *last_wlvif;
 };
 
 struct wl1271_station {
         u8 hlid;
 };
 
+struct wl12xx_vif {
+        struct wl1271 *wl;
+        struct list_head list;
+        unsigned long flags;
+        u8 bss_type;
+        u8 p2p; /* we are using p2p role */
+        u8 role_id;
+
+        /* sta/ibss specific */
+        u8 dev_role_id;
+        u8 dev_hlid;
+
+        union {
+                struct {
+                        u8 hlid;
+                        u8 ba_rx_bitmap;
+
+                        u8 basic_rate_idx;
+                        u8 ap_rate_idx;
+                        u8 p2p_rate_idx;
+                } sta;
+                struct {
+                        u8 global_hlid;
+                        u8 bcast_hlid;
+
+                        /* HLIDs bitmap of associated stations */
+                        unsigned long sta_hlid_map[BITS_TO_LONGS(
+                                                        WL12XX_MAX_LINKS)];
+
+                        /* recoreded keys - set here before AP startup */
+                        struct wl1271_ap_key *recorded_keys[MAX_NUM_KEYS];
+
+                        u8 mgmt_rate_idx;
+                        u8 bcast_rate_idx;
+                        u8 ucast_rate_idx[CONF_TX_MAX_AC_COUNT];
+                } ap;
+        };
+
+        /* the hlid of the last transmitted skb */
+        int last_tx_hlid;
+
+        unsigned long links_map[BITS_TO_LONGS(WL12XX_MAX_LINKS)];
+
+        u8 ssid[IEEE80211_MAX_SSID_LEN + 1];
+        u8 ssid_len;
+
+        /* The current band */
+        enum ieee80211_band band;
+        int channel;
+
+        u32 bitrate_masks[IEEE80211_NUM_BANDS];
+        u32 basic_rate_set;
+
+        /*
+         * currently configured rate set:
+         *      bits  0-15 - 802.11abg rates
+         *      bits 16-23 - 802.11n   MCS index mask
+         * support only 1 stream, thus only 8 bits for the MCS rates (0-7).
+         */
+        u32 basic_rate;
+        u32 rate_set;
+
+        /* probe-req template for the current AP */
+        struct sk_buff *probereq;
+
+        /* Beaconing interval (needed for ad-hoc) */
+        u32 beacon_int;
+
+        /* Default key (for WEP) */
+        u32 default_key;
+
+        /* Our association ID */
+        u16 aid;
+
+        /* Session counter for the chipset */
+        int session_counter;
+
+        struct completion *ps_compl;
+        struct delayed_work pspoll_work;
+
+        /* counter for ps-poll delivery failures */
+        int ps_poll_failures;
+
+        /* retry counter for PSM entries */
+        u8 psm_entry_retry;
+
+        /* in dBm */
+        int power_level;
+
+        int rssi_thold;
+        int last_rssi_event;
+
+        /* RX BA constraint value */
+        bool ba_support;
+        bool ba_allowed;
+
+        /* Rx Streaming */
+        struct work_struct rx_streaming_enable_work;
+        struct work_struct rx_streaming_disable_work;
+        struct timer_list rx_streaming_timer;
+
+        /*
+         * This struct must be last!
+         * data that has to be saved acrossed reconfigs (e.g. recovery)
+         * should be declared in this struct.
+         */
+        struct {
+                u8 persistent[0];
+                /*
+                 * Security sequence number
+                 *     bits 0-15: lower 16 bits part of sequence number
+                 *     bits 16-47: higher 32 bits part of sequence number
+                 *     bits 48-63: not in use
+                 */
+                u64 tx_security_seq;
+
+                /* 8 bits of the last sequence number in use */
+                u8 tx_security_last_seq_lsb;
+        };
+};
+
+static inline struct wl12xx_vif *wl12xx_vif_to_data(struct ieee80211_vif *vif)
+{
+        return (struct wl12xx_vif *)vif->drv_priv;
+}
+
+static inline
+struct ieee80211_vif *wl12xx_wlvif_to_vif(struct wl12xx_vif *wlvif)
+{
+        return container_of((void *)wlvif, struct ieee80211_vif, drv_priv);
+}
+
+#define wl12xx_for_each_wlvif(wl, wlvif) \
+                list_for_each_entry(wlvif, &wl->wlvif_list, list)
+
+#define wl12xx_for_each_wlvif_continue(wl, wlvif) \
+                list_for_each_entry_continue(wlvif, &wl->wlvif_list, list)
+
+#define wl12xx_for_each_wlvif_bss_type(wl, wlvif, _bss_type)    \
+                wl12xx_for_each_wlvif(wl, wlvif)                \
+                        if (wlvif->bss_type == _bss_type)
+
+#define wl12xx_for_each_wlvif_sta(wl, wlvif)    \
+                wl12xx_for_each_wlvif_bss_type(wl, wlvif, BSS_TYPE_STA_BSS)
+
+#define wl12xx_for_each_wlvif_ap(wl, wlvif)     \
+                wl12xx_for_each_wlvif_bss_type(wl, wlvif, BSS_TYPE_AP_BSS)
+
 int wl1271_plt_start(struct wl1271 *wl);
 int wl1271_plt_stop(struct wl1271 *wl);
-int wl1271_recalc_rx_streaming(struct wl1271 *wl);
+int wl1271_recalc_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 void wl12xx_queue_recovery_work(struct wl1271 *wl);
 size_t wl12xx_copy_fwlog(struct wl1271 *wl, u8 *memblock, size_t maxlen);
 
 #define JOIN_TIMEOUT 5000 /* 5000 milliseconds to join */
 
-#define SESSION_COUNTER_MAX 7 /* maximum value for the session counter */
+#define SESSION_COUNTER_MAX 6 /* maximum value for the session counter */
+#define SESSION_COUNTER_INVALID 7 /* used with dummy_packet */
 
 #define WL1271_DEFAULT_POWER_LEVEL 0
 
@@ -669,8 +663,8 @@ size_t wl12xx_copy_fwlog(struct wl1271 *wl, u8 *memblock, size_t maxlen);
 /* Each RX/TX transaction requires an end-of-transaction transfer */
 #define WL12XX_QUIRK_END_OF_TRANSACTION         BIT(0)
 
-/* WL128X requires aggregated packets to be aligned to the SDIO block size */
-#define WL12XX_QUIRK_BLOCKSIZE_ALIGNMENT        BIT(2)
+/* wl127x and SPI don't support SDIO block size alignment */
+#define WL12XX_QUIRK_NO_BLOCKSIZE_ALIGNMENT     BIT(2)
 
 /* Older firmwares did not implement the FW logger over bus feature */
 #define WL12XX_QUIRK_FWLOG_NOT_IMPLEMENTED      BIT(4)
diff --git a/drivers/net/wireless/wl12xx/wl12xx_80211.h b/drivers/net/wireless/wl12xx/wl12xx_80211.h
index f7971d3b0898..8f0ffaf62309 100644
--- a/drivers/net/wireless/wl12xx/wl12xx_80211.h
+++ b/drivers/net/wireless/wl12xx/wl12xx_80211.h
@@ -116,11 +116,6 @@ struct wl12xx_ps_poll_template {
         u8 ta[ETH_ALEN];
 } __packed;
 
-struct wl12xx_qos_null_data_template {
-        struct ieee80211_header header;
-        __le16 qos_ctl;
-} __packed;
-
 struct wl12xx_arp_rsp_template {
         struct ieee80211_hdr_3addr hdr;
 
diff --git a/drivers/net/wireless/wl12xx/wl12xx_platform_data.c b/drivers/net/wireless/wl12xx/wl12xx_platform_data.c
index 973b11060a8f..3c96b332184e 100644
--- a/drivers/net/wireless/wl12xx/wl12xx_platform_data.c
+++ b/drivers/net/wireless/wl12xx/wl12xx_platform_data.c
@@ -2,7 +2,7 @@
 #include <linux/err.h>
 #include <linux/wl12xx.h>
 
-static const struct wl12xx_platform_data *platform_data;
+static struct wl12xx_platform_data *platform_data;
 
 int __init wl12xx_set_platform_data(const struct wl12xx_platform_data *data)
 {
@@ -18,7 +18,7 @@ int __init wl12xx_set_platform_data(const struct wl12xx_platform_data *data)
         return 0;
 }
 
-const struct wl12xx_platform_data *wl12xx_get_platform_data(void)
+struct wl12xx_platform_data *wl12xx_get_platform_data(void)
 {
         if (!platform_data)
                 return ERR_PTR(-ENODEV);
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index cf0d69dd7be5..785bdbe38f2a 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -28,6 +28,7 @@
 #include <linux/skbuff.h>
 #include <linux/usb.h>
 #include <linux/workqueue.h>
+#include <linux/module.h>
 #include <net/mac80211.h>
 #include <asm/unaligned.h>
 
diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
index 161f207786a4..94b79c3338c4 100644
--- a/drivers/net/xen-netback/common.h
+++ b/drivers/net/xen-netback/common.h
@@ -58,10 +58,6 @@ struct xenvif {
         u8               fe_dev_addr[6];
 
         /* Physical parameters of the comms window. */
-        grant_handle_t   tx_shmem_handle;
-        grant_ref_t      tx_shmem_ref;
-        grant_handle_t   rx_shmem_handle;
-        grant_ref_t      rx_shmem_ref;
         unsigned int     irq;
 
         /* List of frontends to notify after a batch of frames sent. */
@@ -70,8 +66,6 @@ struct xenvif {
         /* The shared rings and indexes. */
         struct xen_netif_tx_back_ring tx;
         struct xen_netif_rx_back_ring rx;
-        struct vm_struct *tx_comms_area;
-        struct vm_struct *rx_comms_area;
 
         /* Frontend feature information. */
         u8 can_sg:1;
@@ -106,6 +100,11 @@ struct xenvif {
         wait_queue_head_t waiting_to_free;
 };
 
+static inline struct xenbus_device *xenvif_to_xenbus_device(struct xenvif *vif)
+{
+        return to_xenbus_device(vif->dev->dev.parent);
+}
+
 #define XEN_NETIF_TX_RING_SIZE __CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE)
 #define XEN_NETIF_RX_RING_SIZE __CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE)
 
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index d5508957200e..0cb594c86090 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -1589,88 +1589,42 @@ static int xen_netbk_kthread(void *data)
 
 void xen_netbk_unmap_frontend_rings(struct xenvif *vif)
 {
-        struct gnttab_unmap_grant_ref op;
-
-        if (vif->tx.sring) {
-                gnttab_set_unmap_op(&op, (unsigned long)vif->tx_comms_area->addr,
-                                    GNTMAP_host_map, vif->tx_shmem_handle);
-
-                if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1))
-                        BUG();
-        }
-
-        if (vif->rx.sring) {
-                gnttab_set_unmap_op(&op, (unsigned long)vif->rx_comms_area->addr,
-                                    GNTMAP_host_map, vif->rx_shmem_handle);
-
-                if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1))
-                        BUG();
-        }
-        if (vif->rx_comms_area)
-                free_vm_area(vif->rx_comms_area);
-        if (vif->tx_comms_area)
-                free_vm_area(vif->tx_comms_area);
+        if (vif->tx.sring)
+                xenbus_unmap_ring_vfree(xenvif_to_xenbus_device(vif),
+                                        vif->tx.sring);
+        if (vif->rx.sring)
+                xenbus_unmap_ring_vfree(xenvif_to_xenbus_device(vif),
+                                        vif->rx.sring);
 }
 
 int xen_netbk_map_frontend_rings(struct xenvif *vif,
                                  grant_ref_t tx_ring_ref,
                                  grant_ref_t rx_ring_ref)
 {
-        struct gnttab_map_grant_ref op;
+        void *addr;
         struct xen_netif_tx_sring *txs;
         struct xen_netif_rx_sring *rxs;
 
         int err = -ENOMEM;
 
-        vif->tx_comms_area = alloc_vm_area(PAGE_SIZE);
-        if (vif->tx_comms_area == NULL)
+        err = xenbus_map_ring_valloc(xenvif_to_xenbus_device(vif),
+                                     tx_ring_ref, &addr);
+        if (err)
                 goto err;
 
-        vif->rx_comms_area = alloc_vm_area(PAGE_SIZE);
-        if (vif->rx_comms_area == NULL)
-                goto err;
-
-        gnttab_set_map_op(&op, (unsigned long)vif->tx_comms_area->addr,
-                          GNTMAP_host_map, tx_ring_ref, vif->domid);
-
-        if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
-                BUG();
-
-        if (op.status) {
-                netdev_warn(vif->dev,
-                            "failed to map tx ring. err=%d status=%d\n",
-                            err, op.status);
-                err = op.status;
-                goto err;
-        }
-
-        vif->tx_shmem_ref    = tx_ring_ref;
-        vif->tx_shmem_handle = op.handle;
-
-        txs = (struct xen_netif_tx_sring *)vif->tx_comms_area->addr;
+        txs = (struct xen_netif_tx_sring *)addr;
         BACK_RING_INIT(&vif->tx, txs, PAGE_SIZE);
 
-        gnttab_set_map_op(&op, (unsigned long)vif->rx_comms_area->addr,
-                          GNTMAP_host_map, rx_ring_ref, vif->domid);
-
-        if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
-                BUG();
-
-        if (op.status) {
-                netdev_warn(vif->dev,
-                            "failed to map rx ring. err=%d status=%d\n",
-                            err, op.status);
-                err = op.status;
+        err = xenbus_map_ring_valloc(xenvif_to_xenbus_device(vif),
+                                     rx_ring_ref, &addr);
+        if (err)
                 goto err;
-        }
-
-        vif->rx_shmem_ref     = rx_ring_ref;
-        vif->rx_shmem_handle  = op.handle;
-        vif->rx_req_cons_peek = 0;
 
-        rxs = (struct xen_netif_rx_sring *)vif->rx_comms_area->addr;
+        rxs = (struct xen_netif_rx_sring *)addr;
         BACK_RING_INIT(&vif->rx, rxs, PAGE_SIZE);
 
+        vif->rx_req_cons_peek = 0;
+
         return 0;
 
 err: